X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fx86-64%2Farith.lisp;h=4e8f81dac78bdc368f7a79d15ea272df0c0865c2;hb=b1a4f6376799a402903e75d111ef29bdc25e0582;hp=c84c6619b5f6e920b6f2bdd4ce60d56ee5d9344b;hpb=4dc4761909992ceb346d003f3fb19e5c837ee985;p=sbcl.git diff --git a/src/assembly/x86-64/arith.lisp b/src/assembly/x86-64/arith.lisp index c84c661..4e8f81d 100644 --- a/src/assembly/x86-64/arith.lisp +++ b/src/assembly/x86-64/arith.lisp @@ -14,54 +14,54 @@ ;;;; addition, subtraction, and multiplication (macrolet ((define-generic-arith-routine ((fun cost) &body body) - `(define-assembly-routine (,(symbolicate "GENERIC-" fun) - (:cost ,cost) - (:return-style :full-call) - (:translate ,fun) - (:policy :safe) - (:save-p t)) - ((:arg x (descriptor-reg any-reg) rdx-offset) - (:arg y (descriptor-reg any-reg) - ;; this seems wrong esi-offset -- FIXME: What's it mean? - rdi-offset) - - (:res res (descriptor-reg any-reg) rdx-offset) - - (:temp rax unsigned-reg rax-offset) - (:temp rbx unsigned-reg rbx-offset) - (:temp rcx unsigned-reg rcx-offset)) - - (declare (ignorable rbx)) - - (inst test x 7) ; fixnum? - (inst jmp :nz DO-STATIC-FUN) ; no - do generic - (inst test y 7) ; fixnum? - (inst jmp :z DO-BODY) ; yes - doit here - - DO-STATIC-FUN - (inst pop rax) - (inst push rbp-tn) - (inst lea - rbp-tn - (make-ea :qword :base rsp-tn :disp n-word-bytes)) - (inst sub rsp-tn (fixnumize 2)) - (inst push rax) ; callers return addr - (inst mov rcx (fixnumize 2)) ; arg count - (inst jmp - (make-ea :qword - :disp (+ nil-value - (static-fun-offset - ',(symbolicate "TWO-ARG-" fun))))) - - DO-BODY - ,@body))) + `(define-assembly-routine (,(symbolicate "GENERIC-" fun) + (:cost ,cost) + (:return-style :full-call) + (:translate ,fun) + (:policy :safe) + (:save-p t)) + ((:arg x (descriptor-reg any-reg) rdx-offset) + (:arg y (descriptor-reg any-reg) + ;; this seems wrong esi-offset -- FIXME: What's it mean? + rdi-offset) + + (:res res (descriptor-reg any-reg) rdx-offset) + + (:temp rax unsigned-reg rax-offset) + (:temp rbx unsigned-reg rbx-offset) + (:temp rcx unsigned-reg rcx-offset)) + + (declare (ignorable rbx)) + + (inst test x 7) ; fixnum? + (inst jmp :nz DO-STATIC-FUN) ; no - do generic + (inst test y 7) ; fixnum? + (inst jmp :z DO-BODY) ; yes - doit here + + DO-STATIC-FUN + (inst pop rax) + (inst push rbp-tn) + (inst lea + rbp-tn + (make-ea :qword :base rsp-tn :disp n-word-bytes)) + (inst sub rsp-tn (fixnumize 2)) + (inst push rax) ; callers return addr + (inst mov rcx (fixnumize 2)) ; arg count + (inst jmp + (make-ea :qword + :disp (+ nil-value + (static-fun-offset + ',(symbolicate "TWO-ARG-" fun))))) + + DO-BODY + ,@body))) (define-generic-arith-routine (+ 10) (move res x) (inst add res y) (inst jmp :no OKAY) - (inst rcr res 1) ; carry has correct sign - (inst sar res 2) ; remove type bits + (inst rcr res 1) ; carry has correct sign + (inst sar res 2) ; remove type bits (move rcx res) @@ -71,17 +71,12 @@ OKAY) (define-generic-arith-routine (- 10) - ;; FIXME: This is screwed up. - ;;; I can't figure out the flags on subtract. Overflow never gets - ;;; set and carry always does. (- 0 most-negative-fixnum) can't be - ;;; easily detected so just let the upper level stuff do it. - (inst jmp DO-STATIC-FUN) - (move res x) (inst sub res y) (inst jmp :no OKAY) + (inst cmc) ; carry has correct sign now (inst rcr res 1) - (inst sar res 2) ; remove type bits + (inst sar res 2) ; remove type bits (move rcx res) @@ -90,19 +85,19 @@ OKAY) (define-generic-arith-routine (* 30) - (move rax x) ; must use eax for 64-bit result - (inst sar rax 3) ; remove *4 fixnum bias - (inst imul y) ; result in edx:eax - (inst jmp :no OKAY) ; still fixnum + (move rax x) ; must use eax for 64-bit result + (inst sar rax 3) ; remove *4 fixnum bias + (inst imul y) ; result in edx:eax + (inst jmp :no OKAY) ; still fixnum ;; zzz jrd changed edx to ebx in here, as edx isn't listed as a temp, above ;; pfw says that loses big -- edx is target for arg x and result res ;; note that 'edx' is not defined -- using x - (inst shrd rax x 3) ; high bits from edx - (inst sar x 3) ; now shift edx too + (inst shrd rax x 3) ; high bits from edx + (inst sar x 3) ; now shift edx too - (move rcx x) ; save high bits from cqo - (inst cqo) ; edx:eax <- sign-extend of eax + (move rcx x) ; save high bits from cqo + (inst cqo) ; edx:eax <- sign-extend of eax (inst cmp x rcx) (inst jmp :e SINGLE-WORD-BIGNUM) @@ -124,16 +119,16 @@ ;;;; negation (define-assembly-routine (generic-negate - (:cost 10) - (:return-style :full-call) - (:policy :safe) - (:translate %negate) - (:save-p t)) - ((:arg x (descriptor-reg any-reg) rdx-offset) - (:res res (descriptor-reg any-reg) rdx-offset) - - (:temp rax unsigned-reg rax-offset) - (:temp rcx unsigned-reg rcx-offset)) + (:cost 10) + (:return-style :full-call) + (:policy :safe) + (:translate %negate) + (:save-p t)) + ((:arg x (descriptor-reg any-reg) rdx-offset) + (:res res (descriptor-reg any-reg) rdx-offset) + + (:temp rax unsigned-reg rax-offset) + (:temp rcx unsigned-reg rcx-offset)) (inst test x 7) (inst jmp :z FIXNUM) @@ -142,15 +137,15 @@ (inst lea rbp-tn (make-ea :qword :base rsp-tn :disp n-word-bytes)) (inst sub rsp-tn (fixnumize 2)) (inst push rax) - (inst mov rcx (fixnumize 1)) ; arg count + (inst mov rcx (fixnumize 1)) ; arg count (inst jmp (make-ea :qword - :disp (+ nil-value (static-fun-offset '%negate)))) + :disp (+ nil-value (static-fun-offset '%negate)))) FIXNUM (move res x) - (inst neg res) ; (- most-negative-fixnum) is BIGNUM + (inst neg res) ; (- most-negative-fixnum) is BIGNUM (inst jmp :no OKAY) - (inst shr res 3) ; sign bit is data - remove type bits + (inst shr res 3) ; sign bit is data - remove type bits (move rcx res) (with-fixed-allocation (res bignum-widetag (1+ bignum-digits-offset)) @@ -161,78 +156,70 @@ ;;;; comparison (macrolet ((define-cond-assem-rtn (name translate static-fn test) - `(define-assembly-routine (,name - (:cost 10) - (:return-style :full-call) - (:policy :safe) - (:translate ,translate) - (:save-p t)) - ((:arg x (descriptor-reg any-reg) rdx-offset) - (:arg y (descriptor-reg any-reg) rdi-offset) - - (:res res descriptor-reg rdx-offset) - - (:temp eax unsigned-reg rax-offset) - (:temp ecx unsigned-reg rcx-offset)) - - ;; KLUDGE: The "3" here is a mask for the bits which will be - ;; zero in a fixnum. It should have a symbolic name. (Actually, - ;; it might already have a symbolic name which the coder - ;; couldn't be bothered to use..) -- WHN 19990917 - (inst test x 7) - (inst jmp :nz TAIL-CALL-TO-STATIC-FN) - (inst test y 7) - (inst jmp :z INLINE-FIXNUM-COMPARE) - - TAIL-CALL-TO-STATIC-FN - (inst pop eax) - (inst push rbp-tn) - (inst lea rbp-tn (make-ea :qword - :base rsp-tn - :disp n-word-bytes)) - (inst sub rsp-tn (fixnumize 2)) ; FIXME: Push 2 words on stack, - ; weirdly? - (inst push eax) - (inst mov ecx (fixnumize 2)) ; FIXME: FIXNUMIZE and - ; SINGLE-FLOAT-BITS are parallel, - ; should be named parallelly. - (inst jmp (make-ea :qword - :disp (+ nil-value - (static-fun-offset ',static-fn)))) - - INLINE-FIXNUM-COMPARE - (inst cmp x y) - (inst jmp ,test RETURN-TRUE) - (inst mov res nil-value) - ;; FIXME: A note explaining this return convention, or a - ;; symbolic name for it, would be nice. (It looks as though we - ;; should be hand-crafting the same return sequence as would be - ;; produced by GENERATE-RETURN-SEQUENCE, but in that case it's - ;; not clear why we don't just jump to the end of this function - ;; to share the return sequence there. - (inst pop eax) - (inst add eax 3) - (inst jmp eax) - - RETURN-TRUE - (load-symbol res t)))) - - (define-cond-assem-rtn generic-< < two-arg-< :l) - (define-cond-assem-rtn generic-> > two-arg-> :g)) + `(define-assembly-routine (,name + (:cost 10) + (:return-style :full-call) + (:policy :safe) + (:translate ,translate) + (:save-p t)) + ((:arg x (descriptor-reg any-reg) rdx-offset) + (:arg y (descriptor-reg any-reg) rdi-offset) + + (:res res descriptor-reg rdx-offset) + + (:temp eax unsigned-reg rax-offset) + (:temp ecx unsigned-reg rcx-offset)) + + ;; KLUDGE: The "3" here is a mask for the bits which will be + ;; zero in a fixnum. It should have a symbolic name. (Actually, + ;; it might already have a symbolic name which the coder + ;; couldn't be bothered to use..) -- WHN 19990917 + (inst test x 7) + (inst jmp :nz TAIL-CALL-TO-STATIC-FN) + (inst test y 7) + (inst jmp :z INLINE-FIXNUM-COMPARE) + + TAIL-CALL-TO-STATIC-FN + (inst pop eax) + (inst push rbp-tn) + (inst lea rbp-tn (make-ea :qword + :base rsp-tn + :disp n-word-bytes)) + (inst sub rsp-tn (fixnumize 2)) ; FIXME: Push 2 words on stack, + ; weirdly? + (inst push eax) + (inst mov ecx (fixnumize 2)) ; FIXME: FIXNUMIZE and + ; SINGLE-FLOAT-BITS are parallel, + ; should be named parallelly. + (inst jmp (make-ea :qword + :disp (+ nil-value + (static-fun-offset ',static-fn)))) + + INLINE-FIXNUM-COMPARE + (inst cmp x y) + (inst mov res nil-value) + (inst jmp ,test RETURN-FALSE) + RETURN-TRUE + (load-symbol res t) + RETURN-FALSE + DONE))) + + (define-cond-assem-rtn generic-< < two-arg-< :ge) + (define-cond-assem-rtn generic-> > two-arg-> :le)) (define-assembly-routine (generic-eql - (:cost 10) - (:return-style :full-call) - (:policy :safe) - (:translate eql) - (:save-p t)) - ((:arg x (descriptor-reg any-reg) rdx-offset) - (:arg y (descriptor-reg any-reg) rdi-offset) - - (:res res descriptor-reg rdx-offset) - - (:temp eax unsigned-reg rax-offset) - (:temp ecx unsigned-reg rcx-offset)) + (:cost 10) + (:return-style :full-call) + (:policy :safe) + (:translate eql) + (:save-p t)) + ((:arg x (descriptor-reg any-reg) rdx-offset) + (:arg y (descriptor-reg any-reg) rdi-offset) + + (:res res descriptor-reg rdx-offset) + + (:temp eax unsigned-reg rax-offset) + (:temp ecx unsigned-reg rcx-offset)) (inst cmp x y) (inst jmp :e RETURN-T) (inst test x 7) @@ -242,9 +229,7 @@ RETURN-NIL (inst mov res nil-value) - (inst pop eax) - (inst add eax 3) - (inst jmp eax) + (inst jmp DONE) DO-STATIC-FN (inst pop eax) @@ -254,38 +239,35 @@ (inst push eax) (inst mov ecx (fixnumize 2)) (inst jmp (make-ea :qword - :disp (+ nil-value (static-fun-offset 'eql)))) + :disp (+ nil-value (static-fun-offset 'eql)))) RETURN-T (load-symbol res t) - ;; FIXME: I don't understand how we return from here.. - ) + DONE) (define-assembly-routine (generic-= - (:cost 10) - (:return-style :full-call) - (:policy :safe) - (:translate =) - (:save-p t)) - ((:arg x (descriptor-reg any-reg) rdx-offset) - (:arg y (descriptor-reg any-reg) rdi-offset) - - (:res res descriptor-reg rdx-offset) - - (:temp eax unsigned-reg rax-offset) - (:temp ecx unsigned-reg rcx-offset) - ) - (inst test x 7) ; descriptor? + (:cost 10) + (:return-style :full-call) + (:policy :safe) + (:translate =) + (:save-p t)) + ((:arg x (descriptor-reg any-reg) rdx-offset) + (:arg y (descriptor-reg any-reg) rdi-offset) + + (:res res descriptor-reg rdx-offset) + + (:temp eax unsigned-reg rax-offset) + (:temp ecx unsigned-reg rcx-offset) + ) + (inst test x 7) ; descriptor? (inst jmp :nz DO-STATIC-FN) ; yes, do it here - (inst test y 7) ; descriptor? + (inst test y 7) ; descriptor? (inst jmp :nz DO-STATIC-FN) (inst cmp x y) - (inst jmp :e RETURN-T) ; ok + (inst jmp :e RETURN-T) ; ok (inst mov res nil-value) - (inst pop eax) - (inst add eax 3) - (inst jmp eax) + (inst jmp DONE) DO-STATIC-FN (inst pop eax) @@ -295,9 +277,10 @@ (inst push eax) (inst mov ecx (fixnumize 2)) (inst jmp (make-ea :qword - :disp (+ nil-value (static-fun-offset 'two-arg-=)))) + :disp (+ nil-value (static-fun-offset 'two-arg-=)))) RETURN-T - (load-symbol res t)) + (load-symbol res t) + DONE)