Changeset 14108

Timestamp:

Aug 2, 2010, 5:41:14 PM (9 years ago)

Author:

gb

Message:

arm-lapmacros: define LRI, which loads a 32-bit constant into a GPR via

movw/movt.

arm-numbers.lisp: use LRI in %MRG31K3P.
l1-init.lisp: *SAVE-SOURCE-LOCATIONS* T, for now.

Location:

branches/arm

Files:

• compiler/ARM/arm-lapmacros.lisp (modified) (1 diff)
• level-0/ARM/arm-numbers.lisp (modified) (3 diffs)
• level-1/l1-init.lisp (modified) (1 diff)

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

@@ -344 +344 @@
   `(str ,new-value (:@ ,vector (:$ (+ (* 4 ,index) arm::misc-data-offset)))))
 
+;;; Load the low 32 bits of the integer constant VAL into REG, using movw/movt.
+(defarmlapmacro lri (reg val)
+  (let* ((high (ldb (byte 16 16) val))
+         (low (ldb (byte 16 0) val)))
+  `(progn
+    (movw ,reg (:$ ,low))
+    ,@(unless (zerop high)
+       `((movt ,reg (:$ ,high)))))))
+
 (defarmlapmacro load-subprim (reg spname)
   `(mov ,reg (:$ ,(subprim-name->offset spname))))

branches/arm/level-0/ARM/arm-numbers.lisp

@@ -247 +247 @@
     (add imm0 imm2 (:lsr imm0 (:$ 1)))
 
-    (ldr imm2 (:= @m2))
+    (lri imm2 2147462579)
     (cmp imm0 imm2)
     (subhi imm0 imm0 imm2)
@@ -260 +260 @@
     (add imm1 imm2 (:lsr imm1 (:$ 1)))
 
-    (ldr imm2 (:= @m2))
+    (lri imm2 2147462579)
     (cmp imm1 imm2)
     (subhi imm1 imm1 imm2)
@@ -286 +286 @@
     (bic imm2 imm2 (:$ #xe0000000))     ;avoid negative fixnums
     (box-fixnum arg_z imm2)
-    (bx lr))
-  
-  (:data)
-  @m2
-  (:word 2147462579))
+    (bx lr)))
 
 ; End of arm-numbers.lisp

branches/arm/level-1/l1-init.lisp

@@ -266 +266 @@
 (defparameter *save-definitions* nil)
 (defparameter *save-local-symbols* t)
-(defparameter *save-source-locations* #+arm-target nil #-arm-target  T
+(defparameter *save-source-locations*  T
   "Controls whether source location information is saved, both for definitions (names) and
 in function objects.