0.8.13.41: Require robustness

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

diff --git a/src/compiler/x86/alloc.lisp b/src/compiler/x86/alloc.lisp
index 47408a6..a0ec28b 100644 (file)
--- a/src/compiler/x86/alloc.lisp
+++ b/src/compiler/x86/alloc.lisp
@@ -30,14 +30,14 @@
           (move result (tn-ref-tn things)))
          (t
           (macrolet
-              ((store-car (tn list &optional (slot sb!vm:cons-car-slot))
+              ((store-car (tn list &optional (slot cons-car-slot))
                  `(let ((reg
                          (sc-case ,tn
                            ((any-reg descriptor-reg) ,tn)
                            ((control-stack)
                             (move temp ,tn)
                             temp))))
-                    (storew reg ,list ,slot sb!vm:list-pointer-lowtag))))
+                    (storew reg ,list ,slot list-pointer-lowtag))))
             (let ((cons-cells (if star (1- num) num)))
               (pseudo-atomic
                (allocation res (* (pad-data-block cons-size) cons-cells) node)
@@ -71,49 +71,6 @@
 (define-vop (allocate-code-object)
   (:args (boxed-arg :scs (any-reg) :target boxed)
         (unboxed-arg :scs (any-reg) :target unboxed))
-  (:results (result :scs (descriptor-reg)))
-  (:temporary (:sc unsigned-reg :from :eval) temp)
-  (:temporary (:sc unsigned-reg :from (:argument 0)) boxed)
-  (:temporary (:sc unsigned-reg :from (:argument 1)) unboxed)
-  (:generator 100
-    (move boxed boxed-arg)
-    (inst add boxed (fixnumize (1+ code-trace-table-offset-slot)))
-    (inst and boxed (lognot lowtag-mask))
-    (move unboxed unboxed-arg)
-    (inst shr unboxed word-shift)
-    (inst add unboxed lowtag-mask)
-    (inst and unboxed (lognot lowtag-mask))
-    (pseudo-atomic
-     ;; comment from CMU CL code:
-     ;;   now loading code into static space cause it can't move
-     ;;
-     ;; KLUDGE: What? What's all the cruft about saving fixups for then?
-     ;; I think what's happened is that ALLOCATE-CODE-OBJECT is the basic
-     ;; CMU CL primitive; this ALLOCATE-CODE-OBJECT was hacked for
-     ;; static space only in a simple-minded port to the X86; and then
-     ;; in an attempt to improve the port to the X86,
-     ;; ALLOCATE-DYNAMIC-CODE-OBJECT was defined. If that's right, I'd like
-     ;; to know why not just go back to the basic CMU CL behavior of
-     ;; ALLOCATE-CODE-OBJECT, where it makes a relocatable code object.
-     ;;   -- WHN 19990916
-     ;;
-     ;; FIXME: should have a check for overflow of static space
-     (load-symbol-value temp sb!vm:*static-space-free-pointer*)
-     (inst lea result (make-ea :byte :base temp :disp other-pointer-lowtag))
-     (inst add temp boxed)
-     (inst add temp unboxed)
-     (store-symbol-value temp sb!vm:*static-space-free-pointer*)
-     (inst shl boxed (- n-widetag-bits word-shift))
-     (inst or boxed code-header-widetag)
-     (storew boxed result 0 other-pointer-lowtag)
-     (storew unboxed result code-code-size-slot other-pointer-lowtag)
-     (inst mov temp nil-value)
-     (storew temp result code-entry-points-slot other-pointer-lowtag))
-    (storew temp result code-debug-info-slot other-pointer-lowtag)))
-
-(define-vop (allocate-dynamic-code-object)
-  (:args (boxed-arg :scs (any-reg) :target boxed)
-        (unboxed-arg :scs (any-reg) :target unboxed))
   (:results (result :scs (descriptor-reg) :from :eval))
   (:temporary (:sc unsigned-reg :from (:argument 0)) boxed)
   (:temporary (:sc unsigned-reg :from (:argument 1)) unboxed)
@@ -213,7 +170,7 @@
   (:node-var node)
   (:generator 50
     (inst lea bytes
-         (make-ea :dword :base extra :disp (* (1+ words) word-bytes)))
+         (make-ea :dword :base extra :disp (* (1+ words) n-word-bytes)))
     (inst mov header bytes)
     (inst shl header (- n-widetag-bits 2)) ; w+1 to length field
     (inst lea header                   ; (w-1 << 8) | type
@@ -224,34 +181,4 @@
      (inst lea result (make-ea :byte :base result :disp lowtag))
      (storew header result 0 lowtag))))
 
-(define-vop (make-symbol)
-  (:policy :fast-safe)
-  (:translate make-symbol)
-  (:args (name :scs (descriptor-reg) :to :eval))
-  (:temporary (:sc unsigned-reg :from :eval) temp)
-  (:results (result :scs (descriptor-reg) :from :argument))
-  (:node-var node)
-  (:generator 37
-    (with-fixed-allocation (result symbol-header-widetag symbol-size node)
-      (storew name result symbol-name-slot other-pointer-lowtag)
-      (storew unbound-marker-widetag
-             result
-             symbol-value-slot
-             other-pointer-lowtag)
-      ;; Set up a random hash value for the symbol. Perhaps the object
-      ;; address could be used for even faster and smaller code!
-      ;; FIXME: We don't mind the symbol hash not being repeatable, so
-      ;; we might as well add in the object address here, too. (Adding entropy
-      ;; is good, even if ANSI doesn't understand that.)
-      (inst imul temp
-           (make-fixup (extern-alien-name "fast_random_state") :foreign)
-           1103515245)
-      (inst add temp 12345)
-      (inst mov (make-fixup (extern-alien-name "fast_random_state") :foreign)
-           temp)
-      ;; We want a positive fixnum for the hash value, so discard the LS bits.
-      (inst shr temp 1)
-      (inst and temp #xfffffffc)
-      (storew temp result symbol-hash-slot other-pointer-lowtag)
-      (storew nil-value result symbol-plist-slot other-pointer-lowtag)
-      (storew nil-value result symbol-package-slot other-pointer-lowtag))))
+