1.0.4.63: Don't zeroize dynamic-extent simple-unboxed-arrays on x86 and x86-64

[sbcl.git] / src / compiler / x86 / vm.lisp

diff --git a/src/compiler/x86/vm.lisp b/src/compiler/x86/vm.lisp
index 5099c3c..1b080bc 100644 (file)
--- a/src/compiler/x86/vm.lisp
+++ b/src/compiler/x86/vm.lisp
@@ -232,6 +232,8 @@
   (character-reg registers
                  :locations #!-sb-unicode #.*byte-regs*
                             #!+sb-unicode #.*dword-regs*
+                 #!+sb-unicode #!+sb-unicode
+                 :element-size 2
                  #!-sb-unicode #!-sb-unicode
                  :reserve-locations (#.ah-offset #.al-offset)
                  :constant-scs (immediate)
@@ -408,7 +410,14 @@
 ;;; offsets of special stack frame locations
 (def!constant ocfp-save-offset 0)
 (def!constant return-pc-save-offset 1)
-(def!constant code-save-offset 2)
+
+(declaim (inline frame-word-offset))
+(defun frame-word-offset (index)
+  (- (1+ index)))
+
+(declaim (inline frame-byte-offset))
+(defun frame-byte-offset (index)
+  (* (frame-word-offset index) n-word-bytes))
 
 ;;; FIXME: This is a bad comment (changed since when?) and there are others
 ;;; like it in this file. It'd be nice to clarify them. Failing that deleting