Raymond Toy pushed to branch master at cmucl / cmucl

Commits:

7 changed files:

Changes:

  • .gitlab-ci.yml
    1 1
     variables:
    
    2
    -  download_url: "https://common-lisp.net/project/cmucl/downloads/snapshots/2023/04"
    
    3
    -  version: "2023-04-x86"
    
    4
    -  bootstrap: "-B boot-21e"
    
    2
    +  download_url: "https://common-lisp.net/project/cmucl/downloads/release/21e"
    
    3
    +  version: "21e-x86"
    
    4
    +  bootstrap: ""
    
    5 5
     
    
    6 6
     stages:
    
    7 7
       - install
    

  • src/code/sparc-svr4-vm.lisp
    ... ... @@ -26,9 +26,6 @@
    26 26
     #+complex-fp-vops
    
    27 27
     (sys:register-lisp-feature :complex-fp-vops)
    
    28 28
     
    
    29
    -#+(and sparc solaris)
    
    30
    -(sys:register-lisp-runtime-feature :relocatable-stacks)
    
    31
    -
    
    32 29
     
    
    33 30
     ;;;; The sigcontext structure.
    
    34 31
     
    

  • src/code/x86-vm.lisp
    ... ... @@ -42,9 +42,6 @@
    42 42
       (setf *features* (delete :x87 *features*))
    
    43 43
       (sys:register-lisp-feature :sse2))
    
    44 44
     
    
    45
    -#+(or darwin linux)
    
    46
    -(sys:register-lisp-runtime-feature :relocatable-stacks)
    
    47
    -
    
    48 45
     
    
    49 46
     ;;;; The sigcontext structure.
    
    50 47
     
    

  • src/lisp/solaris-os.c
    ... ... @@ -415,10 +415,6 @@ os_vm_address_t round_up_sparse_size(os_vm_address_t addr)
    415 415
      */
    
    416 416
     static os_vm_address_t spaces[] = {
    
    417 417
         READ_ONLY_SPACE_START, STATIC_SPACE_START,
    
    418
    -#ifndef FEATURE_RELOCATABLE_STACKS
    
    419
    -    BINDING_STACK_START,
    
    420
    -    CONTROL_STACK_START
    
    421
    -#endif    
    
    422 418
     };
    
    423 419
     
    
    424 420
     /*
    
    ... ... @@ -505,10 +501,8 @@ make_holes(void)
    505 501
     void
    
    506 502
     make_stack_holes(void)
    
    507 503
     {
    
    508
    -#ifdef FEATURE_RELOCATABLE_STACKS
    
    509 504
         make_hole((os_vm_address_t)control_stack, control_stack_size);
    
    510 505
         make_hole((os_vm_address_t)binding_stack, binding_stack_size);
    
    511
    -#endif
    
    512 506
     }
    
    513 507
         
    
    514 508
     void *
    

  • src/lisp/sparc-validate.h
    ... ... @@ -92,22 +92,12 @@
    92 92
     #define READ_ONLY_SPACE_START	(SpaceStart_TargetReadOnly)
    
    93 93
     #define READ_ONLY_SPACE_SIZE	((2*MB_128) - SPARSE_BLOCK_SIZE)	/* 256 MB - 32 KB, 256 MB max */
    
    94 94
     
    
    95
    -#ifndef FEATURE_RELOCATABLE_STACKS
    
    96
    -#define BINDING_STACK_START 	(0x20000000)
    
    97
    -#endif
    
    98
    -
    
    99 95
     #define BINDING_STACK_SIZE  	(MB_128 - SPARSE_BLOCK_SIZE)	/* 128 MB - 32 KB, 128 MB max */
    
    100 96
     
    
    101 97
     #define STATIC_SPACE_START  	(SpaceStart_TargetStatic)
    
    102 98
     #define STATIC_SPACE_SIZE   	((2*MB_128) - SPARSE_BLOCK_SIZE)	/* 256 MB - 32 KB, 256 MB max */
    
    103 99
     
    
    104
    -#ifndef FEATURE_RELOCATABLE_STACKS
    
    105
    -#define CONTROL_STACK_START 	(0x38000000)
    
    106
    -#endif
    
    107 100
     #define CONTROL_STACK_SIZE  	(MB_128 - SPARSE_BLOCK_SIZE)	/* 128 MB - 32 KB, 128 MB max */
    
    108
    -#if 0
    
    109
    -#define CONTROL_STACK_END       (CONTROL_STACK_START + control_stack_size)
    
    110
    -#endif
    
    111 101
     
    
    112 102
     #define SIGNAL_STACK_SIZE	SIGSTKSZ
    
    113 103
     
    

  • src/lisp/x86-validate-darwin.h
    ... ... @@ -18,24 +18,14 @@
    18 18
     #define STATIC_SPACE_START	(SpaceStart_TargetStatic)
    
    19 19
     #define STATIC_SPACE_SIZE	(0x0ffff000)	/* 256MB - 1 page */
    
    20 20
     
    
    21
    -#ifndef FEATURE_RELOCATABLE_STACKS
    
    22
    -#define BINDING_STACK_START	(0x38000000)
    
    23
    -#endif
    
    24 21
     #define BINDING_STACK_SIZE	(0x07fff000)	/* 128MB - 1 page */
    
    25 22
     
    
    26
    -#ifndef FEATURE_RELOCATABLE_STACKS
    
    27
    -#define CONTROL_STACK_START	(0x40000000)
    
    28
    -#endif
    
    29
    -
    
    30 23
     /*
    
    31 24
      * According to /usr/include/sys/signal.h, MINSIGSTKSZ is 32K and
    
    32 25
      * SIGSTKSZ is 128K.  We should account for that appropriately.
    
    33 26
      */
    
    34 27
     #define CONTROL_STACK_SIZE	(0x07fdf000)	/* 128MB - SIGSTKSZ - 1 page */
    
    35 28
     
    
    36
    -#ifndef FEATURE_RELOCATABLE_STACKS
    
    37
    -#define SIGNAL_STACK_START	(0x47fe0000)    /* One page past the end of the control stack */
    
    38
    -#endif
    
    39 29
     #define SIGNAL_STACK_SIZE	SIGSTKSZ
    
    40 30
     
    
    41 31
     #define DYNAMIC_0_SPACE_START	(SpaceStart_TargetDynamic)
    

  • src/lisp/x86-validate-linux.h
    ... ... @@ -63,19 +63,10 @@
    63 63
     #define STATIC_SPACE_START	(SpaceStart_TargetStatic)
    
    64 64
     #define STATIC_SPACE_SIZE	(0x0ffff000)	/* 256MB - 1 page */
    
    65 65
     
    
    66
    -#ifndef FEATURE_RELOCATABLE_STACKS
    
    67
    -#define BINDING_STACK_START	(0x20000000)
    
    68
    -#endif
    
    69 66
     #define BINDING_STACK_SIZE	(0x07fff000)	/* 128MB - 1 page */
    
    70 67
     
    
    71
    -#ifndef FEATURE_RELOCATABLE_STACKS
    
    72
    -#define CONTROL_STACK_START	0x38000000
    
    73
    -#endif
    
    74 68
     #define CONTROL_STACK_SIZE	(0x07fff000 - 8192)
    
    75 69
     
    
    76
    -#ifndef FEATURE_RELOCATABLE_STACKS
    
    77
    -#define SIGNAL_STACK_START	CONTROL_STACK_END
    
    78
    -#endif
    
    79 70
     #define SIGNAL_STACK_SIZE	SIGSTKSZ
    
    80 71
     
    
    81 72
     #define DYNAMIC_0_SPACE_START	(SpaceStart_TargetDynamic)