Changeset 14555

Timestamp:

Jan 5, 2011, 10:44:00 AM (14 years ago)

Author:

Gary Byers

Message:

Try to introduce the concept of "backend-subprims-bias", where
a backend's subprims may need to live at a non-canonical address.
Try to do this in a way that minimizes bootstrapping problems,
by overloading the (mostly unused) BACKEND-LOWMEM-BIAS field
in the BACKEND structure.

Location:

trunk/source/compiler

Files:

• ARM/arm-asm.lisp (modified) (1 diff)
• backend.lisp (modified) (1 diff)
• subprims.lisp (modified) (1 diff)

trunk/source/compiler/ARM/arm-asm.lisp

@@ -53 +53 @@
     (let* ((info (find x arm::*arm-subprims* :test #'string-equal :key #'ccl::subprimitive-info-name)))
       (when info
-        (ccl::subprimitive-info-offset info)))))
+        (+ (ccl::backend-subprims-bias ccl::*target-backend*)
+           (ccl::subprimitive-info-offset info))))))
 
 (defun arm-subprimitive-name (addr)
-  (let* ((info (find addr arm::*arm-subprims* :key #'ccl::subprimitive-info-offset)))
+  (let* ((info (find (- addr (ccl::backend-subprims-bias ccl::*target-backend*)) arm::*arm-subprims* :key #'ccl::subprimitive-info-offset)))
     (when info
       (string (ccl::subprimitive-info-name info)))))

trunk/source/compiler/backend.lisp

@@ -65 +65 @@
   ;; difference between canonical static address for arch and this
   ;; target's. Usually 0.
-  (lowmem-bias 0))
+  ;; Can be a cons of (static-area-bias . subprims-bias)
+  (%lowmem-bias 0))
+
+(defun backend-lowmem-bias (backend)
+  (let* ((b (backend-%lowmem-bias backend)))
+    (if (atom b) b (car b))))
+
+(defun backend-subprims-bias (backend)
+  (let* ((b (backend-%lowmem-bias backend)))
+    (if (atom b) b (cdr b))))
 
 (defmethod print-object ((b backend) s)

trunk/source/compiler/subprims.lisp

@@ -47 +47 @@
   ;; against symbols in the arch package.
   (declare (optimize (speed 3) (safety 0)))
-  (+ (backend-lowmem-bias backend)
+  (+ (backend-subprims-bias backend)
      (%subprim-name->offset name  (arch::target-subprims-table
                                    (backend-target-arch backend)))))