X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Fvalues.lisp;h=4f5f5ae45bac1bc0025a0fbbef234e22b6463cef;hb=0d871fd7a98fc4af92a8b942a1154761466ad8c9;hp=3250a4ec36627a2e19297a2eb5725224ec0a47fb;hpb=78fa16bf55be44cc16845be84d98023e83fb14bc;p=sbcl.git diff --git a/src/compiler/x86-64/values.lisp b/src/compiler/x86-64/values.lisp index 3250a4e..4f5f5ae 100644 --- a/src/compiler/x86-64/values.lisp +++ b/src/compiler/x86-64/values.lisp @@ -32,12 +32,12 @@ (inst sub rsi n-word-bytes) (inst sub rdi n-word-bytes) (inst cmp rsp-tn rsi) - (inst jmp :a done) + (inst jmp :a DONE) (inst std) LOOP (inst movs :qword) (inst cmp rsp-tn rsi) - (inst jmp :be loop) + (inst jmp :be LOOP) DONE (inst lea rsp-tn (make-ea :qword :base rdi :disp n-word-bytes)) (inst sub rdi rsi) @@ -58,9 +58,9 @@ (:results (start) (count)) (:info nvals) (:generator 20 - (move temp rsp-tn) ; WARN pointing 1 below + (move temp rsp-tn) ; WARN pointing 1 below (do ((val vals (tn-ref-across val))) - ((null val)) + ((null val)) (inst push (tn-ref-tn val))) (move start temp) (inst mov count (fixnumize nvals)))) @@ -72,7 +72,7 @@ (:arg-types list) (:policy :fast-safe) (:results (start :scs (any-reg)) - (count :scs (any-reg))) + (count :scs (any-reg))) (:temporary (:sc descriptor-reg :from (:argument 0) :to (:result 1)) list) (:temporary (:sc descriptor-reg :to (:result 1)) nil-temp) (:temporary (:sc unsigned-reg :offset rax-offset :to (:result 1)) rax) @@ -80,23 +80,23 @@ (:save-p :compute-only) (:generator 0 (move list arg) - (move start rsp-tn) ; WARN pointing 1 below + (move start rsp-tn) ; WARN pointing 1 below (inst mov nil-temp nil-value) 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 - (inst mov count start) ; start is high address - (inst sub count rsp-tn))) ; stackp is low address + (inst mov count start) ; start is high address + (inst sub count rsp-tn))) ; stackp is low address ;;; Copy the more arg block to the top of the stack so we can use them ;;; as function arguments. @@ -108,26 +108,26 @@ ;;; defining a new stack frame. (define-vop (%more-arg-values) (:args (context :scs (descriptor-reg any-reg) :target src) - (skip :scs (any-reg immediate)) - (num :scs (any-reg) :target count)) + (skip :scs (any-reg immediate)) + (num :scs (any-reg) :target count)) (:arg-types * positive-fixnum positive-fixnum) (:temporary (:sc any-reg :offset rsi-offset :from (:argument 0)) src) (:temporary (:sc descriptor-reg :offset rax-offset) temp) (:temporary (:sc unsigned-reg :offset rcx-offset) temp1) (:results (start :scs (any-reg)) - (count :scs (any-reg))) + (count :scs (any-reg))) (:generator 20 (sc-case skip (immediate (cond ((zerop (tn-value skip)) - (move src context) - (move count num)) - (t - (inst lea src (make-ea :dword :base context - :disp (- (* (tn-value skip) - n-word-bytes)))) - (move count num) - (inst sub count (* (tn-value skip) n-word-bytes))))) + (move src context) + (move count num)) + (t + (inst lea src (make-ea :dword :base context + :disp (- (* (tn-value skip) + n-word-bytes)))) + (move count num) + (inst sub count (* (tn-value skip) n-word-bytes))))) (any-reg (move src context) @@ -137,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. @@ -145,7 +145,7 @@ LOOP (inst lods temp) (inst push temp) - (inst loop loop) + (inst loop LOOP) DONE))