[Openmcl-cvs-notifications] r10597 - in /trunk/source/lisp-kernel: thread_manager.c x86-asmutils64.s x86-constants64.h x86-exceptions.c

[gb at clozure.com]

Author: gb
Date: Sun Aug 31 07:58:27 2008
New Revision: 10597

Log:
Use WIN_64 (not WIN64) to conditionalize.

Modified:
    trunk/source/lisp-kernel/thread_manager.c
    trunk/source/lisp-kernel/x86-asmutils64.s
    trunk/source/lisp-kernel/x86-constants64.h
    trunk/source/lisp-kernel/x86-exceptions.c

Modified: trunk/source/lisp-kernel/thread_manager.c
=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/thread_manager.c (original)
+++ trunk/source/lisp-kernel/thread_manager.c Sun Aug 31 07:58:27 2008
@@ -116,7 +116,7 @@
     =

     *icontext =3D *pcontext;
 =

-#ifdef WIN64    =

+#ifdef WIN_64    =

     xpGPR(pcontext,REG_RCX) =3D SIGNAL_FOR_PROCESS_INTERRUPT;
     xpGPR(pcontext,REG_RDX) =3D 0;
     xpGPR(pcontext,REG_R8) =3D (LispObj) icontext;
@@ -1496,7 +1496,7 @@
              we're trying to restore, so that we'll resume from
              the suspend in the same context that we're trying to
              restore */
-#ifdef WIN64
+#ifdef WIN_64
           *pcontext =3D * (CONTEXT *)(pcontext->Rcx);
 #endif
         } else {

Modified: trunk/source/lisp-kernel/x86-asmutils64.s
=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/x86-asmutils64.s (original)
+++ trunk/source/lisp-kernel/x86-asmutils64.s Sun Aug 31 07:58:27 2008
@@ -208,7 +208,7 @@
 _endfn
         __endif
 =

-        __ifdef([WIN64])
+        __ifdef([WIN_64])
 /* %rcx =3D CONTEXT, %rdx =3D tcr, %r8 =3D old_valence.  This pretty
    much has to be uninterruptible */        =

 _exportfn(C(restore_windows_context))

Modified: trunk/source/lisp-kernel/x86-constants64.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/x86-constants64.h (original)
+++ trunk/source/lisp-kernel/x86-constants64.h Sun Aug 31 07:58:27 2008
@@ -56,7 +56,7 @@
 #define REG_RSP 23
 #endif
 =

-#ifdef WIN64
+#ifdef WIN_64
 /* DWORD64 indices in &(CONTEXT->Rax) */
 #define REG_RAX     0
 #define REG_RCX     1

Modified: trunk/source/lisp-kernel/x86-exceptions.c
=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/x86-exceptions.c (original)
+++ trunk/source/lisp-kernel/x86-exceptions.c Sun Aug 31 07:58:27 2008
@@ -39,7 +39,7 @@
 #endif
 #ifdef WINDOWS
 #include <windows.h>
-#ifdef WIN64
+#ifdef WIN_64
 #include <winternl.h>
 #include <ntstatus.h>
 #endif