Changeset 13832

Timestamp:

Jun 15, 2010, 6:47:17 PM (14 years ago)

Author:

Gary Byers

Message:

%GET-KERNEL-GLOBAL, %GET-KERNEL-GLOBAL-MACPTR changes. (Might be
able to ref from 0, but need to use (- arm::nil arm::fulltag-nil.)

File:

• branches/arm/compiler/ARM/arm-arch.lisp (modified) (1 diff)

branches/arm/compiler/ARM/arm-arch.lisp

@@ -1262 +1262 @@
 ;;;
 (defarmarchmacro ccl::%get-kernel-global (name)
-  `(ccl::%fixnum-ref 0 (+ ,(ccl::target-nil-value)
-                        ,(%kernel-global
-                          (if (ccl::quoted-form-p name)
-                            (cadr name)
-                            name)))))
+  `(ccl::%fixnum-ref (ash (+ (- nil-value fulltag-nil)
+                           ,(%kernel-global
+                             (if (ccl::quoted-form-p name)
+                               (cadr name)
+                               name)))
+                      (- fixnumshift))))
+    
 
 (defarmarchmacro ccl::%get-kernel-global-ptr (name dest)
   `(ccl::%setf-macptr
     ,dest
-    (ccl::%fixnum-ref-macptr 0 (+ ,(ccl::target-nil-value)
-                                ,(%kernel-global
-                                  (if (ccl::quoted-form-p name)
-                                    (cadr name)
-                                    name))))))
+    (ccl::%fixnum-ref-macptr (ash (+ (- nil-value fulltag-nil)
+                                     ,(%kernel-global
+                                       (if (ccl::quoted-form-p name)
+                                         (cadr name)
+                                         name)))
+                              (- fixnumshift)))))
 
 (defarmarchmacro ccl::%target-kernel-global (name)