Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-09 14:07:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing context offset calculation

Browse source
This commit is contained in:
Alex Shinn 2011-10-31 21:49:34 +09:00
parent ed76df654d
commit 6ce131dc04
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
main.c
View file

@ -65,6 +65,10 @@ static sexp sexp_load_image (const char* file, sexp_uint_t heap_size, sexp_uint_
} }
if (heap_size < header.size) heap_size = header.size; if (heap_size < header.size) heap_size = header.size;
heap = (sexp_heap)malloc(sexp_heap_pad_size(heap_size)); heap = (sexp_heap)malloc(sexp_heap_pad_size(heap_size));
if (!heap) {
fprintf(stderr, "couldn't malloc heap\n");
return NULL;
}
if (read(fd, heap, header.size) != header.size) { if (read(fd, heap, header.size) != header.size) {
fprintf(stderr, "error reading image\n"); fprintf(stderr, "error reading image\n");
return NULL; return NULL;
@ -87,7 +91,7 @@ static sexp sexp_load_image (const char* file, sexp_uint_t heap_size, sexp_uint_
} }
heap->size += (heap_size - heap->size); heap->size += (heap_size - heap->size);
} }
ctx = (sexp)(header.context + offset); ctx = (sexp)(((char*)header.context) + offset);
globals = sexp_vector_data((sexp)((char*)sexp_context_globals(ctx) + offset)); globals = sexp_vector_data((sexp)((char*)sexp_context_globals(ctx) + offset));
types = sexp_vector_data((sexp)((char*)(globals[SEXP_G_TYPES]) + offset)); types = sexp_vector_data((sexp)((char*)(globals[SEXP_G_TYPES]) + offset));
flags = sexp_fx_add(SEXP_COPY_LOADP, SEXP_COPY_FREEP); flags = sexp_fx_add(SEXP_COPY_LOADP, SEXP_COPY_FREEP);