Skip to content
Snippets Groups Projects
Commit fd78c6a4 authored by fgilham's avatar fgilham
Browse files

Back out change setting dynamic space variables. It's already done in lisp.c.

parent 4bacca87
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
Above changes put into main CVS branch. 05-Jul-2007. Above changes put into main CVS branch. 05-Jul-2007.
$Id: elf.c,v 1.10 2007/07/19 00:12:06 fgilham Exp $ $Id: elf.c,v 1.11 2007/07/20 02:03:55 fgilham Exp $
*/ */
#include <stdio.h> #include <stdio.h>
...@@ -369,8 +369,6 @@ map_core_sections(char *exec_name) ...@@ -369,8 +369,6 @@ map_core_sections(char *exec_name)
int strsecoff; /* File offset to string table section. */ int strsecoff; /* File offset to string table section. */
int sections_remaining = 3; int sections_remaining = 3;
int i, j; int i, j;
lispobj *free_pointer;
os_vm_address_t addr;
extern int extern int
image_dynamic_space_size, image_dynamic_space_size,
image_static_space_size, image_static_space_size,
...@@ -404,23 +402,15 @@ map_core_sections(char *exec_name) ...@@ -404,23 +402,15 @@ map_core_sections(char *exec_name)
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
if (!strncmp(nambuf, section_names[j], 6)) { if (!strncmp(nambuf, section_names[j], 6)) {
/* Found a core section. Map it! */ /* Found a core section. Map it! */
if ((addr = (os_vm_address_t) os_map(exec_fd, sh.sh_offset, if ((os_vm_address_t) os_map(exec_fd, sh.sh_offset,
(os_vm_address_t) sh.sh_addr, sh.sh_size)) (os_vm_address_t) sh.sh_addr, sh.sh_size)
== (os_vm_address_t) -1) { == (os_vm_address_t) -1) {
fprintf(stderr, "Can't map section %s\n", section_names[j]); fprintf(stderr, "Can't map section %s\n", section_names[j]);
exit(-1); exit(-1);
} }
free_pointer = (lispobj *) addr + sh.sh_size;
switch(j) { switch(j) {
case 0: /* Dynamic space. */ case 0: /* Dynamic space. */
current_dynamic_space = (lispobj *)addr; /* Dynamic space variables are set in lisp.c. */
#if defined(ibmrt) || defined(i386) || defined(__x86_64)
SetSymbolValue(ALLOCATION_POINTER, (lispobj) free_pointer);
#else
current_dynamic_space_free_pointer = free_pointer;
#endif
image_dynamic_space_size = sh.sh_size; image_dynamic_space_size = sh.sh_size;
break; break;
case 1: /* Static space. */ case 1: /* Static space. */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment