Changeset 11372

Timestamp:

Nov 16, 2008, 12:32:47 PM (12 years ago)

Author:

gb

Message:

Can't assume that <machine/npx.h> exists (it doesn't on an amd64 FreeBSD
host), so duplicate the relevant structure definitions and add a "ccl_"
prefix to them.

Location:

trunk/source/lisp-kernel

Files:

• freebsdx8632/fpu.h (added)
• x86-exceptions.c (modified) (1 diff)
• x86-exceptions.h (modified) (2 diffs)

trunk/source/lisp-kernel/x86-exceptions.c

@@ -932 +932 @@
     struct savefpu *fpu = (struct savefpu *) &(xp->uc_mcontext.mc_fpstate);
 #else
-    struct savexmm *fpu = (struct savexmm *) &(xp->uc_mcontext.mc_fpstate);
+    struct ccl_savexmm *fpu = (struct ccl_savexmm *) &(xp->uc_mcontext.mc_fpstate);
 #endif
     uint32_t mxcsr = fpu->sv_env.en_mxcsr;

trunk/source/lisp-kernel/x86-exceptions.h

@@ -56 +56 @@
 #include <machine/fpu.h>
 #else
-#include <machine/npx.h>
+#include "freebsdx8632/fpu.h"
 #endif
 #define xpGPRvector(x) ((natural *)(&((x)->uc_mcontext)))
@@ -67 +67 @@
 #define xpXMMregs(x)(&(((struct savefpu *)(&(x)->uc_mcontext.mc_fpstate))->sv_xmm[0]))
 #else
-#define xpMMXreg(x,n) *((natural *)(&(((struct savexmm *)(&(x)->uc_mcontext.mc_fpstate))->sv_fp[n])))
-#define xpXMMregs(x)(&(((struct savexmm *)(&(x)->uc_mcontext.mc_fpstate))->sv_xmm[0]))
+#define xpMMXreg(x,n) *((natural *)(&(((struct ccl_savexmm *)(&(x)->uc_mcontext.mc_fpstate))->sv_fp[n])))
+#define xpXMMregs(x)(&(((struct ccl_savexmm *)(&(x)->uc_mcontext.mc_fpstate))->sv_xmm[0]))
 #endif
 #endif