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

don't add minimums, compare them for memory overflows.

Browse Source
This commit is contained in:
Vitor Santos Costa 2009-04-26 10:50:56 -05:00
parent e06ee4d4fa
commit e7b01f64d0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
C/heapgc.c
View File

@ -3957,7 +3957,7 @@ call_gc(UInt gc_lim, Int predarity, CELL *current_env, yamop *nextop)
LeaveGCMode(); LeaveGCMode();
if (gc_margin < 2*CalculateStackGap()) if (gc_margin < 2*CalculateStackGap())
gc_margin = 2*CalculateStackGap(); gc_margin = 2*CalculateStackGap();
return Yap_growstack(gc_margin*sizeof(CELL)); return Yap_growstack(gc_margin);
} }
/* /*
* debug for(save_total=1; save_total<=N; ++save_total) * debug for(save_total=1; save_total<=N; ++save_total)
@ -4003,8 +4003,12 @@ int
Yap_gcl(UInt gc_lim, Int predarity, CELL *current_env, yamop *nextop) Yap_gcl(UInt gc_lim, Int predarity, CELL *current_env, yamop *nextop)
{ {
int res; int res;
UInt min = CalculateStackGap()*sizeof(CELL);
Yap_PrologMode |= GCMode; Yap_PrologMode |= GCMode;
res = call_gc(gc_lim+CalculateStackGap()*sizeof(CELL), predarity, current_env, nextop); if (gc_lim < min)
gc_lim = min;
res = call_gc(gc_lim, predarity, current_env, nextop);
LeaveGCMode(); LeaveGCMode();
return res; return res;
} }