Changeset 14573

Timestamp:

Jan 10, 2011, 12:13:49 AM (14 years ago)

Author:

Gary Byers

Message:

call-closure setup hair.

File:

• trunk/source/xdump/xarmfasload.lisp (modified) (2 diffs)

trunk/source/xdump/xarmfasload.lisp

@@ -67 +67 @@
                 (list code0 0 3 (arm::arm-subprimitive-address '.SPcall-closure)))))
 
+(defun adjust-closure-trampoline-for-subprims-bias (backend-name)
+  (let* ((backend (find-backend backend-name))
+         (bias (if backend (backend-real-subprims-bias backend)))
+         (code *arm-closure-trampoline-code*))
+    (if (eql bias 0)
+      code
+      (let* ((new (copy-seq code)))
+        (incf (aref new (1- (length new))) bias)
+        new))))
 
 ;;; For now, do this with a UUO so that the kernel can catch it.
@@ -128 +137 @@
    :name :androidarm
    :macro-apply-code-function 'arm-fixup-macro-apply-code
-   :closure-trampoline-code *arm-closure-trampoline-code*
+   :closure-trampoline-code (adjust-closure-trampoline-for-subprims-bias :androidarm)
    :udf-code *arm-udf-code*
    :default-image-name "ccl:aarm-boot"