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

bugs in restoring Heap: stuff repeated twice or at bad locations.

Browse Source
This commit is contained in:
Vitor Santos Costa 2009-11-18 23:32:31 +00:00
parent 6c887452e6
commit dcf7e282c8
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
H/rheap.h
View File

@ -386,7 +386,8 @@ RestoreAtoms(void)
AtomHashEntry *HashPtr; AtomHashEntry *HashPtr;
register int i; register int i;
Yap_heap_regs->hash_chain =
PtoAtomHashEntryAdjust(Yap_heap_regs->hash_chain);
HashPtr = HashChain; HashPtr = HashChain;
for (i = 0; i < AtomHashTableSize; ++i) { for (i = 0; i < AtomHashTableSize; ++i) {
HashPtr->Entry = AtomAdjust(HashPtr->Entry); HashPtr->Entry = AtomAdjust(HashPtr->Entry);
@ -401,6 +402,8 @@ RestoreWideAtoms(void)
AtomHashEntry *HashPtr; AtomHashEntry *HashPtr;
register int i; register int i;
Yap_heap_regs->wide_hash_chain =
PtoAtomHashEntryAdjust(Yap_heap_regs->wide_hash_chain);
HashPtr = WideHashChain; HashPtr = WideHashChain;
for (i = 0; i < WideAtomHashTableSize; ++i) { for (i = 0; i < WideAtomHashTableSize; ++i) {
HashPtr->Entry = AtomAdjust(HashPtr->Entry); HashPtr->Entry = AtomAdjust(HashPtr->Entry);
@ -959,6 +962,7 @@ static void
restore_codes(void) restore_codes(void)
{ {
Yap_heap_regs->heap_top = AddrAdjust(OldHeapTop); Yap_heap_regs->heap_top = AddrAdjust(OldHeapTop);
#include "rhstruct.h"
#if !defined(THREADS) && !defined(YAPOR) #if !defined(THREADS) && !defined(YAPOR)
/* restore consult stack. It consists of heap pointers, so it /* restore consult stack. It consists of heap pointers, so it
is easy to fix. is easy to fix.
@ -979,7 +983,6 @@ restore_codes(void)
} }
} }
#endif #endif
#include "rhstruct.h"
#if !defined(THREADS) && !defined(YAPOR) #if !defined(THREADS) && !defined(YAPOR)
if (Yap_heap_regs->wl.scratchpad.ptr) { if (Yap_heap_regs->wl.scratchpad.ptr) {
Yap_heap_regs->wl.scratchpad.ptr = Yap_heap_regs->wl.scratchpad.ptr =
@ -1023,13 +1026,7 @@ restore_codes(void)
Yap_heap_regs->wl.allow_restart = FALSE; Yap_heap_regs->wl.allow_restart = FALSE;
#endif #endif
#endif #endif
if (Yap_heap_regs->last_wtime != NULL) }
Yap_heap_regs->last_wtime = (void *)PtoHeapCellAdjust((CELL *)(Yap_heap_regs->last_wtime));
Yap_heap_regs->hash_chain =
PtoAtomHashEntryAdjust(Yap_heap_regs->hash_chain);
Yap_heap_regs->wide_hash_chain =
PtoAtomHashEntryAdjust(Yap_heap_regs->wide_hash_chain);
}
static void static void