Changeset 10522


Ignore:
Timestamp:
Aug 22, 2008, 1:54:17 PM (11 years ago)
Author:
gb
Message:

Lots of changes coming on this branch; will check in binaries when
all done.

Executive summary: merge many changes from trunk (making trunk and
this branch closer), change the address of NIL and other static
constants to be above the limit (vm.mmap.min_addr) set in recent
Linux distributions. Change fasl version and image-abi-version,
so code compiled in previous versions won't work in this version
(and vice versa), mostly due to the different notions of the
values of NIL and other constants.

For these files: copy versions from trunk as of this date.

Location:
branches/working-0711/ccl/lisp-kernel
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl/lisp-kernel/area.h

    r10389 r10522  
    185185#define STATIC_RESERVE heap_segment_size
    186186
     187#ifndef X86
    187188#define STATIC_BASE_ADDRESS 0x00002000
     189#else
     190#define STATIC_BASE_ADDRESS 0x00012000
     191#endif
    188192
    189193extern LispObj image_base;
  • branches/working-0711/ccl/lisp-kernel/lisp_globals.h

    r10389 r10522  
    8383
    8484#ifdef X8664
    85 #define lisp_global(g) (((LispObj *) 0x3000)[(g)])
    86 #define nrs_symbol(s) (((lispsymbol *) 0x3020)[(s)])
     85#define lisp_global(g) (((LispObj *) 0x13000)[(g)])
     86#define nrs_symbol(s) (((lispsymbol *) 0x13020)[(s)])
    8787#endif
    8888
  • branches/working-0711/ccl/lisp-kernel/pmcl-kernel.c

    r10389 r10522  
    16051605  lisp_global(TCR_AREA_LOCK) = ptr_to_lispobj(tcr_area_lock);
    16061606
    1607 #ifdef X8664
     1607#ifdef X86
    16081608  lisp_global(SUBPRIMS_BASE) = (LispObj)((1<<16)+(5<<10));
    16091609#else
  • branches/working-0711/ccl/lisp-kernel/ppc-exceptions.h

    r10389 r10522  
    6565*/
    6666#define DarwinSigReturn(context)
     67#define SIGRETURN(context)
    6768#endif
    6869
     
    128129#define DarwinSigReturn(x) (UC_MCONTEXT(x)->ss.xer)^=0x80
    129130#endif
    130 #endif
     131#define SIGRETURN(context) DarwinSigReturn(context)
     132#endif
     133
     134
     135
    131136
    132137
  • branches/working-0711/ccl/lisp-kernel/x86-constants64.h

    r9986 r10522  
    220220
    221221
    222 #define nil_value (0x3000+fulltag_nil)
    223 #define t_value (0x3020+fulltag_symbol)
     222#define nil_value (0x13000+fulltag_nil)
     223#define t_value (0x13020+fulltag_symbol)       
    224224#define misc_bias fulltag_misc
    225225#define cons_bias fulltag_cons
  • branches/working-0711/ccl/lisp-kernel/x86-constants64.s

    r9987 r10522  
    516516       
    517517                       
    518 nil_value = (0x3000+fulltag_nil)
    519 t_value = (0x3020+fulltag_symbol)
     518nil_value = (0x13000+fulltag_nil)
     519t_value = (0x13020+fulltag_symbol)
    520520misc_bias = fulltag_misc
    521521cons_bias = fulltag_cons
     
    720720
    721721       
    722         _struct(nrs,0x3020)
     722        _struct(nrs,0x13020)
    723723         _struct_pad(fulltag_symbol)
    724724         _struct_label(tsym)
     
    970970
    971971
    972 lisp_globals_limit = 0x3000
     972lisp_globals_limit = 0x13000
    973973       
    974974INTERRUPT_LEVEL_BINDING_INDEX = fixnumone
  • branches/working-0711/ccl/lisp-kernel/x86-exceptions.c

    r10389 r10522  
    612612        xpPC(xp) = rpc;
    613613      } 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;
    615621      }
    616622       
  • branches/working-0711/ccl/lisp-kernel/x86-macros.s

    r10389 r10522  
    701701])
    702702
     703define([check_cstack_alignment],[
     704        new_macro_labels()
     705        __(testb [$]7,rcontext(tcr.foreign_sp))
     706        __(je macro_label(done))
     707        __(hlt)
     708macro_label(done):
     709])
     710                       
Note: See TracChangeset for help on using the changeset viewer.