Changeset 5652


Ignore:
Timestamp:
Dec 30, 2006, 3:13:47 AM (13 years ago)
Author:
gb
Message:

Move NIL up a page on x86-64 as well.

Location:
trunk/ccl
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/ccl/compiler/X86/X8664/x8664-arch.lisp

    r5511 r5652  
    406406
    407407       
    408 (defconstant nil-value (+ #x2000 fulltag-nil))
    409 (defconstant t-value (+ #x2020 fulltag-symbol))
     408(defconstant nil-value (+ #x3000 fulltag-nil))
     409(defconstant t-value (+ #x3020 fulltag-symbol))
    410410(defconstant misc-bias fulltag-misc)
    411411(defconstant cons-bias fulltag-cons)
  • trunk/ccl/lisp-kernel/area.h

    r5649 r5652  
    178178#define STATIC_RESERVE heap_segment_size
    179179
    180 #ifdef PPC
    181180#define STATIC_BASE_ADDRESS 0x00002000
    182 #else
    183 #define STATIC_BASE_ADDRESS 0x00001000
    184 #endif
    185181
    186182extern LispObj image_base;
  • trunk/ccl/lisp-kernel/lisp_globals.h

    r5638 r5652  
    8383
    8484#ifdef X8664
    85 #define lisp_global(g) (((LispObj *) 0x2000)[(g)])
    86 #define nrs_symbol(s) (((lispsymbol *) 0x2020)[(s)])
     85#define lisp_global(g) (((LispObj *) 0x3000)[(g)])
     86#define nrs_symbol(s) (((lispsymbol *) 0x3020)[(s)])
    8787#endif
    8888
  • trunk/ccl/lisp-kernel/x86-constants64.h

    r5366 r5652  
    198198
    199199
    200 #define nil_value (0x2000+fulltag_nil)
    201 #define t_value (0x2020+fulltag_symbol)
     200#define nil_value (0x3000+fulltag_nil)
     201#define t_value (0x3020+fulltag_symbol)
    202202#define misc_bias fulltag_misc
    203203#define cons_bias fulltag_cons
  • trunk/ccl/lisp-kernel/x86-constants64.s

    r5456 r5652  
    311311       
    312312                       
    313 nil_value = (0x2000+fulltag_nil)
    314 t_value = (0x2020+fulltag_symbol)
     313nil_value = (0x3000+fulltag_nil)
     314t_value = (0x3020+fulltag_symbol)
    315315misc_bias = fulltag_misc
    316316cons_bias = fulltag_cons
     
    508508
    509509       
    510         _struct(nrs,0x2020)
     510        _struct(nrs,0x3020)
    511511         _struct_pad(fulltag_symbol)
    512512         _struct_label(tsym)
     
    753753
    754754
    755 lisp_globals_limit = 0x2000
     755lisp_globals_limit = 0x3000
    756756       
    757757INTERRUPT_LEVEL_BINDING_INDEX = fixnumone
  • trunk/ccl/xdump/xx8664-fasload.lisp

    r5169 r5652  
    7070   :nil-relative-symbols x86::*x86-nil-relative-symbols*
    7171   :static-space-init-function 'x8664-initialize-static-space
    72    :purespace-reserve (ash 1 30)     
     72   :purespace-reserve (ash 1 30)
     73   :static-space-address (ash 2 12)
    7374))
    7475
     
    9091   :nil-relative-symbols x86::*x86-nil-relative-symbols*
    9192   :static-space-init-function 'x8664-initialize-static-space
    92    :purespace-reserve (ash 1 30)           
     93   :purespace-reserve (ash 1 30)
     94   :static-space-address (ash 2 12)
    9395))
    9496
     
    108110   :nil-relative-symbols x86::*x86-nil-relative-symbols*
    109111   :static-space-init-function 'x8664-initialize-static-space
    110    :purespace-reserve (ash 1 30)           
     112   :purespace-reserve (ash 1 30)
     113   :static-space-address (ash 2 12)
    111114))
    112115
Note: See TracChangeset for help on using the changeset viewer.