Changeset 11056 for trunk/source/compiler/X86/x86-lapmacros.lisp

Timestamp:

Oct 12, 2008, 7:55:44 AM (12 years ago)

Author:

gb

Message:

Use an achored (out-of-line) UUO in trap-unless-typecode=.

Add SAVE-STACKARGS-FRAME, which does what the compiler does when a
known number of incoming args (and a reserved frame) were pushed
on the stack.

File:

• trunk/source/compiler/X86/x86-lapmacros.lisp (modified) (2 diffs)

trunk/source/compiler/X86/x86-lapmacros.lisp

@@ -145 +145 @@
 
 (defx86lapmacro trap-unless-typecode= (node tag &optional (immreg 'imm0))
-  (let* ((ok (gensym)))
-    `(progn
+  (let* ((bad (gensym))
+         (anchor (gensym)))
+           
+    `(progn
+      ,anchor
       (extract-typecode ,node ,immreg)
       (cmpb ($ ,tag) (%b ,immreg))
-      (je.pt ,ok)
-      (uuo-error-reg-not-tag (% ,node) ($ ,tag))
-      ,ok)))
+      (jne ,bad)
+      (:anchored-uuo-section ,anchor)
+      ,bad
+      (:anchored-uuo (uuo-error-reg-not-tag (% ,node) ($ ,tag)))
+      (:main-section nil))))
 
 (defx86lapmacro trap-unless-fulltag= (node tag &optional (immreg 'imm0))
@@ -401 +406 @@
        (pushq (% rbp))
        (movq (% rsp) (% rbp))))))
+
+(defx86lapmacro save-stackargs-frame (nstackargs)
+  (target-arch-case
+   (:x8632
+    `(progn
+      (movl (% ebp) (@ ,(* (1+ nstackargs) x8632::node-size) (% esp)))
+      (leal (@ ,(* (1+ nstackargs) x8632::node-size) (% esp)) (% ebp))
+      (popl (@ x8632::node-size (% ebp)))))
+   (:x8664
+    `(progn
+      (movq (% rbp) (@ ,(* (1+ nstackargs) x8664::node-size) (% rsp)))
+      (leaq (@ ,(* (1+ nstackargs) x8664::node-size) (% rsp)) (% rbp))
+      (popq (@ x8632::node-size (% rbp)))))))
+    
   
 (defx86lapmacro save-frame-variable-arg-count ()