X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fx86%2Farith.lisp;h=33c04395c5e57006d97a7f601a9437b0ab3f9a2d;hb=4413876742e64de8a5925c98d1925ba9e5f75d8d;hp=1365fba2b7a2b58f6b30f95e134383033422540c;hpb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;p=sbcl.git diff --git a/src/assembly/x86/arith.lisp b/src/assembly/x86/arith.lisp index 1365fba..33c0439 100644 --- a/src/assembly/x86/arith.lisp +++ b/src/assembly/x86/arith.lisp @@ -197,23 +197,16 @@ 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 2) - (inst jmp eax) + (inst jmp ,test RETURN-FALSE) + + (load-symbol res t) - RETURN-TRUE - (load-symbol res t)))) + RETURN-FALSE + DONE))) - (define-cond-assem-rtn generic-< < two-arg-< :l) - (define-cond-assem-rtn generic-> > two-arg-> :g)) + (define-cond-assem-rtn generic-< < two-arg-< :ge) + (define-cond-assem-rtn generic-> > two-arg-> :le)) (define-assembly-routine (generic-eql (:cost 10) @@ -237,9 +230,7 @@ RETURN-NIL (inst mov res nil-value) - (inst pop eax) - (inst add eax 2) - (inst jmp eax) + (inst jmp DONE) DO-STATIC-FN (inst pop eax) @@ -253,8 +244,8 @@ RETURN-T (load-symbol res t) - ;; FIXME: I don't understand how we return from here.. - ) + + DONE) (define-assembly-routine (generic-= (:cost 10) @@ -278,9 +269,7 @@ (inst jmp :e RETURN-T) ; ok (inst mov res nil-value) - (inst pop eax) - (inst add eax 2) - (inst jmp eax) + (inst jmp DONE) DO-STATIC-FN (inst pop eax) @@ -293,7 +282,9 @@ :disp (+ nil-value (static-fun-offset 'two-arg-=)))) RETURN-T - (load-symbol res t)) + (load-symbol res t) + + DONE) ;;; Support for the Mersenne Twister, MT19937, random number generator @@ -328,14 +319,8 @@ ;; Generate a new set of results. (inst xor k k) LOOP1 - (inst mov y (make-ea :dword :base state :index k :scale 4 - :disp (- (* (+ 3 vector-data-offset) - n-word-bytes) - other-pointer-lowtag))) - (inst mov tmp (make-ea :dword :base state :index k :scale 4 - :disp (- (* (+ 1 3 vector-data-offset) - n-word-bytes) - other-pointer-lowtag))) + (inst mov y (make-ea-for-vector-data state :index k :offset 3)) + (inst mov tmp (make-ea-for-vector-data state :index k :offset (+ 1 3))) (inst and y #x80000000) (inst and tmp #x7fffffff) (inst or y tmp) @@ -343,27 +328,14 @@ (inst jmp :nc skip1) (inst xor y #x9908b0df) SKIP1 - (inst xor y (make-ea :dword :base state :index k :scale 4 - :disp (- (* (+ 397 3 vector-data-offset) - n-word-bytes) - other-pointer-lowtag))) - (inst mov (make-ea :dword :base state :index k :scale 4 - :disp (- (* (+ 3 vector-data-offset) - n-word-bytes) - other-pointer-lowtag)) - y) + (inst xor y (make-ea-for-vector-data state :index k :offset (+ 397 3))) + (inst mov (make-ea-for-vector-data state :index k :offset 3) y) (inst inc k) (inst cmp k (- 624 397)) (inst jmp :b loop1) LOOP2 - (inst mov y (make-ea :dword :base state :index k :scale 4 - :disp (- (* (+ 3 vector-data-offset) - n-word-bytes) - other-pointer-lowtag))) - (inst mov tmp (make-ea :dword :base state :index k :scale 4 - :disp (- (* (+ 1 3 vector-data-offset) - n-word-bytes) - other-pointer-lowtag))) + (inst mov y (make-ea-for-vector-data state :index k :offset 3)) + (inst mov tmp (make-ea-for-vector-data state :index k :offset (+ 1 3))) (inst and y #x80000000) (inst and tmp #x7fffffff) (inst or y tmp) @@ -371,27 +343,14 @@ (inst jmp :nc skip2) (inst xor y #x9908b0df) SKIP2 - (inst xor y (make-ea :dword :base state :index k :scale 4 - :disp (- (* (+ (- 397 624) 3 vector-data-offset) - n-word-bytes) - other-pointer-lowtag))) - (inst mov (make-ea :dword :base state :index k :scale 4 - :disp (- (* (+ 3 vector-data-offset) - n-word-bytes) - other-pointer-lowtag)) - y) + (inst xor y (make-ea-for-vector-data state :index k :offset (+ (- 397 624) 3))) + (inst mov (make-ea-for-vector-data state :index k :offset 3) y) (inst inc k) (inst cmp k (- 624 1)) (inst jmp :b loop2) - (inst mov y (make-ea :dword :base state - :disp (- (* (+ (- 624 1) 3 vector-data-offset) - n-word-bytes) - other-pointer-lowtag))) - (inst mov tmp (make-ea :dword :base state - :disp (- (* (+ 0 3 vector-data-offset) - n-word-bytes) - other-pointer-lowtag))) + (inst mov y (make-ea-for-vector-data state :offset (+ (- 624 1) 3))) + (inst mov tmp (make-ea-for-vector-data state :offset (+ 0 3))) (inst and y #x80000000) (inst and tmp #x7fffffff) (inst or y tmp) @@ -399,15 +358,8 @@ (inst jmp :nc skip3) (inst xor y #x9908b0df) SKIP3 - (inst xor y (make-ea :dword :base state - :disp (- (* (+ (- 397 1) 3 vector-data-offset) - n-word-bytes) - other-pointer-lowtag))) - (inst mov (make-ea :dword :base state - :disp (- (* (+ (- 624 1) 3 vector-data-offset) - n-word-bytes) - other-pointer-lowtag)) - y) + (inst xor y (make-ea-for-vector-data state :offset (+ (- 397 1) 3))) + (inst mov (make-ea-for-vector-data state :offset (+ (- 624 1) 3)) y) ;; Restore the temporary registers and return. (inst pop tmp)