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

compilation fixes

Browse Source
This commit is contained in:
Vitor Santos Costa 2019-04-25 19:02:01 +01:00
parent 5f819fd7b4
commit dc5b90a643
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
C/heapgc.c
View File

@ -2090,12 +2090,12 @@ mark_choicepoints(register choiceptr gc_B, tr_fr_ptr saved_TR, bool very_verbose
restart_cp: restart_cp:
switch (opnum) { switch (opnum) {
case _Nstop: case _Nstop:
if (gc_B->cp_b != NULL) { if (gc_B->cp_env == LCL0) {
nargs = 0; return;
break; } else {
} else { // This must be a border choicepoint, just move up
/* this is the last choice point, the work is done ;-) */ gc_B = (choiceptr)(gc_B->cp_env[E_B]);
return; continue;
} }
case _retry_c: case _retry_c:
case _retry_userc: case _retry_userc:
@ -3025,11 +3025,14 @@ sweep_choicepoints(choiceptr gc_B USES_REGS)
sweep_environments(gc_B->cp_env, sweep_environments(gc_B->cp_env,
EnvSizeInCells, EnvSizeInCells,
NULL PASS_REGS); NULL PASS_REGS);
if (gc_B->cp_b != NULL) { if (gc_B->cp_env == LCL0) {
break; return;
} else } else {
return; // This must be a border choicepoint, just move up
case _trust_fail: gc_B = (choiceptr)(gc_B->cp_env[E_B]);
continue;
}
case _trust_fail:
break; break;
case _or_else: case _or_else:
case _or_last: case _or_last:

11
C/utilpreds.c
View File

@ -52,14 +52,13 @@ typedef struct non_single_struct_t {
} }
#define def_aux_overflow() \ #define def_aux_overflow() \
aux_overflow:{ \ while (to_visit_max-to_visit0 < 32) { \
size_t d1 = to_visit-to_visit0; \ size_t d1 = to_visit-to_visit0; \
size_t d2 = to_visit_max-to_visit0; \ size_t d2 = to_visit_max-to_visit0; \
to_visit0 = Realloc(to_visit0,(d2+128)*sizeof(struct non_single_struct_t)); \ size_t d3 = Yap_Min(d2+1024, d2 *2); \
to_visit0 = Realloc(to_visit0,d3*sizeof(struct non_single_struct_t)); \
to_visit = to_visit0+d1; \ to_visit = to_visit0+d1; \
to_visit_max = to_visit0+(d2+128); \ to_visit_max = to_visit0+(d3); \
pt0--; \
goto restart; \
} }
#define def_global_overflow() \ #define def_global_overflow() \