Changeset 10484

Timestamp:

Aug 15, 2008, 10:44:09 PM (11 years ago)

Author:

gb

Message:

Propagate r10483 (package-ref initialization) to working-0711.

File:

• branches/working-0711/ccl/level-0/nfasload.lisp (modified) (5 diffs)

branches/working-0711/ccl/level-0/nfasload.lisp

@@ -247 +247 @@
 (defvar *package-refs*)
 (setq *package-refs* (make-hash-table :test #'equal))
+(defvar *package-refs-lock*)
+(setq *package-refs-lock* (make-lock))
 
 (defun register-package-ref (name)
-  (or (gethash name *package-refs*)
-      (setf (gethash name *package-refs*) (make-package-ref name))))
+  (let* ((ref
+          (or (gethash name *package-refs*)
+              (with-lock-grabbed (*package-refs-lock*)
+                (or
+                 (gethash name *package-refs*) ; check again
+                 (let* ((r (make-package-ref name)))
+                   (setf (gethash name *package-refs*) r)))))))
+    (unless (package-ref.pkg ref)
+      (setf (package-ref.pkg ref) (find-package name)))
+    ref))
+
 
 (dolist (p %all-packages%)
@@ -360 +371 @@
          (size-of-code (%fasl-read-count s))
          (vector (%alloc-misc size-in-elements target::subtag-function))
-         (function (%function-vector-to-function vector)))
+         (function (function-vector-to-function vector)))
     (declare (fixnum size-in-elements size-of-code))
     (%epushval s function)
     (%fasl-read-n-bytes s vector 0 (ash size-of-code target::word-shift))
+    #+x8632-target
+    (%update-self-references vector)
     (do* ((numconst (- size-in-elements size-of-code))
           (i 0 (1+ i))
@@ -527 +540 @@
          (size-in-bytes (subtag-bytes subtag element-count))
          (vector (%alloc-misc element-count subtag))
-         (byte-offset (or #+ppc32-target (if (= subtag ppc32::subtag-double-float-vector) 4) 0)))
+         (byte-offset (or #+32-bit-target (if (= subtag target::subtag-double-float-vector) 4) 0)))
     (declare (fixnum subtag element-count size-in-bytes))
     (%epushval s vector)
@@ -587 +600 @@
   #+64-bit-target
   (fasl-read-ivector s target::subtag-double-float-vector)
-  #+ppc32-target
+  #+32-bit-target
   (let* ((element-count (%fasl-read-count s))
-         (size-in-bytes (subtag-bytes ppc32::subtag-double-float-vector
+         (size-in-bytes (subtag-bytes target::subtag-double-float-vector
                                       element-count))
          (vector (%alloc-misc element-count
-                              ppc32::subtag-double-float-vector)))
-    (declare (fixnum subtag element-count size-in-bytes))
+                              target::subtag-double-float-vector)))
+    (declare (fixnum element-count size-in-bytes))
     (%epushval s vector)
-    (%fasl-read-n-bytes s vector (- ppc32::misc-dfloat-offset
-                                    ppc32::misc-data-offset)
+    (%fasl-read-n-bytes s vector (- target::misc-dfloat-offset
+                                    target::misc-data-offset)
                         size-in-bytes)
     vector))
@@ -607 +620 @@
          (size-in-bytes (* 4 element-count))
          (vector (allocate-typed-vector :code-vector element-count)))
-    (declare (fixnum subtag element-count size-in-bytes))
+    (declare (fixnum element-count size-in-bytes))
     (%epushval s vector)
     (%fasl-read-n-bytes s vector 0 size-in-bytes)