Changeset 11187 for trunk/source/level-1/x86-callback-support.lisp

Timestamp:

Oct 21, 2008, 11:19:26 PM (12 years ago)

Author:

gb

Message:

Make-callback-trampoline: optional argument is count of stack argument
bytes to ignore. On x8632, store this (as word count) in upper byte
of callback index in generated trampoline function.

File:

• trunk/source/level-1/x86-callback-support.lisp (modified) (3 diffs)

trunk/source/level-1/x86-callback-support.lisp

@@ -19 +19 @@
 
 #+x8664-target  
-(defun make-callback-trampoline (index &optional monitor-exception-ports)
-  (declare (ignorable monitor-exception-ports))
+(defun make-callback-trampoline (index &optional discard-stack-bytes)
+  (declare (ignore discard-stack-bytes))
   (let* ((p (%allocate-callback-pointer 16))
          (addr #.(subprim-name->offset '.SPcallback)))
@@ -40 +40 @@
           
 #+x8632-target          
-(defun make-callback-trampoline (index &optional monitor-exception-ports)
-  (declare (ignorable monitor-exception-ports))
+(defun make-callback-trampoline (index &optional (discard-stack-bytes 0))
   (let* ((p (%allocate-callback-pointer 12))
          (addr #.(subprim-name->offset '.SPcallback)))
@@ -48 +47 @@
           (%get-unsigned-byte p 2) (ldb (byte 8 8) index)
           (%get-unsigned-byte p 3) (ldb (byte 8 16) index)
-          (%get-unsigned-byte p 4) (ldb (byte 8 24) index)
+          (%get-unsigned-byte p 4) (ldb (byte 8 24) (ash discard-stack (- x8632::word-shift)))
           (%get-unsigned-byte p 5) #xff  ; jmp *
           (%get-unsigned-byte p 6) #x24