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

fix Yap_shift_visit for malloc: a few miscalculations...

Browse Source
This commit is contained in:
Vitor Santos Costa 2009-05-17 12:26:09 -07:00
parent 55036ad9bb
commit a52317b9c2
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/grow.c
View File

@ -1596,8 +1596,8 @@ Yap_shift_visit(CELL **to_visit, CELL ***to_visit_maxp)
{ {
#if USE_SYSTEM_MALLOC #if USE_SYSTEM_MALLOC
CELL **to_visit_max = *to_visit_maxp; CELL **to_visit_max = *to_visit_maxp;
Int sz1 = (CELL)to_visit_max-(CELL)to_visit; Int sz1 = (CELL)to_visit-(CELL)to_visit_max;
Int sz0 = AuxTop - (ADDR)to_visit_maxp, sz, dsz; Int sz0 = AuxTop - (ADDR)to_visit_max, sz, dsz;
char *newb = Yap_ExpandPreAllocCodeSpace(0, NULL); char *newb = Yap_ExpandPreAllocCodeSpace(0, NULL);
if (newb == NULL) { if (newb == NULL) {
@ -1608,6 +1608,10 @@ Yap_shift_visit(CELL **to_visit, CELL ***to_visit_maxp)
sz = AuxTop-newb; sz = AuxTop-newb;
/* how much we grew */ /* how much we grew */
dsz = sz-sz0; dsz = sz-sz0;
if (dsz == 0) {
Yap_Error(OUT_OF_HEAP_ERROR,TermNil,"cannot allocate temporary space for unification (%p)", to_visit);
return to_visit;
}
/* copy whole block to end */ /* copy whole block to end */
cpcellsd((CELL *)newb, (CELL *)(newb+dsz), sz0/sizeof(CELL)); cpcellsd((CELL *)newb, (CELL *)(newb+dsz), sz0/sizeof(CELL));
/* base pointer is block start */ /* base pointer is block start */