Changeset 13948 for branches

Timestamp:

Jul 9, 2010, 4:46:08 PM (14 years ago)

Author:

Gary Byers

Message:

The point of the checkpoint in the last commit: change nil_value on ARM
from #x10000005 to #x04000001. That obviously means that we invert
arm::fulltag-cons and arm::fulltag-nil, and change a few things (the link-
inverting marker, the LISTP compiler-macro) that were more sensitive to
that than they probably should have been.

OTOH, we get ~192M more address space to play with.

Location:

branches/arm

Files:

• compiler/ARM/arm-arch.lisp (modified) (5 diffs)
• compiler/optimizers.lisp (modified) (2 diffs)
• lisp-kernel/arm-constants.h (modified) (3 diffs)
• lisp-kernel/arm-constants.s (modified) (4 diffs)
• lisp-kernel/arm-gc.c (modified) (2 diffs)
• lisp-kernel/lisp_globals.h (modified) (3 diffs)
• lisp-kernel/platform-linuxarm.h (modified) (1 diff)
• xdump/xarmfasload.lisp (modified) (2 diffs)

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

@@ -528 +528 @@
 (ccl::defenum ()
   fulltag-even-fixnum                   ; I suppose EVENP/ODDP might care; nothing else does.
-  fulltag-cons                          ; a real (non-null) cons.  Shares TAG with fulltag-nil.
+  fulltag-nil                           ; NIL and nothing but.  (Note that there's still a hidden NILSYM.)
   fulltag-nodeheader                    ; Header of heap-allocated object that contains lisp-object pointers
   fulltag-imm                           ; a "real" immediate object.  Shares TAG with fulltag-immheader.
   fulltag-odd-fixnum                    ; 
-  fulltag-nil                           ; NIL and nothing but.  (Note that there's still a hidden NILSYM.)
+  fulltag-cons                          ; a real (non-null) cons.  Shares TAG with fulltag-nil.
   fulltag-misc                          ; Pointer "real" tag-misc object.  Shares TAG with fulltag-nodeheader.
   fulltag-immheader                     ; Header of heap-allocated object that contains unboxed data.
@@ -543 +543 @@
 
 
-(defconstant canonical-nil-value (+ #x10000000 fulltag-nil))
+(defconstant canonical-nil-value (+ #x04000000 fulltag-nil))
 (defconstant nil-value canonical-nil-value)
 
 ;;; T is almost adjacent to NIL: since NIL is a misaligned CONS, it spans
 ;;; two doublewords.  The arithmetic difference between T and NIL is
-;;; such that the least-significant bit and exactly one other bit is
-;;; set in the result.
-
-(defconstant t-offset (+ dnode-size (- dnode-size fulltag-nil) fulltag-misc))
+;;; not inherently interesting; it should be possible to express that
+;;; difference as an ARM constant, but that's the only real constraint.
+
+(defconstant t-offset (+ (- dnode-size fulltag-nil) fulltag-misc))
 
 
@@ -674 +674 @@
 ;;; too many tricks to be played with predecrement/preincrement addressing.
 ;;; Keep them in the confusing MCL 3.0 order, to avoid confusion.
-(define-lisp-object cons tag-list 
+(define-lisp-object cons fulltag-cons 
   cdr 
   car)
@@ -936 +936 @@
   (let* ((pos (position sym arm::*arm-kernel-globals* :test #'string=)))
     (if pos
-      (- (* (1+ pos) 4))
+      (- (* (+ 3 pos) 4))
       (error "Unknown kernel global : ~s ." sym))))
 
@@ -942 +942 @@
   (let* ((pos (position sym arm::*arm-kernel-globals* :test #'string=)))
     (if pos
-      (- (* (1+ pos) 4))
+      (- (* (+ 3 pos) 4))
       (error "Unknown kernel global : ~s ." sym))))
 

branches/arm/compiler/optimizers.lisp

@@ -1826 +1826 @@
 (define-compiler-macro listp (n)
   (let* ((arch (backend-target-arch *target-backend*))
-         (cons-tag (arch::target-cons-tag arch))
+         (list-tag (logand (arch::target-cons-tag arch)
+                           (1- (ash 1 (arch::target-nlisptagbits arch)))))
          (nil-tag  (arch::target-null-tag arch))
          (symbol-tag (arch::target-symbol-tag arch)))
@@ -1833 +1834 @@
         `(let* ((,nvar ,n))
           (if ,nvar (consp ,nvar) t)))
-      `(eql (lisptag ,n) ,cons-tag))))
+      `(eql (lisptag ,n) ,list-tag))))
 
 (define-compiler-macro consp (&whole call n)

branches/arm/lisp-kernel/arm-constants.h

@@ -84 +84 @@
 
 #define fulltag_even_fixnum 0   /*  I suppose EVENP/ODDP might care; nothing else does. */
-#define fulltag_cons     1      /*  a real (non_null) cons.  Shares TAG with fulltag_nil. */
+#define fulltag_nil      1      /*  NIL and nothing but.  (Note that there's still a hidden NILSYM.) */
 #define fulltag_nodeheader 2    /*  Header of heap_allocated object that contains lisp_object pointers */
 #define fulltag_imm      3      /*  a "real" immediate object.  Shares TAG with fulltag_immheader. */
 #define fulltag_odd_fixnum 4    /*   */
-#define fulltag_nil      5      /*  NIL and nothing but.  (Note that there's still a hidden NILSYM.) */
+#define fulltag_cons     5      /*  a real (non_null) cons.  Shares TAG with fulltag_nil. */
 #define fulltag_misc     6      /*  Pointer "real" tag_misc object.  Shares TAG with fulltag_nodeheader. */
 #define fulltag_immheader 7     /*  Header of heap-allocated object that contains unboxed data. */
@@ -272 +272 @@
 
 
-#define nil_value (0x10000000+fulltag_nil)
+#define nil_value (0x04000000+fulltag_nil)
 
 
@@ -332 +332 @@
 #define log2_heap_segment_size 16
 
-#define STATIC_BASE_ADDRESS 0x0ffff000
+#define STATIC_BASE_ADDRESS 0x03fff000
 
 #define PSR_N_MASK (1<<31)

branches/arm/lisp-kernel/arm-constants.s

@@ -118 +118 @@
 
 fulltag_even_fixnum = 0 /* I suppose EVENP/ODDP might care; nothing else does. */
-fulltag_cons = 1        /* a real (non_null) cons.  Shares TAG with fulltag_nil. */
+fulltag_nil = 1 /* NIL and nothing but.  (Note that there's still a hidden NILSYM.) */
 fulltag_nodeheader = 2  /* Header of heap_allocated object that contains lisp_object pointers */
 fulltag_imm = 3 /* a "real" immediate object.  Shares TAG with fulltag_immheader. */
 fulltag_odd_fixnum = 4  /* */
-fulltag_nil = 5 /* NIL and nothing but.  (Note that there's still a hidden NILSYM.) */
+fulltag_cons = 5        /* a real (non_null) cons.  Shares TAG with fulltag_nil. */
 fulltag_misc = 6        /* Pointer "real" tag_misc object.  Shares TAG with fulltag_nodeheader. */
 fulltag_immheader = 7   /* Header of heap-allocated object that contains unboxed data. */
 
-nil_value = (0x10000000+fulltag_nil)
+nil_value = (0x04000000+fulltag_nil)
 misc_bias = fulltag_misc
-cons_bias = tag_list    
+cons_bias = fulltag_cons    
         
 unsigned_byte_24_mask = 0xe0000003 /* bits that should be clear in a boxed */
@@ -172 +172 @@
 /* set in the result. */
 
-t_offset = (dnode_size+(dnode_size-fulltag_nil)+fulltag_misc)
+t_offset = ((dnode_size-fulltag_nil)+fulltag_misc)
 t_value = nil_value+t_offset
 
@@ -397 +397 @@
         
         _struct(nrs,0)
-         _struct_pad(dnode_size+dnode_size-fulltag_nil)
+         _struct_pad(dnode_size-fulltag_nil)
 
          _struct_pad(fulltag_misc)
@@ -689 +689 @@
 num_lisp_globals = 49            /* MUST UPDATE THIS !!! */
         
-        _struct(lisp_globals,-(fulltag_nil+(num_lisp_globals*node_size)))
+        _struct(lisp_globals,-(fulltag_nil+dnode_size+(num_lisp_globals*node_size)))
          _node(weakvll)                 /* all populations as of last GC */
          _node(initial_tcr)             /* initial thread tcr */

branches/arm/lisp-kernel/arm-gc.c

@@ -533 +533 @@
   MarkCons:
     next = deref(this,1);
-    this += node_size;
+    this = untag(this)+fulltag_nil;
     tag_n = fulltag_of(next);
     if (!is_node_fulltag(tag_n)) goto MarkCdr;
@@ -551 +551 @@
   MarkCdr:
     next = deref(this, 0);
-    this -= node_size;
+    this = untag(this)+fulltag_cons;
     tag_n = fulltag_of(next);
     if (!is_node_fulltag(tag_n)) goto Climb;

branches/arm/lisp-kernel/lisp_globals.h

@@ -83 +83 @@
 #define G2_THRESHOLD (-507)
 #else
+#ifdef ARM
+#define LISP_HEAP_THRESHOLD (-1021)
+#define EGC_ENABLED (-1020)
+#define G0_THRESHOLD (-1019)
+#define G1_THRESHOLD (-1018)
+#define G2_THRESHOLD (-1017)
+#else
 #define LISP_HEAP_THRESHOLD (-1023)
 #define EGC_ENABLED (-1022)
@@ -88 +95 @@
 #define G1_THRESHOLD (-1020)
 #define G2_THRESHOLD (-1019)
+#endif
 #endif
 
@@ -111 +119 @@
 
 #ifdef ARM
-#define lisp_global(g) (((LispObj *) (0x10000000))[(g)])
-#define nrs_symbol(s) (((lispsymbol *) (0x10000010))[(s)]) 
+#define lisp_global(g) (((LispObj *) (nil_value-fulltag_nil-dnode_size))[(g)])
+#define nrs_symbol(s) (((lispsymbol *) (nil_value-fulltag_nil+dnode_size))[(s)]) 
 #endif
 

branches/arm/lisp-kernel/platform-linuxarm.h

@@ -27 +27 @@
 
 #define MAXIMUM_MAPPABLE_MEMORY (256<<20) /* uh, no */
-#define IMAGE_BASE_ADDRESS 0x10001000
+#define IMAGE_BASE_ADDRESS 0x04001000
 
 #include "lisptypes.h"

branches/arm/xdump/xarmfasload.lisp

@@ -69 +69 @@
 
 (defun arm-initialize-static-space ()
-  (xload-make-word-ivector arm::subtag-u32-vector 1023 *xload-static-space*)
+  (xload-make-word-ivector arm::subtag-u32-vector 1021 *xload-static-space*)
   ;; Make NIL.  Note that NIL is sort of a misaligned cons (it
   ;; straddles two doublewords.)
@@ -87 +87 @@
    :subdirs '("ccl:level-0;ARM;")
    :compiler-target-name :linuxarm
-   :image-base-address (+ (ash 1 28) (ash 1 12))
+   :image-base-address (+ (- arm::nil-value arm::fulltag-nil) (ash 1 12))
    :nil-relative-symbols arm::*arm-nil-relative-symbols*
    :static-space-init-function 'arm-initialize-static-space
    :purespace-reserve (ash 8 20)
-   :static-space-address (- (ash 1 28) (ash 1 12))
+   :static-space-address (- (- arm::nil-value arm::fulltag-nil) (ash 1 12))
 ))