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

fix stack swap

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-07-22 19:15:08 -05:00
parent 6ae0c450b3
commit 01a720389e
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
C/grow.c
View File

@ -109,10 +109,7 @@ SetHeapRegs(bool copying_threads USES_REGS)
LOCAL_TrailBase = TrailAddrAdjust(LOCAL_TrailBase); LOCAL_TrailBase = TrailAddrAdjust(LOCAL_TrailBase);
LOCAL_TrailTop = TrailAddrAdjust(LOCAL_TrailTop); LOCAL_TrailTop = TrailAddrAdjust(LOCAL_TrailTop);
CurrentTrailTop = (tr_fr_ptr)(LOCAL_TrailTop-MinTrailGap); CurrentTrailTop = (tr_fr_ptr)(LOCAL_TrailTop-MinTrailGap);
if (LOCAL_GDiff) { LOCAL_GlobalBase = BaseAddrAdjust(LOCAL_GlobalBase);
/* make sure we are not just expanding the delay stack */
LOCAL_GlobalBase = BaseAddrAdjust(LOCAL_GlobalBase);
}
LOCAL_LocalBase = LocalAddrAdjust(LOCAL_LocalBase); LOCAL_LocalBase = LocalAddrAdjust(LOCAL_LocalBase);
#if !USE_SYSTEM_MALLOC && !USE_DL_MALLOC #if !USE_SYSTEM_MALLOC && !USE_DL_MALLOC
AuxSp = PtoBaseAdjust(AuxSp); AuxSp = PtoBaseAdjust(AuxSp);
@ -482,7 +479,7 @@ AdjustLocal(bool thread_copying USES_REGS)
#if defined(YAPOR_THREADS) #if defined(YAPOR_THREADS)
} }
#endif #endif
fixPointerCells( pt_bot, pt, thread_copying PASS_REGS); fixPointerCells( pt, pt_bot, thread_copying PASS_REGS);
AdjustSlots( thread_copying PASS_REGS); AdjustSlots( thread_copying PASS_REGS);
} }
@ -1373,7 +1370,7 @@ cp_atom_table(AtomHashEntry *ntb, UInt nsize)
Atom natom; Atom natom;
CELL hash; CELL hash;
hash = HashFunction((unsigned char *)ap->StrOfAE) % nsize; hash = HashFunction(ap->StrOfAE) % nsize;
natom = ap->NextOfAE; natom = ap->NextOfAE;
ap->NextOfAE = ntb[hash].Entry; ap->NextOfAE = ntb[hash].Entry;
ntb[hash].Entry = catom; ntb[hash].Entry = catom;
@ -1613,12 +1610,8 @@ execute_growstack(size_t esize0, bool from_trail, bool in_parser, tr_fr_ptr *old
LOCAL_GDiff = LOCAL_DelayDiff = LOCAL_BaseDiff = size-size0; LOCAL_GDiff = LOCAL_DelayDiff = LOCAL_BaseDiff = size-size0;
} else { } else {
YAPEnterCriticalSection(); YAPEnterCriticalSection();
if (LOCAL_GlobalBase != old_LOCAL_GlobalBase) { LOCAL_GDiff = LOCAL_BaseDiff = LOCAL_DelayDiff = LOCAL_GlobalBase-old_LOCAL_GlobalBase;
LOCAL_GDiff = LOCAL_BaseDiff = LOCAL_DelayDiff = LOCAL_GlobalBase-old_LOCAL_GlobalBase; LOCAL_GlobalBase=old_LOCAL_GlobalBase;
LOCAL_GlobalBase=old_LOCAL_GlobalBase;
} else {
LOCAL_GDiff = LOCAL_BaseDiff = LOCAL_DelayDiff = 0;
}
} }
LOCAL_XDiff = LOCAL_HDiff = 0; LOCAL_XDiff = LOCAL_HDiff = 0;
LOCAL_GDiff0=LOCAL_GDiff; LOCAL_GDiff0=LOCAL_GDiff;