[Openmcl-cvs-notifications] r13953 - in /trunk/source/lisp-kernel: platform-solarisx64.h platform-solarisx86.h

[gb at clozure.com]

Author: gb
Date: Mon Jul 12 07:07:37 2010
New Revision: 13953

Log:
Spell xpMXCSR with a 'p'.  Split 64/32-bit trap stuff into the right header
file.

Modified:
    trunk/source/lisp-kernel/platform-solarisx64.h
    trunk/source/lisp-kernel/platform-solarisx86.h

Modified: trunk/source/lisp-kernel/platform-solarisx64.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/platform-solarisx64.h (original)
+++ trunk/source/lisp-kernel/platform-solarisx64.h Mon Jul 12 07:07:37 2010
@@ -36,15 +36,10 @@
 #define xpPC(x) xpGPR(x,Iip)
 #define eflags_register(xp) xpGPR(xp,Iflags)
 #define xpXMMregs(x)(&((x)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xmm=
[0]))
-#define xmMXCSR(x) ((x)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xstatu=
s)
+#define xpMXCSR(x) ((x)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xstatu=
s)
 #define SIGNUM_FOR_INTN_TRAP SIGSEGV
-#ifdef X8664
 #define IS_MAYBE_INT_TRAP(info,xp) ((xpGPR(xp,REG_TRAPNO)=3D=3D0xd)&&((xpG=
PR(xp,REG_ERR)&7)=3D=3D2))
 #define IS_PAGE_FAULT(info,xp) (xpGPR(xp,REG_TRAPNO)=3D=3D0xe)
-#else
-#define IS_MAYBE_INT_TRAP(info,xp) ((xpGPR(xp,TRAPNO)=3D=3D0xd)&&((xpGPR(x=
p,ERR)&7)=3D=3D2))
-#define IS_PAGE_FAULT(info,xp) (xpGPR(xp,TRAPNO)=3D=3D0xe)
-#endif
 #define SIGRETURN(context) setcontext(context)
 =

 #include "os-solaris.h"

Modified: trunk/source/lisp-kernel/platform-solarisx86.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/platform-solarisx86.h (original)
+++ trunk/source/lisp-kernel/platform-solarisx86.h Mon Jul 12 07:07:37 2010
@@ -39,13 +39,8 @@
 #define xpMMXreg(x,n)*(natural *)(&(((struct fnsave_state *)(&(((x)->uc_mc=
ontext.fpregs))))->f_st[n]))
 #define xmMXCSR(x) ((x)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xstatu=
s)
 #define SIGNUM_FOR_INTN_TRAP SIGSEGV
-#ifdef X8664
-#define IS_MAYBE_INT_TRAP(info,xp) ((xpGPR(xp,REG_TRAPNO)=3D=3D0xd)&&((xpG=
PR(xp,REG_ERR)&7)=3D=3D2))
-#define IS_PAGE_FAULT(info,xp) (xpGPR(xp,REG_TRAPNO)=3D=3D0xe)
-#else
 #define IS_MAYBE_INT_TRAP(info,xp) ((xpGPR(xp,TRAPNO)=3D=3D0xd)&&((xpGPR(x=
p,ERR)&7)=3D=3D2))
 #define IS_PAGE_FAULT(info,xp) (xpGPR(xp,TRAPNO)=3D=3D0xe)
-#endif
 #define SIGRETURN(context) setcontext(context)
 =

 #include "os-solaris.h"