diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more bootstrap stuff

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-07-06 11:56:16 +01:00
parent 9a638d1312
commit a97754623f
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
C/c_interface.c
View File

@ -27,7 +27,7 @@
* fix try_logical and friends to handle case where predicate has arity 0. * fix try_logical and friends to handle case where predicate has arity 0.
* *
* Revision 1.118 2008/06/04 14:47:18 vsc * Revision 1.118 2008/06/04 14:47:18 vsc
* make sure we do trim_trail whenever we mess with B! * make sure we do trim_trail whenever we mess with B!cfc
* *
* Revision 1.117 2008/06/04 13:58:36 vsc * Revision 1.117 2008/06/04 13:58:36 vsc
* more fixes to C-interface * more fixes to C-interface
@ -2634,6 +2634,9 @@ YAP_InitConsult(int mode, const char *filename)
int sno; int sno;
BACKUP_MACHINE_REGS(); BACKUP_MACHINE_REGS();
if (mode == YAP_BOOT_MODE) {
mode = YAP_CONSULT_MODE;
}
bool consulted = (mode == YAP_CONSULT_MODE); bool consulted = (mode == YAP_CONSULT_MODE);
Yap_init_consult(consulted, filename); Yap_init_consult(consulted, filename);
f = fopen(filename, "r"); f = fopen(filename, "r");
@ -2805,7 +2808,7 @@ do_bootfile (char *bootfilename USES_REGS)
To be honest, YAP_InitConsult does not really do much, To be honest, YAP_InitConsult does not really do much,
it's here for the future. It also makes what we want to do clearer. it's here for the future. It also makes what we want to do clearer.
*/ */
bootfile = YAP_InitConsult(YAP_CONSULT_MODE,bootfilename); bootfile = YAP_InitConsult(YAP_BOOT_MODE,bootfilename);
if (bootfile <0) if (bootfile <0)
{ {
fprintf(stderr, "[ FATAL ERROR: could not open bootfile %s ]\n", bootfilename); fprintf(stderr, "[ FATAL ERROR: could not open bootfile %s ]\n", bootfilename);
@ -2879,7 +2882,6 @@ construct_init_file(char *boot_file, char *BootFile)
X_API Int X_API Int
YAP_Init(YAP_init_args *yap_init) YAP_Init(YAP_init_args *yap_init)
{ {
CACHE_REGS
int restore_result; int restore_result;
int do_bootstrap = (yap_init->YapPrologBootFile != NULL); int do_bootstrap = (yap_init->YapPrologBootFile != NULL);
CELL Trail = 0, Stack = 0, Heap = 0, Atts = 0; CELL Trail = 0, Stack = 0, Heap = 0, Atts = 0;
@ -2910,13 +2912,6 @@ YAP_Init(YAP_init_args *yap_init)
yap_init->SavedState = NULL; yap_init->SavedState = NULL;
} }
#endif #endif
if (BOOT_FROM_SAVED_STATE && !do_bootstrap) {
if (!Yap_SavedInfo (yap_init->SavedState, yap_init->YapLibDir, &Trail, &Stack, &Heap)) {
yap_init->ErrorNo = LOCAL_Error_TYPE;
yap_init->ErrorCause = LOCAL_ErrorMessage;
return YAP_BOOT_ERROR;
}
}
if (yap_init->TrailSize == 0) { if (yap_init->TrailSize == 0) {
if (yap_init->MaxTrailSize) { if (yap_init->MaxTrailSize) {
Trail = yap_init->MaxTrailSize; Trail = yap_init->MaxTrailSize;
@ -2954,10 +2949,13 @@ YAP_Init(YAP_init_args *yap_init)
yap_init->SchedulerLoop, yap_init->SchedulerLoop,
yap_init->DelayedReleaseLoad yap_init->DelayedReleaseLoad
); );
//
CACHE_REGS
if (yap_init->QuietMode) { if (yap_init->QuietMode) {
setVerbosity( TermSilent ); setVerbosity( TermSilent );
} }
{ if (yap_init->YapPrologRCFile != NULL) { { if (yap_init->YapPrologRCFile != NULL) {
/* /*
This must be done before restore, otherwise This must be done before restore, otherwise
@ -2980,6 +2978,13 @@ YAP_Init(YAP_init_args *yap_init)
} else { } else {
restore_result = YAP_BOOT_FROM_PROLOG; restore_result = YAP_BOOT_FROM_PROLOG;
} }
if (BOOT_FROM_SAVED_STATE && !do_bootstrap) {
if (!Yap_SavedInfo (yap_init->SavedState, yap_init->YapLibDir, &Trail, &Stack, &Heap)) {
yap_init->ErrorNo = LOCAL_Error_TYPE;
yap_init->ErrorCause = LOCAL_ErrorMessage;
return YAP_BOOT_ERROR;
}
}
GLOBAL_FAST_BOOT_FLAG = yap_init->FastBoot; GLOBAL_FAST_BOOT_FLAG = yap_init->FastBoot;
#if defined(YAPOR) || defined(TABLING) #if defined(YAPOR) || defined(TABLING)
Yap_init_root_frames(); Yap_init_root_frames();
@ -3056,13 +3061,10 @@ YAP_Init(YAP_init_args *yap_init)
Yap_AttsSize = Atts*1024; Yap_AttsSize = Atts*1024;
else else
Yap_AttsSize = 2048*sizeof(CELL); Yap_AttsSize = 2048*sizeof(CELL);
/* reset stacks */
// Yap_StartSlots( PASS_REGS1 );
if (restore_result == DO_ONLY_CODE) { if (restore_result == DO_ONLY_CODE) {
/* first, initialise the saved state */ /* first, initialise the saved state */
Term t_goal = MkAtomTerm(AtomInitProlog); Term t_goal = MkAtomTerm(AtomInitProlog);
YAP_RunGoalOnce(t_goal); YAP_RunGoalOnce(t_goal);
Yap_InitYaamRegs( 0 );
return YAP_BOOT_FROM_SAVED_CODE; return YAP_BOOT_FROM_SAVED_CODE;
} else { } else {
CurrentModule = LOCAL_SourceModule = USER_MODULE; CurrentModule = LOCAL_SourceModule = USER_MODULE;
@ -3095,8 +3097,6 @@ YAP_Init(YAP_init_args *yap_init)
fgoal = Yap_MkFunctor(Yap_LookupAtom("module"), 1); fgoal = Yap_MkFunctor(Yap_LookupAtom("module"), 1);
goal = Yap_MkApplTerm(fgoal, 1, as); goal = Yap_MkApplTerm(fgoal, 1, as);
YAP_RunGoalOnce(goal); YAP_RunGoalOnce(goal);
/* reset stacks */
Yap_InitYaamRegs( 0 );
} }
Yap_PutValue(Yap_FullLookupAtom("$live"), MkAtomTerm (Yap_FullLookupAtom("$true"))); Yap_PutValue(Yap_FullLookupAtom("$live"), MkAtomTerm (Yap_FullLookupAtom("$true")));
} }