X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Fnlx.lisp;h=feeb93a053881f912d92f2938cc7786658c79191;hb=0d442aff281993a2b2e24d0c7a5c2547b50a5b2e;hp=8db6f57e66ab50209d4bd82fb2ae11f0c5425714;hpb=4dc4761909992ceb346d003f3fb19e5c837ee985;p=sbcl.git

diff --git a/src/compiler/x86-64/nlx.lisp b/src/compiler/x86-64/nlx.lisp
index 8db6f57..feeb93a 100644
--- a/src/compiler/x86-64/nlx.lisp
+++ b/src/compiler/x86-64/nlx.lisp
@@ -24,7 +24,7 @@
 (defun catch-block-ea (tn)
   (aver (sc-is tn catch-block))
   (make-ea :qword :base rbp-tn
-	   :disp (- (* (+ (tn-offset tn) catch-block-size) n-word-bytes))))
+           :disp (- (* (+ (tn-offset tn) catch-block-size) n-word-bytes))))
 
 
 ;;;; Save and restore dynamic environment.
@@ -42,14 +42,14 @@
 
 (define-vop (save-dynamic-state)
   (:results (catch :scs (descriptor-reg))
-	    (alien-stack :scs (descriptor-reg)))
+            (alien-stack :scs (descriptor-reg)))
   (:generator 13
     (load-tl-symbol-value catch *current-catch-block*)
     (load-tl-symbol-value alien-stack *alien-stack*)))
 
 (define-vop (restore-dynamic-state)
   (:args (catch :scs (descriptor-reg))
-	 (alien-stack :scs (descriptor-reg)))
+         (alien-stack :scs (descriptor-reg)))
   #!+sb-thread (:temporary (:sc unsigned-reg) temp)
   (:generator 10
     (store-tl-symbol-value catch *current-catch-block* temp)
@@ -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
 
@@ -86,7 +86,7 @@
 ;;; tag, and link the block into the CURRENT-CATCH list
 (define-vop (make-catch-block)
   (:args (tn)
-	 (tag :scs (any-reg descriptor-reg) :to (:result 1)))
+         (tag :scs (any-reg descriptor-reg) :to (:result 1)))
   (:info entry-label)
   (:results (block :scs (any-reg)))
   (:temporary (:sc descriptor-reg) temp)
@@ -134,8 +134,8 @@
   ;; Note: we can't list an sc-restriction, 'cause any load vops would
   ;; be inserted before the return-pc label.
   (:args (sp)
-	 (start)
-	 (count))
+         (start)
+         (count))
   (:results (values :more t))
   (:temporary (:sc descriptor-reg) move-temp)
   (:info label nvals)
@@ -145,42 +145,42 @@
     (emit-label label)
     (note-this-location vop :non-local-entry)
     (cond ((zerop nvals))
-	  ((= nvals 1)
-	   (let ((no-values (gen-label)))
-	     (inst mov (tn-ref-tn values) nil-value)
-	     (inst jecxz no-values)
-	     (loadw (tn-ref-tn values) start -1)
-	     (emit-label no-values)))
-	  (t
-	   (collect ((defaults))
-	     (do ((i 0 (1+ i))
-		  (tn-ref values (tn-ref-across tn-ref)))
-		 ((null tn-ref))
-	       (let ((default-lab (gen-label))
-		     (tn (tn-ref-tn tn-ref)))
-		 (defaults (cons default-lab tn))
-
-		 (inst cmp count (fixnumize i))
-		 (inst jmp :le default-lab)
-		 (sc-case tn
-		   ((descriptor-reg any-reg)
-		    (loadw tn start (- (1+ i))))
-		   ((control-stack)
-		    (loadw move-temp start (- (1+ i)))
-		    (inst mov tn move-temp)))))
-	     (let ((defaulting-done (gen-label)))
-	       (emit-label defaulting-done)
-	       (assemble (*elsewhere*)
-		 (dolist (def (defaults))
-		   (emit-label (car def))
-		   (inst mov (cdr def) nil-value))
-		 (inst jmp defaulting-done))))))
+          ((= nvals 1)
+           (let ((no-values (gen-label)))
+             (inst mov (tn-ref-tn values) nil-value)
+             (inst jecxz no-values)
+             (loadw (tn-ref-tn values) start -1)
+             (emit-label no-values)))
+          (t
+           (collect ((defaults))
+             (do ((i 0 (1+ i))
+                  (tn-ref values (tn-ref-across tn-ref)))
+                 ((null tn-ref))
+               (let ((default-lab (gen-label))
+                     (tn (tn-ref-tn tn-ref)))
+                 (defaults (cons default-lab tn))
+
+                 (inst cmp count (fixnumize i))
+                 (inst jmp :le default-lab)
+                 (sc-case tn
+                   ((descriptor-reg any-reg)
+                    (loadw tn start (- (1+ i))))
+                   ((control-stack)
+                    (loadw move-temp start (- (1+ i)))
+                    (inst mov tn move-temp)))))
+             (let ((defaulting-done (gen-label)))
+               (emit-label defaulting-done)
+               (assemble (*elsewhere*)
+                 (dolist (def (defaults))
+                   (emit-label (car def))
+                   (inst mov (cdr def) nil-value))
+                 (inst jmp defaulting-done))))))
     (inst mov rsp-tn sp)))
 
 (define-vop (nlx-entry-multiple)
   (:args (top)
-	 (source)
-	 (count :target rcx))
+         (source)
+         (count :target rcx))
   ;; Again, no SC restrictions for the args, 'cause the loading would
   ;; happen before the entry label.
   (:info label)
@@ -188,7 +188,7 @@
   (:temporary (:sc unsigned-reg :offset rsi-offset) rsi)
   (:temporary (:sc unsigned-reg :offset rdi-offset) rdi)
   (:results (result :scs (any-reg) :from (:argument 0))
-	    (num :scs (any-reg control-stack)))
+            (num :scs (any-reg control-stack)))
   (:save-p :force-to-stack)
   (:vop-var vop)
   (:generator 30
@@ -203,9 +203,9 @@
     (move result rdi)
 
     (inst sub rdi n-word-bytes)
-    (move rcx count)			; fixnum words == bytes
+    (move rcx count)                    ; fixnum words == bytes
     (move num rcx)
-    (inst shr rcx word-shift)		; word count for <rep movs>
+    (inst shr rcx word-shift)           ; word count for <rep movs>
     ;; If we got zero, we be done.
     (inst jecxz DONE)
     ;; Copy them down.
@@ -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)))))