Changeset 10522
- Timestamp:
- 08/22/08 09:54:17 (3 months ago)
- Files:
-
- branches/working-0711/ccl/lisp-kernel/area.h (modified) (1 diff)
- branches/working-0711/ccl/lisp-kernel/lisp_globals.h (modified) (1 diff)
- branches/working-0711/ccl/lisp-kernel/pmcl-kernel.c (modified) (1 diff)
- branches/working-0711/ccl/lisp-kernel/ppc-exceptions.h (modified) (2 diffs)
- branches/working-0711/ccl/lisp-kernel/x86-constants64.h (modified) (1 diff)
- branches/working-0711/ccl/lisp-kernel/x86-constants64.s (modified) (3 diffs)
- branches/working-0711/ccl/lisp-kernel/x86-exceptions.c (modified) (1 diff)
- branches/working-0711/ccl/lisp-kernel/x86-macros.s (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/working-0711/ccl/lisp-kernel/area.h
r10389 r10522 185 185 #define STATIC_RESERVE heap_segment_size 186 186 187 #ifndef X86 187 188 #define STATIC_BASE_ADDRESS 0x00002000 189 #else 190 #define STATIC_BASE_ADDRESS 0x00012000 191 #endif 188 192 189 193 extern LispObj image_base; branches/working-0711/ccl/lisp-kernel/lisp_globals.h
r10389 r10522 83 83 84 84 #ifdef X8664 85 #define lisp_global(g) (((LispObj *) 0x 3000)[(g)])86 #define nrs_symbol(s) (((lispsymbol *) 0x 3020)[(s)])85 #define lisp_global(g) (((LispObj *) 0x13000)[(g)]) 86 #define nrs_symbol(s) (((lispsymbol *) 0x13020)[(s)]) 87 87 #endif 88 88 branches/working-0711/ccl/lisp-kernel/pmcl-kernel.c
r10389 r10522 1603 1603 lisp_global(TCR_AREA_LOCK) = ptr_to_lispobj(tcr_area_lock); 1604 1604 1605 #ifdef X86 641605 #ifdef X86 1606 1606 lisp_global(SUBPRIMS_BASE) = (LispObj)((1<<16)+(5<<10)); 1607 1607 #else branches/working-0711/ccl/lisp-kernel/ppc-exceptions.h
r10389 r10522 65 65 */ 66 66 #define DarwinSigReturn(context) 67 #define SIGRETURN(context) 67 68 #endif 68 69 … … 128 129 #define DarwinSigReturn(x) (UC_MCONTEXT(x)->ss.xer)^=0x80 129 130 #endif 130 #endif 131 #define SIGRETURN(context) DarwinSigReturn(context) 132 #endif 133 134 135 131 136 132 137 branches/working-0711/ccl/lisp-kernel/x86-constants64.h
r9986 r10522 220 220 221 221 222 #define nil_value (0x 3000+fulltag_nil)223 #define t_value (0x 3020+fulltag_symbol)222 #define nil_value (0x13000+fulltag_nil) 223 #define t_value (0x13020+fulltag_symbol) 224 224 #define misc_bias fulltag_misc 225 225 #define cons_bias fulltag_cons branches/working-0711/ccl/lisp-kernel/x86-constants64.s
r9987 r10522 516 516 517 517 518 nil_value = (0x 3000+fulltag_nil)519 t_value = (0x 3020+fulltag_symbol)518 nil_value = (0x13000+fulltag_nil) 519 t_value = (0x13020+fulltag_symbol) 520 520 misc_bias = fulltag_misc 521 521 cons_bias = fulltag_cons … … 720 720 721 721 722 _struct(nrs,0x 3020)722 _struct(nrs,0x13020) 723 723 _struct_pad(fulltag_symbol) 724 724 _struct_label(tsym) … … 970 970 971 971 972 lisp_globals_limit = 0x 3000972 lisp_globals_limit = 0x13000 973 973 974 974 INTERRUPT_LEVEL_BINDING_INDEX = fixnumone branches/working-0711/ccl/lisp-kernel/x86-exceptions.c
r10389 r10522 612 612 xpPC(xp) = rpc; 613 613 } else { 614 xpPC(xp) = (LispObj)(&(deref(container,1)))+rpc; 614 xpPC(xp) = (LispObj)(&(deref(container, 615 #ifdef X8664 616 1 617 #else 618 0 619 #endif 620 )))+rpc; 615 621 } 616 622 branches/working-0711/ccl/lisp-kernel/x86-macros.s
r10389 r10522 701 701 ]) 702 702 703 define([check_cstack_alignment],[ 704 new_macro_labels() 705 __(testb [$]7,rcontext(tcr.foreign_sp)) 706 __(je macro_label(done)) 707 __(hlt) 708 macro_label(done): 709 ]) 710
