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

more H->HR

Browse Source
This commit is contained in:
Vítor Santos Costa 2014-01-19 21:57:02 +00:00
parent 6b2e1973ab
commit 7adad485de
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
C/computils.c
View File

@ -146,7 +146,7 @@ AllocCMem (UInt size, struct intermediates *cip)
char *p; char *p;
if (ASP <= CellPtr (cip->freep) + 256) { if (ASP <= CellPtr (cip->freep) + 256) {
CACHE_REGS CACHE_REGS
LOCAL_Error_Size = 256+((char *)cip->freep - (char *)H); LOCAL_Error_Size = 256+((char *)cip->freep - (char *)HR);
save_machine_regs(); save_machine_regs();
siglongjmp(cip->CompilerBotch, OUT_OF_STACK_BOTCH); siglongjmp(cip->CompilerBotch, OUT_OF_STACK_BOTCH);
} }
@ -856,12 +856,12 @@ void
Yap_ShowCode (struct intermediates *cint) Yap_ShowCode (struct intermediates *cint)
{ {
CACHE_REGS CACHE_REGS
CELL *oldH = H; CELL *oldH = HR;
struct PSEUDO *cpc; struct PSEUDO *cpc;
cpc = cint->CodeStart; cpc = cint->CodeStart;
/* MkIntTerm and friends may build terms in the global stack */ /* MkIntTerm and friends may build terms in the global stack */
H = (CELL *)cint->freep; HR = (CELL *)cint->freep;
while (cpc) { while (cpc) {
compiler_vm_op ic = cpc->op; compiler_vm_op ic = cpc->op;
if (ic != nop_op) { if (ic != nop_op) {
@ -870,7 +870,7 @@ Yap_ShowCode (struct intermediates *cint)
cpc = cpc->nextInst; cpc = cpc->nextInst;
} }
Yap_DebugErrorPutc ('\n'); Yap_DebugErrorPutc ('\n');
H = oldH; HR = oldH;
} }
#endif /* DEBUG */ #endif /* DEBUG */

6
C/heapgc.c
View File

@ -1010,7 +1010,7 @@ static void
inc_vars_of_type(CELL *curr,gc_types val) { inc_vars_of_type(CELL *curr,gc_types val) {
if (curr >= H0 && curr < TrueHB) { if (curr >= H0 && curr < TrueHB) {
old_vars++; old_vars++;
} else if (curr >= TrueHB && curr < H) { } else if (curr >= TrueHB && curr < HR) {
new_vars++; new_vars++;
} else { } else {
return; return;
@ -2371,7 +2371,7 @@ mark_choicepoints(register choiceptr gc_B, tr_fr_ptr saved_TR, int very_verbose
case _count_trust_me: case _count_trust_me:
case _retry: case _retry:
case _trust: case _trust:
if (IN_BETWEEN(H0,(CELL *)(gc_B->cp_ap),H)) { if (IN_BETWEEN(H0,(CELL *)(gc_B->cp_ap),HR)) {
fprintf(stderr,"OOPS in GC: gc not supported in this case!!!\n"); fprintf(stderr,"OOPS in GC: gc not supported in this case!!!\n");
exit(1); exit(1);
} }
@ -3895,7 +3895,7 @@ compaction_phase(tr_fr_ptr old_TR, CELL *current_env, yamop *curp USES_REGS)
-LOCAL_total_smarked -LOCAL_total_smarked
#endif #endif
!= LOCAL_iptop-(CELL_PTR *)H && LOCAL_iptop < (CELL_PTR *)ASP -1024) != LOCAL_iptop-(CELL_PTR *)H && LOCAL_iptop < (CELL_PTR *)ASP -1024)
fprintf(GLOBAL_stderr,"%% Oops on LOCAL_iptop-H (%ld) vs %ld\n", (unsigned long int)(LOCAL_iptop-(CELL_PTR *)H), LOCAL_total_marked); fprintf(GLOBAL_stderr,"%% Oops on LOCAL_iptop-H (%ld) vs %ld\n", (unsigned long int)(LOCAL_iptop-(CELL_PTR *)HR), LOCAL_total_marked);
*/ */
#endif #endif
#if DEBUGX #if DEBUGX