steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bootstrap

db4
Slava Pestov 2007-12-29 22:44:25 -05:00
parent 529133559f
commit 5378c05508
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vm/code_heap.c
View File

@ -56,9 +56,17 @@ INLINE CELL compute_code_rel(F_REL *rel,
return CREF(words_start,REL_ARGUMENT(rel)); return CREF(words_start,REL_ARGUMENT(rel));
case RT_XT: case RT_XT:
word = untag_word(get(CREF(words_start,REL_ARGUMENT(rel)))); word = untag_word(get(CREF(words_start,REL_ARGUMENT(rel))));
return (CELL)word->code if(word->code)
+ sizeof(F_COMPILED) {
+ (profiling_p_ ? 0 : word->code->profiler_prologue); return (CELL)word->code
+ sizeof(F_COMPILED)
+ (profiling_p_ ? 0 : word->code->profiler_prologue);
}
else
{
/* Its only NULL in stage 2 early init */
return 0;
}
case RT_XT_PROFILING: case RT_XT_PROFILING:
word = untag_word(get(CREF(words_start,REL_ARGUMENT(rel)))); word = untag_word(get(CREF(words_start,REL_ARGUMENT(rel))));
return (CELL)word->code + sizeof(F_COMPILED); return (CELL)word->code + sizeof(F_COMPILED);

4
vm/factor.c
View File

@ -32,7 +32,7 @@ void default_parameters(F_PARAMETERS *p)
/* Do some initialization that we do once only */ /* Do some initialization that we do once only */
void do_stage1_init(void) void do_stage1_init(void)
{ {
fprintf(stderr,"*** Starting stage 2 early init...\n"); fprintf(stderr,"*** Stage 2 early init... ");
fflush(stderr); fflush(stderr);
jit_compile(userenv[UNDEFINED_ENV]); jit_compile(userenv[UNDEFINED_ENV]);
@ -60,7 +60,7 @@ void do_stage1_init(void)
userenv[STAGE2_ENV] = T; userenv[STAGE2_ENV] = T;
fprintf(stderr,"*** Finished stage 2 early init\n"); fprintf(stderr,"done\n");
fflush(stderr); fflush(stderr);
} }