Fix a few address sign-extension bugs.

wvonhagen · Jul 23, 2015 · fc9e4dc · fc9e4dc
1 parent 9cc3d78
commit fc9e4dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/compiler/builtins/misc.lisp b/compiler/builtins/misc.lisp
@@ -32,15 +32,15 @@
   (load-in-reg :r8 address t)
   (smash-r8)
   (emit `(sys.lap-x86:shr32 :eax ,sys.int::+n-fixnum-bits+)
-        `(sys.lap-x86:shr64 :r8 ,sys.int::+n-fixnum-bits+)
+        `(sys.lap-x86:sar64 :r8 ,sys.int::+n-fixnum-bits+)
         `(sys.lap-x86:or64 :r8 :rax))
   (setf *r8-value* (list (gensym))))
 
 (defbuiltin sys.int::%pointer-field (value) ()
   (load-in-reg :r8 value t)
   (smash-r8)
   (emit `(sys.lap-x86:and64 :r8 -16)
-        `(sys.lap-x86:shr64 :r8 ,(- 4 sys.int::+n-fixnum-bits+)))
+        `(sys.lap-x86:sar64 :r8 ,(- 4 sys.int::+n-fixnum-bits+)))
   (setf *r8-value* (list (gensym))))
 
 (defbuiltin sys.int::%tag-field (value) ()

diff --git a/gui/blit.lisp b/gui/blit.lisp
@@ -374,13 +374,13 @@ ARRAY must not be a displaced array."
 ;;; NCOLS FROM FROM-OFFSET TO TO-OFFSET
 (sys.int::define-lap-function %bitblt-argb-xrgb-line ()
   (sys.lap-x86:mov64 :rsi :r9) ; rsi = FROM.
-  (sys.lap-x86:shr64 :rsi #.sys.int::+n-fixnum-bits+)
+  (sys.lap-x86:sar64 :rsi #.sys.int::+n-fixnum-bits+)
   (sys.lap-x86:mov64 :rcx :r10) ; rcx = FROM-OFFSET (fixnum).
   (sys.lap-x86:sar64 :rcx #.sys.int::+n-fixnum-bits+) ; FROM-OFFSET (raw)
   (sys.lap-x86:shl64 :rcx 2) ; FROM-OFFSET * 4(raw)
   (sys.lap-x86:add64 :rsi :rcx) ; rsi = FROM + FROM-OFFSET.
   (sys.lap-x86:mov64 :rdi :r11) ; rdi = TO.
-  (sys.lap-x86:shr64 :rdi #.sys.int::+n-fixnum-bits+)
+  (sys.lap-x86:sar64 :rdi #.sys.int::+n-fixnum-bits+)
   (sys.lap-x86:mov64 :rdx :r12) ; rcx = TO-OFFSET (fixnum).
   (sys.lap-x86:sar64 :rdx #.sys.int::+n-fixnum-bits+) ; TO-OFFSET (raw)
   (sys.lap-x86:shl64 :rdx 2) ; TO-OFFSET * 4(raw)