Attachment 191673 Details for Bug 226809 – trap.patch

trap.patch

file_226809.txt (text/plain), 3.20 KB, created by John Baldwin on 2018-03-20 22:12:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Baldwin

Created: 2018-03-20 22:12:43 UTC

Size: 3.20 KB

patch

obsolete

>Index: files/patch-lisp-kernel_platform-freebsdx8632.h
>===================================================================
>--- files/patch-lisp-kernel_platform-freebsdx8632.h     (nonexistent)
>+++ files/patch-lisp-kernel_platform-freebsdx8632.h     (working copy)
>@@ -0,0 +1,19 @@
>+--- lisp-kernel/platform-freebsdx8632.h.orig   2018-03-20 12:24:58.894882000 -0700
>++++ lisp-kernel/platform-freebsdx8632.h        2018-03-20 12:26:51.327100000 -0700
>+@@ -42,6 +42,7 @@ typedef struct __ucontext ExceptionInfor
>+ 
>+ #include <sys/types.h>
>+ #include <machine/npx.h>
>++#include <machine/trap.h>
>+ #define xpGPRvector(x) ((natural *)(&((x)->uc_mcontext)))
>+ #define xpGPR(x,gprno) (xpGPRvector(x)[gprno])
>+ #define set_xpGPR(x,gpr,new) xpGPR((x),(gpr)) = (natural)(new)
>+@@ -56,7 +57,7 @@ extern void freebsd_sigreturn(ExceptionI
>+ #define IS_PAGE_FAULT(info,xp) (xp->uc_mcontext.mc_trapno == T_PAGEFLT)
>+ #define SIGRETURN(context) freebsd_sigreturn(context)
>+ 
>+-#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_trapno & 4)
>++#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_flags & 4)
>+ #define AVX_CONTEXT_PTR(xp) (((xp)->uc_mcontext.mc_fpstate[130]))
>+ #define AVX_CONTEXT_SIZE(xp) ((natural)((xp)->uc_mcontext.mc_fpstate[131]))
>+ 
>
>Property changes on: files/patch-lisp-kernel_platform-freebsdx8632.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-lisp-kernel_platform-freebsdx8664.h
>===================================================================
>--- files/patch-lisp-kernel_platform-freebsdx8664.h     (nonexistent)
>+++ files/patch-lisp-kernel_platform-freebsdx8664.h     (working copy)
>@@ -0,0 +1,19 @@
>+--- lisp-kernel/platform-freebsdx8664.h.orig   2018-03-20 12:25:05.151015000 -0700
>++++ lisp-kernel/platform-freebsdx8664.h        2018-03-20 12:26:36.751044000 -0700
>+@@ -47,6 +47,7 @@ typedef struct __ucontext ExceptionInfor
>+ #define REG_RSP 23
>+ 
>+ #include <machine/fpu.h>
>++#include <machine/trap.h>
>+ #define xpGPRvector(x) ((natural *)(&((x)->uc_mcontext)))
>+ #define xpGPR(x,gprno) (xpGPRvector(x)[gprno])
>+ #define set_xpGPR(x,gpr,new) xpGPR((x),(gpr)) = (natural)(new)
>+@@ -67,7 +68,7 @@ extern void freebsd_sigreturn(ExceptionI
>+    fbsd 9.1 headers; if we built on an older OS version, we still need
>+    to know about this if we run on 9.1+ */
>+ 
>+-#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_trapno & 4)
>++#define AVX_CONTEXT_PRESENT(xp) ((xp)->uc_mcontext.mc_flags & 4)
>+ #define AVX_CONTEXT_PTR(xp) (((xp)->uc_mcontext.mc_fpstate[66]))
>+ #define AVX_CONTEXT_SIZE(xp) ((natural)((xp)->uc_mcontext.mc_fpstate[67]))
>+ 
>
>Property changes on: files/patch-lisp-kernel_platform-freebsdx8664.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View

Attachments on bug 226809: 191673