0.9.8.24:

[sbcl.git] / src / compiler / x86-64 / nlx.lisp

diff --git a/src/compiler/x86-64/nlx.lisp b/src/compiler/x86-64/nlx.lisp
index 8db6f57..abd9c62 100644 (file)
--- 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))))
 
 \f
 ;;;; 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)))
 \f
 ;;;; 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.