Changeset 11449

Timestamp:

Dec 1, 2008, 8:53:55 PM (12 years ago)

Author:

rme

Message:

.SPmisc_set and .SPmisc_ref: when passing more than 2 args to the
error handling function, pop the return address before pushing the
reserved frame and stacks args. Push the return address back on
before signaling the error.

File:

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

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

@@ -414 +414 @@
         __(ret)
 local_label(misc_ref_invalid):
+        __(pop %temp1)  /* return addr */
         __(push $reserved_frame_marker)
         __(push $reserved_frame_marker)
         __(push $XBADVEC)
+        __(push %temp1)
         __(set_nargs(3))
         __(jmp _SPksignalerr)
@@ -816 +818 @@
         __(movl %arg_z,%arg_y)
         __(movl %temp0,%arg_z)
+        __(pop %temp1)  /* return addr */
         __(push $reserved_frame_marker)
         __(push $reserved_frame_marker)
         __(push $XNOTELT)
+        __(push %temp1)
         __(set_nargs(3))
         __(jmp _SPksignalerr)
@@ -915 +919 @@
         __(ret)
 local_label(misc_set_invalid):
+        __(pop %temp1)  /* return addr */
         __(push $reserved_frame_marker)
         __(push $reserved_frame_marker)
         __(push $XSETBADVEC)
         __(push %temp0)
+        __(push %temp1)
         __(set_nargs(4))
         __(jmp _SPksignalerr)