Changeset 13617


Ignore:
Timestamp:
Apr 11, 2010, 11:25:51 PM (11 years ago)
Author:
gb
Message:

Move IMAGE_BASE_ADDRESS, PURESPACE_RESERVE definitions to platform header;
move STATIC_BASE_ADDRESS to architecture-specific constants.h.

Location:
trunk/source/lisp-kernel
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/lisp-kernel/area.h

    r13431 r13617  
    124124#define MIN_VSTACK_SIZE (1<<16)
    125125#define VSTACK_HARDPROT (1<<12)
     126
    126127#ifdef PPC
    127128#define VSTACK_SOFTPROT (1<<16)
    … …  
    129130#define VSTACK_SOFTPROT CSTACK_SOFTPROT
    130131#endif
     132
    131133#define MIN_TSTACK_SIZE (1<<18)
    132134#define TSTACK_HARDPROT 0
    133135#define TSTACK_SOFTPROT (1<<16)
     136
    134137#ifdef PPC
    135138#define CS_OVERFLOW_FORCE_LIMIT ((natural)(-(sizeof(lisp_frame))))
    … …  
    141144
    142145
    143 #ifdef PPC
    144 #ifdef LINUX
    145 #ifdef PPC64
    146 #define IMAGE_BASE_ADDRESS 0x50000000000L
    147 #else
    148 #define IMAGE_BASE_ADDRESS 0x31000000
    149 #endif
    150 #endif
    151 #ifdef DARWIN
    152 #ifdef PPC64
    153 #define IMAGE_BASE_ADDRESS 0x300000000000L
    154 #else
    155 #define IMAGE_BASE_ADDRESS 0x04000000
    156 #endif
    157 #endif
    158 #endif
    159146
    160 #ifdef X86
    161 #ifdef LINUX
    162 #ifdef X8664
    163 #define IMAGE_BASE_ADDRESS 0x300000000000L
    164 #else
    165 #define IMAGE_BASE_ADDRESS 0x10000000
    166 #endif
    167 #endif
    168 #ifdef FREEBSD
    169 #ifdef X8664
    170 #define IMAGE_BASE_ADDRESS 0x300000000000L /* 0x100000000L */
    171 #else
    172 #define IMAGE_BASE_ADDRESS 0x30000000
    173 #endif
    174 #endif
    175 #ifdef SOLARIS
    176 #ifdef X8664
    177 #define IMAGE_BASE_ADDRESS 0x300000000000L
    178 #else
    179 #define IMAGE_BASE_ADDRESS 0x10000000
    180 #endif
    181 #endif
    182 #ifdef DARWIN
    183 #ifdef X8664
    184 #define IMAGE_BASE_ADDRESS 0x300000000000L
    185 #else
    186 #define IMAGE_BASE_ADDRESS 0x04000000
    187 #endif
    188 #endif
    189 #endif
    190 #ifdef WINDOWS
    191 #ifdef X8664
    192 #define IMAGE_BASE_ADDRESS 0x100000000LL
    193 #else
    194 #define IMAGE_BASE_ADDRESS 0x04000000
    195 #endif
    196 #endif
    197147
    198148#if (WORD_SIZE==64)
    … …  
    206156#define STATIC_RESERVE heap_segment_size
    207157
    208 #ifndef X86
    209 #define STATIC_BASE_ADDRESS (0x00002000+(LOWMEM_BIAS))
    210 #else
    211 #define STATIC_BASE_ADDRESS (0x00012000+(LOWMEM_BIAS))
    212 #endif
    213158
    214159#define SPJUMP_TARGET_ADDRESS (STATIC_BASE_ADDRESS+0x3000)

  • trunk/source/lisp-kernel/platform-darwinppc.h

    r13608 r13617  
    3030
    3131#include "standard-inttypes.h"
     32
     33#define MAXIMUM_MAPPABLE_MEMORY ((1U<<31)-2*heap_segment_size)
     34#define IMAGE_BASE_ADDRESS 0x04000000
     35

  • trunk/source/lisp-kernel/platform-darwinppc64.h

    r13608 r13617  
    3030
    3131#include "standard-inttypes.h"
     32
     33#define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
     34#define IMAGE_BASE_ADDRESS 0x300000000000L
     35

  • trunk/source/lisp-kernel/platform-darwinx8632.h

    r13608 r13617  
    3131#include "standard-inttypes.h"
    3232
     33#define MAXIMUM_MAPPABLE_MEMORY ((1U<<31)-2*heap_segment_size)
     34#define IMAGE_BASE_ADDRESS 0x04000000
     35

  • trunk/source/lisp-kernel/platform-darwinx8664.h

    r13608 r13617  
    3131
    3232#include "standard-inttypes.h"
     33
     34#define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
     35#define IMAGE_BASE_ADDRESS 0x300000000000L
     36

  • trunk/source/lisp-kernel/platform-freebsdx8632.h

    r13608 r13617  
    2626
    2727
     28#define MAXIMUM_MAPPABLE_MEMORY (1U<<30)
     29#define IMAGE_BASE_ADDRESS 0x30000000
    2830

  • trunk/source/lisp-kernel/platform-freebsdx8664.h

    r13608 r13617  
    2525#include "standard-inttypes.h"
    2626
     27#define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
     28#define IMAGE_BASE_ADDRESS 0x300000000000L
    2729
    28 

  • trunk/source/lisp-kernel/platform-linuxppc.h

    r13608 r13617  
    2626
    2727
     28#define MAXIMUM_MAPPABLE_MEMORY (1U<<30)
     29#define IMAGE_BASE_ADDRESS 0x31000000
    2830

  • trunk/source/lisp-kernel/platform-linuxppc64.h

    r13608 r13617  
    2525#include "standard-inttypes.h"
    2626
     27#define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
     28#define IMAGE_BASE_ADDRESS 0x50000000000L
    2729
    28 

  • trunk/source/lisp-kernel/platform-linuxx8632.h

    r13608 r13617  
    2626
    2727
     28#define MAXIMUM_MAPPABLE_MEMORY (9U<<28)
     29#define IMAGE_BASE_ADDRESS 0x10000000
    2830

  • trunk/source/lisp-kernel/platform-linuxx8664.h

    r13608 r13617  
    2525#include "standard-inttypes.h"
    2626
    27 
    28 
     27#define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
     28#define IMAGE_BASE_ADDRESS 0x300000000000L

  • trunk/source/lisp-kernel/platform-solarisx64.h

    r13608 r13617  
    2525#include "solaris-inttypes.h"
    2626
    27 
    28 
     27#define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
     28#define IMAGE_BASE_ADDRESS 0x300000000000L

  • trunk/source/lisp-kernel/platform-solarisx86.h

    r13608 r13617  
    2525#include "solaris-inttypes.h"
    2626
     27#define MAXIMUM_MAPPABLE_MEMORY (1U<<30)
     28#define IMAGE_BASE_ADDRESS 0x10000000
    2729
    28 

  • trunk/source/lisp-kernel/platform-win32.h

    r13610 r13617  
    2727
    2828
     29#define MAXIMUM_MAPPABLE_MEMORY (1U<<30)
     30#define IMAGE_BASE_ADDRESS 0x04000000
    2931

  • trunk/source/lisp-kernel/platform-win64.h

    r13611 r13617  
    2626
    2727#include "windows-inttypes.h"
     28
     29/* Supposedly, the high-end version of Vista allow 128GB of pageable memory */
     30#define MAXIMUM_MAPPABLE_MEMORY (512LL<<30LL)
     31#define IMAGE_BASE_ADDRESS 0x100000000LL
     32
     33

  • trunk/source/lisp-kernel/pmcl-kernel.c

    r13592 r13617  
    363363  }
    364364}
    365 
    366 #if WORD_SIZE == 64
    367 #ifdef DARWIN
    368 #define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
    369 #endif
    370 #ifdef FREEBSD
    371 #define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
    372 #endif
    373 #ifdef SOLARIS
    374 #define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
    375 #endif
    376 #ifdef LINUX
    377 #ifdef X8664
    378 #define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
    379 #endif
    380 #ifdef PPC
    381 #define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
    382 #endif
    383 #endif
    384 #ifdef WINDOWS
    385 /* Supposedly, the high-end version of Vista allow 128GB of pageable memory */
    386 #define MAXIMUM_MAPPABLE_MEMORY (512LL<<30LL)
    387 #endif
    388 #else
    389 #ifdef DARWIN
    390 #define MAXIMUM_MAPPABLE_MEMORY ((1U<<31)-2*heap_segment_size)
    391 #endif
    392 #ifdef LINUX
    393 #ifdef X86
    394 #define MAXIMUM_MAPPABLE_MEMORY (9U<<28)
    395 #else
    396 #define MAXIMUM_MAPPABLE_MEMORY (1U<<30)
    397 #endif
    398 #endif
    399 #ifdef WINDOWS
    400 #define MAXIMUM_MAPPABLE_MEMORY (1U<<30)
    401 #endif
    402 #ifdef FREEBSD
    403 #define MAXIMUM_MAPPABLE_MEMORY (1U<<30)
    404 #endif
    405 #ifdef SOLARIS
    406 #define MAXIMUM_MAPPABLE_MEMORY (1U<<30)
    407 #endif
    408 #endif
    409365
    410366natural

  • trunk/source/lisp-kernel/ppc-constants.h

    r13067 r13617  
    8787
    8888#define INTERRUPT_LEVEL_BINDING_INDEX (1)
     89#define STATIC_BASE_ADDRESS 0x00002000
    8990
    9091#endif /* __ppc_constants__ */

  • trunk/source/lisp-kernel/x86-constants.h

    r13067 r13617  
    5959#define X86_OVERFLOW_FLAG_BIT (11)
    6060
     61#define STATIC_BASE_ADDRESS 0x00012000
     62
    6163
    6264#endif /* __x86_constants__ */
Note: See TracChangeset for help on using the changeset viewer.