X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Fnlx.lisp;h=5425b3bd84d1b4358b7e7b4018dc86874cadbfb2;hb=ed891a4fd882d1b9fe066ab14bcf2107aea95baa;hp=30579c4b261faf66a1bfcd210a5bbc59ab73c3ec;hpb=0d871fd7a98fc4af92a8b942a1154761466ad8c9;p=sbcl.git

diff --git a/src/compiler/x86-64/nlx.lisp b/src/compiler/x86-64/nlx.lisp
index 30579c4..5425b3b 100644
--- a/src/compiler/x86-64/nlx.lisp
+++ b/src/compiler/x86-64/nlx.lisp
@@ -63,7 +63,7 @@
 (define-vop (current-binding-pointer)
   (:results (res :scs (any-reg descriptor-reg)))
   (:generator 1
-    (load-tl-symbol-value res *binding-stack-pointer*)))
+    (load-binding-stack-pointer res)))
 
 ;;;; unwind block hackery
 
@@ -148,7 +148,7 @@
           ((= nvals 1)
            (let ((no-values (gen-label)))
              (inst mov (tn-ref-tn values) nil-value)
-             (inst jecxz no-values)
+             (inst jrcxz no-values)
              (loadw (tn-ref-tn values) start -1)
              (emit-label no-values)))
           (t
@@ -207,12 +207,12 @@
     (move num rcx)
     (inst shr rcx word-shift)           ; word count for <rep movs>
     ;; If we got zero, we be done.
-    (inst jecxz DONE)
+    (inst jrcxz DONE)
     ;; Copy them down.
     (inst std)
     (inst rep)
     (inst movs :qword)
-
+    (inst cld)
     DONE
     ;; Reset the CSP at last moved arg.
     (inst lea rsp-tn (make-ea :qword :base rdi :disp n-word-bytes))))
@@ -228,3 +228,55 @@
   (:generator 0
     (emit-label label)
     (note-this-location vop :non-local-entry)))
+
+(define-vop (unwind-to-frame-and-call)
+    (:args (ofp :scs (descriptor-reg))
+           (uwp :scs (descriptor-reg))
+           (function :scs (descriptor-reg)))
+  (:arg-types system-area-pointer system-area-pointer t)
+  (:temporary (:sc sap-reg) temp)
+  (:temporary (:sc unsigned-reg :offset rax-offset) block)
+  (:generator 22
+    ;; Store the function into a non-stack location, since we'll be
+    ;; unwinding the stack and destroying register contents before we
+    ;; use it.
+    (store-tl-symbol-value function
+                           *unwind-to-frame-function*
+                           temp)
+
+    ;; Allocate space for magic UWP block.
+    (inst sub rsp-tn unwind-block-size)
+    ;; Set up magic catch / UWP block.
+    (move block rsp-tn)
+    (loadw temp uwp sap-pointer-slot other-pointer-lowtag)
+    (storew temp block unwind-block-current-uwp-slot)
+    (loadw temp ofp sap-pointer-slot other-pointer-lowtag)
+    (storew temp block unwind-block-current-cont-slot)
+
+    (inst lea temp-reg-tn (make-fixup nil :code-object entry-label))
+    (storew temp-reg-tn
+            block
+            catch-block-entry-pc-slot)
+
+    ;; Run any required UWPs.
+    (inst lea temp-reg-tn (make-fixup 'unwind :assembly-routine))
+    (inst jmp temp-reg-tn)
+    ENTRY-LABEL
+
+    ;; Load function from symbol
+    (load-tl-symbol-value block *unwind-to-frame-function*)
+
+    ;; No parameters
+    (zeroize rcx-tn)
+
+    ;; Clear the stack
+    (inst lea rsp-tn
+          (make-ea :qword :base rbp-tn :disp (* -3 n-word-bytes)))
+
+    ;; Push the return-pc so it looks like we just called.
+    (pushw rbp-tn -2)
+
+    ;; Call it
+    (inst jmp (make-ea :qword :base block
+                       :disp (- (* closure-fun-slot n-word-bytes)
+                                fun-pointer-lowtag)))))