Changeset 13171

Timestamp:

Nov 6, 2009, 1:56:41 AM (11 years ago)

Author:

rme

Message:

In .SPcallback, use the stack word -20(%ebp) to store the number of
words to discard for winapi/stdcall functions. Now that we're doing
Objective-C stuff on Windows (which I didn't expect to be doing), take
care not to use locations/registers that the bridge wants to use for
dealing with NSExceptions.

File:

• trunk/source/lisp-kernel/x86-spentry32.s (modified) (5 diffs)

trunk/source/lisp-kernel/x86-spentry32.s

@@ -4324 +4324 @@
         __(shrl $24,%ecx)
         __(andl $0x007fffff,%eax) /* callback index */
-        __(movl %ecx,-12(%ebp))
+        __(movl %ecx,-20(%ebp))
         /* If the C stack is 16-byte aligned by convention,
            it should still be, and this'll be a NOP. */
@@ -4388 +4388 @@
         __(pop %esi)
         __(pop %edi)
+        __(movl -12(%ebp),%ecx) /* magic value for ObjC bridge */
         __(cmpb $1,-16(%ebp))
-        __(movl -12(%ebp),%ecx) /* magic value for ObjC bridge or winapi */
         __(jae 1f)
         __(movl -8(%ebp),%eax)
         __(movl -4(%ebp),%edx)
         __ifdef([WIN_32])
-         __(testl %ecx,%ecx)
+         __(cmpl $0,-20(%ebp))
          __(jne local_label(winapi_return))
         __endif
@@ -4411 +4411 @@
         __(flds -8(%ebp))
         __ifdef([WIN_32])
-         __(testl %ecx,%ecx)
+         __(cmpl $0,-20(%ebp))
          __(jne local_label(winapi_return))
         __endif
@@ -4419 +4419 @@
         __(fldl -8(%ebp))
         __ifdef([WIN_32])
-         __(testl %ecx,%ecx)
+         __(cmpl $0,-20(%ebp))
          __(jne local_label(winapi_return))
         __endif
@@ -4426 +4426 @@
         __ifdef([WIN_32])
 local_label(winapi_return):
+          __(movl -20(%ebp),%ecx)
           __(leave)
          /* %ecx is non-zero and contains count of arg words to pop */