X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fx86-64%2Farith.lisp;h=6a1fe24ddb96f9070730c8e3d3b096a0059432d4;hb=82cd148d729c241e79c8df04b700beec1b7c55de;hp=4e8f81dac78bdc368f7a79d15ea272df0c0865c2;hpb=f78e2d271f540d68d35b4f41696ce746ff129ee3;p=sbcl.git diff --git a/src/assembly/x86-64/arith.lisp b/src/assembly/x86-64/arith.lisp index 4e8f81d..6a1fe24 100644 --- a/src/assembly/x86-64/arith.lisp +++ b/src/assembly/x86-64/arith.lisp @@ -21,47 +21,46 @@ (: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) + (:arg y (descriptor-reg any-reg) 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 mov rcx x) + (inst or rcx y) + (inst test rcx fixnum-tag-mask) ; both fixnums? + (inst jmp :nz DO-STATIC-FUN) ; no - do generic - (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 + ,@body + (inst clc) ; single-value return + (inst ret) DO-STATIC-FUN - (inst pop rax) + ;; Same as: (inst enter (* n-word-bytes 1)) (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 rbp-tn rsp-tn) + (inst sub rsp-tn (* n-word-bytes 1)) + (inst push (make-ea :qword :base rbp-tn + :disp (frame-byte-offset return-pc-save-offset))) (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))) + ',(symbolicate "TWO-ARG-" fun)))))))) + #.` (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 + ;; Unbox the overflowed result, recovering the correct sign from + ;; the carry flag, then re-box as a bignum. + (inst rcr res 1) + ,@(when (> n-fixnum-tag-bits 1) ; don't shift by 0 + '((inst sar res (1- n-fixnum-tag-bits)))) (move rcx res) @@ -70,13 +69,17 @@ OKAY) + #.` (define-generic-arith-routine (- 10) (move res x) (inst sub res y) (inst jmp :no OKAY) + ;; Unbox the overflowed result, recovering the correct sign from + ;; the carry flag, then re-box as a bignum. (inst cmc) ; carry has correct sign now (inst rcr res 1) - (inst sar res 2) ; remove type bits + ,@(when (> n-fixnum-tag-bits 1) ; don't shift by 0 + '((inst sar res (1- n-fixnum-tag-bits)))) (move rcx res) @@ -85,16 +88,13 @@ 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 n-fixnum-tag-bits) ; remove *8 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 n-fixnum-tag-bits) ; high bits from edx + (inst sar x n-fixnum-tag-bits) ; now shift edx too (move rcx x) ; save high bits from cqo (inst cqo) ; edx:eax <- sign-extend of eax @@ -129,14 +129,14 @@ (:temp rax unsigned-reg rax-offset) (:temp rcx unsigned-reg rcx-offset)) - (inst test x 7) + (inst test x fixnum-tag-mask) (inst jmp :z FIXNUM) - (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) + (inst mov rbp-tn rsp-tn) + (inst sub rsp-tn (* n-word-bytes 1)) + (inst push (make-ea :qword :base rbp-tn + :disp (frame-byte-offset return-pc-save-offset))) (inst mov rcx (fixnumize 1)) ; arg count (inst jmp (make-ea :qword :disp (+ nil-value (static-fun-offset '%negate)))) @@ -145,7 +145,7 @@ (move res x) (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 n-fixnum-tag-bits) ; sign bit is data - remove type bits (move rcx res) (with-fixed-allocation (res bignum-widetag (1+ bignum-digits-offset)) @@ -156,131 +156,204 @@ ;;;; comparison (macrolet ((define-cond-assem-rtn (name translate static-fn test) + (declare (ignorable translate static-fn)) + #+sb-assembling `(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) + (:return-style :none)) + ((:arg x (descriptor-reg any-reg) rdx-offset) + (:arg y (descriptor-reg any-reg) rdi-offset) - (:temp eax unsigned-reg rax-offset) - (:temp ecx unsigned-reg rcx-offset)) + (:temp rcx 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) + (inst mov rcx x) + (inst or rcx y) + (inst test rcx fixnum-tag-mask) + (inst jmp :nz DO-STATIC-FUN) ; are both fixnums? - 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)) + (inst ret) + DO-STATIC-FUN + (inst push rbp-tn) + (inst mov rbp-tn rsp-tn) + (inst sub rsp-tn (* n-word-bytes 3)) + (inst mov (make-ea :qword :base rsp-tn + :disp (frame-byte-offset + (+ sp->fp-offset + -3 + ocfp-save-offset))) + rbp-tn) + (inst lea rbp-tn (make-ea :qword :base rsp-tn + :disp (frame-byte-offset + (+ sp->fp-offset + -3 + ocfp-save-offset)))) + (inst mov rcx (fixnumize 2)) + (inst call (make-ea :qword + :disp (+ nil-value + (static-fun-offset ',static-fn)))) + ;; HACK: We depend on NIL having the lowest address of all + ;; static symbols (including T) + ,@(ecase test + (:l `((inst mov y (1+ nil-value)) + (inst cmp y x))) + (:g `((inst cmp x (1+ nil-value))))) + (inst pop rbp-tn) + (inst ret)) + #-sb-assembling + `(define-vop (,name) + (:translate ,translate) + (:policy :safe) + (:save-p t) + (:args (x :scs (descriptor-reg any-reg) :target rdx) + (y :scs (descriptor-reg any-reg) :target rdi)) + + (:temporary (:sc unsigned-reg :offset rdx-offset + :from (:argument 0)) + rdx) + (:temporary (:sc unsigned-reg :offset rdi-offset + :from (:argument 1)) + rdi) + + (:temporary (:sc unsigned-reg :offset rcx-offset + :from :eval) + rcx) + (:conditional ,test) + (:generator 10 + (move rdx x) + (move rdi y) + (inst mov rcx (make-fixup ',name :assembly-routine)) + (inst call rcx))))) + + (define-cond-assem-rtn generic-< < two-arg-< :l) + (define-cond-assem-rtn generic-> > two-arg-> :g)) + +#+sb-assembling (define-assembly-routine (generic-eql - (:cost 10) - (:return-style :full-call) - (:policy :safe) - (:translate eql) - (:save-p t)) + (:return-style :none)) ((:arg x (descriptor-reg any-reg) rdx-offset) (:arg y (descriptor-reg any-reg) rdi-offset) - (:res res descriptor-reg rdx-offset) + (:temp rcx unsigned-reg rcx-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) - (inst jmp :z RETURN-NIL) - (inst test y 7) - (inst jmp :nz DO-STATIC-FN) - - RETURN-NIL - (inst mov res nil-value) - (inst jmp DONE) - - DO-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)) - (inst push eax) - (inst mov ecx (fixnumize 2)) - (inst jmp (make-ea :qword - :disp (+ nil-value (static-fun-offset 'eql)))) + (inst mov rcx x) + (inst and rcx y) + (inst test rcx fixnum-tag-mask) + (inst jmp :nz DO-STATIC-FUN) - RETURN-T - (load-symbol res t) - DONE) + ;; At least one fixnum + (inst cmp x y) + (inst ret) + DO-STATIC-FUN + (inst push rbp-tn) + (inst mov rbp-tn rsp-tn) + (inst sub rsp-tn (* n-word-bytes 3)) + (inst mov (make-ea :qword :base rsp-tn + :disp (frame-byte-offset + (+ sp->fp-offset + -3 + ocfp-save-offset))) + rbp-tn) + (inst lea rbp-tn (make-ea :qword :base rsp-tn + :disp (frame-byte-offset + (+ sp->fp-offset + -3 + ocfp-save-offset)))) + (inst mov rcx (fixnumize 2)) + (inst call (make-ea :qword + :disp (+ nil-value (static-fun-offset 'eql)))) + (load-symbol y t) + (inst cmp x y) + (inst pop rbp-tn) + (inst ret)) + +#-sb-assembling +(define-vop (generic-eql) + (:translate eql) + (:policy :safe) + (:save-p t) + (:args (x :scs (descriptor-reg any-reg) :target rdx) + (y :scs (descriptor-reg any-reg) :target rdi)) + + (:temporary (:sc unsigned-reg :offset rdx-offset + :from (:argument 0)) + rdx) + (:temporary (:sc unsigned-reg :offset rdi-offset + :from (:argument 1)) + rdi) + + (:temporary (:sc unsigned-reg :offset rcx-offset + :from :eval) + rcx) + (:conditional :e) + (:generator 10 + (move rdx x) + (move rdi y) + (inst mov rcx (make-fixup 'generic-eql :assembly-routine)) + (inst call rcx))) + +#+sb-assembling (define-assembly-routine (generic-= - (:cost 10) - (:return-style :full-call) - (:policy :safe) - (:translate =) - (:save-p t)) + (:return-style :none)) ((:arg x (descriptor-reg any-reg) rdx-offset) (:arg y (descriptor-reg any-reg) rdi-offset) - (:res res descriptor-reg rdx-offset) + (:temp rcx unsigned-reg rcx-offset)) + (inst mov rcx x) + (inst or rcx y) + (inst test rcx fixnum-tag-mask) + (inst jmp :nz DO-STATIC-FUN) - (: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 jmp :nz DO-STATIC-FN) + ;; Both fixnums (inst cmp x y) - (inst jmp :e RETURN-T) ; ok + (inst ret) - (inst mov res nil-value) - (inst jmp DONE) - - DO-STATIC-FN - (inst pop eax) + DO-STATIC-FUN (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 eax) - (inst mov ecx (fixnumize 2)) - (inst jmp (make-ea :qword - :disp (+ nil-value (static-fun-offset 'two-arg-=)))) - - RETURN-T - (load-symbol res t) - DONE) - - + (inst mov rbp-tn rsp-tn) + (inst sub rsp-tn (* n-word-bytes 3)) + (inst mov (make-ea :qword :base rsp-tn + :disp (frame-byte-offset + (+ sp->fp-offset + -3 + ocfp-save-offset))) + rbp-tn) + (inst lea rbp-tn (make-ea :qword :base rsp-tn + :disp (frame-byte-offset + (+ sp->fp-offset + -3 + ocfp-save-offset)))) + + (inst mov rcx (fixnumize 2)) + (inst call (make-ea :qword + :disp (+ nil-value (static-fun-offset 'two-arg-=)))) + (load-symbol y t) + (inst cmp x y) + (inst pop rbp-tn) + (inst ret)) + +#-sb-assembling +(define-vop (generic-=) + (:translate =) + (:policy :safe) + (:save-p t) + (:args (x :scs (descriptor-reg any-reg) :target rdx) + (y :scs (descriptor-reg any-reg) :target rdi)) + + (:temporary (:sc unsigned-reg :offset rdx-offset + :from (:argument 0)) + rdx) + (:temporary (:sc unsigned-reg :offset rdi-offset + :from (:argument 1)) + rdi) + + (:temporary (:sc unsigned-reg :offset rcx-offset + :from :eval) + rcx) + (:conditional :e) + (:generator 10 + (move rdx x) + (move rdi y) + (inst mov rcx (make-fixup 'generic-= :assembly-routine)) + (inst call rcx)))