Changeset 6483

Timestamp:

May 9, 2007, 7:44:26 AM (14 years ago)

Author:

gb

Message:

New calling sequence.

File:

• trunk/ccl/level-0/X86/x86-utils.lisp (modified) (5 diffs)

trunk/ccl/level-0/X86/x86-utils.lisp

@@ -120 +120 @@
     (movq (% obj) (% prev))
     (movq (% obj) (% arg_z))
-    (lea (@ (:^ @back-from-misc) (% fn)) (% ra0))
     (set-nargs 1)
-    (movq (% fun) (% fn))
-    (jmp (% fn))
-    (:tra @back-from-misc)
-    (recover-fn-from-ra0 @back-from-misc)
+    (:talign 4)
+    (call (% fun))
+    (recover-fn-from-rip)
     (getvheader obj imm1)
     (movb (% imm1.b) (% imm0.b))
@@ -166 +164 @@
     (movq (% obj) (% arg_z))
     (set-nargs 1)
-    (lea (@ (:^ @back-from-cons) (% fn)) (% ra0))
-    (movq (% fun) (% fn))
-    (jmp (% fn))
-    (:tra @back-from-cons)
-    (recover-fn-from-ra0 @back-from-cons)
+    (:talign 4)
+    (call (% fun))
+    (recover-fn-from-rip)
     (addq ($ (- x8664::cons.size x8664::fulltag-cons)) (% obj))
     (jmp @test)
@@ -246 +242 @@
     (movq (% obj) (% arg_z))
     (movq (% obj) (% prev))
-    (lea (@ (:^ @back-from-misc) (% fn)) (% ra0))
     (set-nargs 1)
-    (movq (% fun) (% fn))
-    (jmp (% fn))
-    (:tra @back-from-misc)
-    (recover-fn-from-ra0 @back-from-misc)
+    (:talign 4)
+    (call (% fun))
+    (recover-fn-from-rip)
     (getvheader obj imm1)
     (movb (% imm1.b) (% imm0.b))
@@ -294 +288 @@
     (movq (% obj) (% prev))
     (set-nargs 1)
-    (lea (@ (:^ @back-from-cons) (% fn)) (% ra0))
-    (movq (% fun) (% fn))
-    (jmp (% fn))
-    (:tra @back-from-cons)
-    (recover-fn-from-ra0 @back-from-cons)
+    (:talign 4)
+    (call (% fun))
+    (recover-fn-from-rip)
     (addq ($ (- x8664::cons.size x8664::fulltag-cons)) (% obj))
     (jmp @test)
@@ -351 +343 @@
   (cmpb ($ x8664::fulltag-function) (%b imm0))
   (jne @ret)
-  (xchgq (% temp0)(% fn))
   (set-nargs 1)
-  (jmp (% fn))
+  (jmp (% temp0))
   @bad
-  (movq (@ 'no-class-error (% fn)) (% fname))
+  (load-constant no-class-error fname)
   (set-nargs 1)
-  (movq (% fn) (% xfn))
-  (movq (@ x8664::symbol.fcell (% fname)) (% fn))
-  (jmp (% fn))
+  (jmp  (@ x8664::symbol.fcell (% fname)))
   @ret
   (movq (% temp0) (% arg_z))  ; return frob from table