Changeset 14556


Ignore:
Timestamp:
Jan 5, 2011, 8:45:23 PM (10 years ago)
Author:
gb
Message:

Let's try that again ...

Location:
trunk/source/compiler
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/compiler/ARM/arm-asm.lisp

    r14555 r14556  
    5353    (let* ((info (find x arm::*arm-subprims* :test #'string-equal :key #'ccl::subprimitive-info-name)))
    5454      (when info
    55         (+ (ccl::backend-subprims-bias ccl::*target-backend*)
     55        (+ (ccl::backend-real-subprims-bias ccl::*target-backend*)
    5656           (ccl::subprimitive-info-offset info))))))
    5757
    5858(defun arm-subprimitive-name (addr)
    59   (let* ((info (find (- addr (ccl::backend-subprims-bias ccl::*target-backend*)) arm::*arm-subprims* :key #'ccl::subprimitive-info-offset)))
     59  (let* ((info (find (- addr (ccl::backend-real-subprims-bias ccl::*target-backend*)) arm::*arm-subprims* :key #'ccl::subprimitive-info-offset)))
    6060    (when info
    6161      (string (ccl::subprimitive-info-name info)))))
  • trunk/source/compiler/backend.lisp

    r14555 r14556  
    3737(defconstant platform-os-windows 5)
    3838(defconstant platform-os-android 6)
     39
     40(defun backend-real-lowmem-bias (backend)
     41  (let* ((b (backend-lowmem-bias backend)))
     42    (if (atom b) b (car b))))
     43
     44
    3945
    4046(defstruct backend
     
    6672  ;; target's. Usually 0.
    6773  ;; Can be a cons of (static-area-bias . subprims-bias)
    68   (%lowmem-bias 0))
    69 
    70 (defun backend-lowmem-bias (backend)
    71   (let* ((b (backend-%lowmem-bias backend)))
    72     (if (atom b) b (car b))))
    73 
    74 (defun backend-subprims-bias (backend)
    75   (let* ((b (backend-%lowmem-bias backend)))
    76     (if (atom b) b (cdr b))))
     74  (lowmem-bias 0))
     75
     76
    7777
    7878(defmethod print-object ((b backend) s)
     
    493493(defun target-nil-value (&optional (backend *target-backend*))
    494494  (+ (arch::target-nil-value (backend-target-arch backend))
    495      (backend-lowmem-bias backend)))
     495     (backend-real-lowmem-bias backend)))
    496496
    497497(defun target-t-value (&optional (backend *target-backend*))
     
    499499    (+ (arch::target-nil-value arch)
    500500       (arch::target-t-offset arch)
    501        (backend-lowmem-bias backend))))
     501       (backend-real-lowmem-bias backend))))
    502502
    503503
  • trunk/source/compiler/subprims.lisp

    r14555 r14556  
    4343      (error "subprim named ~s not found." name))))
    4444
     45(defun backend-real-subprims-bias (backend)
     46  (let* ((b (backend-lowmem-bias backend)))
     47    (if (atom b) b (cdr b))))
     48
    4549(defun subprim-name->offset (name &optional (backend *target-backend*))
    4650  ;; Don't care about speed, but for bootstrapping reasons avoid typechecking
    4751  ;; against symbols in the arch package.
    4852  (declare (optimize (speed 3) (safety 0)))
    49   (+ (backend-subprims-bias backend)
     53  (+ (backend-real-subprims-bias backend)
    5054     (%subprim-name->offset name  (arch::target-subprims-table
    5155                                   (backend-target-arch backend)))))
Note: See TracChangeset for help on using the changeset viewer.