X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Fvalues.lisp;h=9af3e21447b14b840ee793d19655e08852f039da;hb=94ea2b2082deaa0331dfb66fa6af6ca12dd8dc83;hp=e833d7bd5d185289fb5e3fdc711e9f60bce6fbe0;hpb=4ebdc81b1a9c6dbed6e98b112afc8dd32b17a2dd;p=sbcl.git

diff --git a/src/compiler/x86-64/values.lisp b/src/compiler/x86-64/values.lisp
index e833d7b..9af3e21 100644
--- a/src/compiler/x86-64/values.lisp
+++ b/src/compiler/x86-64/values.lisp
@@ -16,6 +16,35 @@
   (:generator 1
     (move rsp-tn ptr)))
 
+(define-vop (%%nip-values)
+  (:args (last-nipped-ptr :scs (any-reg) :target rdi)
+         (last-preserved-ptr :scs (any-reg) :target rsi)
+         (moved-ptrs :scs (any-reg) :more t))
+  (:results (r-moved-ptrs :scs (any-reg) :more t)
+            ;; same as MOVED-PTRS
+            )
+  (:temporary (:sc any-reg :offset rsi-offset) rsi)
+  (:temporary (:sc any-reg :offset rdi-offset) rdi)
+  (:ignore r-moved-ptrs)
+  (:generator 1
+    (move rdi last-nipped-ptr)
+    (move rsi last-preserved-ptr)
+    (inst sub rsi n-word-bytes)
+    (inst sub rdi n-word-bytes)
+    (inst cmp rsp-tn rsi)
+    (inst jmp :a DONE)
+    (inst std)
+    LOOP
+    (inst movs :qword)
+    (inst cmp rsp-tn rsi)
+    (inst jmp :be LOOP)
+    DONE
+    (inst lea rsp-tn (make-ea :qword :base rdi :disp n-word-bytes))
+    (inst sub rdi rsi)
+    (loop for moved = moved-ptrs then (tn-ref-across moved)
+          while moved
+          do (inst add (tn-ref-tn moved) rdi))))
+
 ;;; Push some values onto the stack, returning the start and number of values
 ;;; pushed as results. It is assumed that the Vals are wired to the standard
 ;;; argument locations. Nvals is the number of values to push.
@@ -56,13 +85,13 @@
 
     LOOP
     (inst cmp list nil-temp)
-    (inst jmp :e done)
+    (inst jmp :e DONE)
     (pushw list cons-car-slot list-pointer-lowtag)
     (loadw list list cons-cdr-slot list-pointer-lowtag)
     (inst mov rax list)
     (inst and al-tn lowtag-mask)
     (inst cmp al-tn list-pointer-lowtag)
-    (inst jmp :e loop)
+    (inst jmp :e LOOP)
     (error-call vop bogus-arg-to-values-list-error list)
 
     DONE
@@ -108,7 +137,7 @@
 
     (move temp1 count)
     (inst mov start rsp-tn)
-    (inst jecxz done)  ; check for 0 count?
+    (inst jecxz DONE)  ; check for 0 count?
 
     (inst shr temp1 word-shift) ; convert the fixnum to a count.
 
@@ -116,7 +145,7 @@
     LOOP
     (inst lods temp)
     (inst push temp)
-    (inst loop loop)
+    (inst loop LOOP)
 
     DONE))