wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Avoid 16-bit arithmethic in GC arenas (503419, r=dmandelin).

Browse Source
This commit is contained in:
Andreas Gal 2009-07-12 07:29:18 -07:00
parent 247b1e3f5d
commit 6830c9b118
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/jsgc.cpp
View File

@ -1090,10 +1090,9 @@ InitGCArenaLists(JSRuntime *rt)
for (i = 0; i < GC_NUM_FREELISTS; i++) { for (i = 0; i < GC_NUM_FREELISTS; i++) {
arenaList = &rt->gcArenaList[i]; arenaList = &rt->gcArenaList[i];
thingSize = GC_FREELIST_NBYTES(i); thingSize = GC_FREELIST_NBYTES(i);
JS_ASSERT((size_t)(uint16)thingSize == thingSize);
arenaList->last = NULL; arenaList->last = NULL;
arenaList->lastCount = (uint16) THINGS_PER_ARENA(thingSize); arenaList->lastCount = THINGS_PER_ARENA(thingSize);
arenaList->thingSize = (uint16) thingSize; arenaList->thingSize = thingSize;
arenaList->freeList = NULL; arenaList->freeList = NULL;
} }
rt->gcDoubleArenaList.first = NULL; rt->gcDoubleArenaList.first = NULL;
@ -2011,12 +2010,13 @@ testReservedObjects:
maxFreeThings = thingsLimit - arenaList->lastCount; maxFreeThings = thingsLimit - arenaList->lastCount;
if (maxFreeThings > MAX_THREAD_LOCAL_THINGS) if (maxFreeThings > MAX_THREAD_LOCAL_THINGS)
maxFreeThings = MAX_THREAD_LOCAL_THINGS; maxFreeThings = MAX_THREAD_LOCAL_THINGS;
uint32 lastCount = arenaList->lastCount;
while (maxFreeThings != 0) { while (maxFreeThings != 0) {
--maxFreeThings; --maxFreeThings;
tmpflagp = THING_FLAGP(a, arenaList->lastCount); tmpflagp = THING_FLAGP(a, lastCount);
tmpthing = FLAGP_TO_THING(tmpflagp, nbytes); tmpthing = FLAGP_TO_THING(tmpflagp, nbytes);
arenaList->lastCount++; lastCount++;
tmpthing->flagp = tmpflagp; tmpthing->flagp = tmpflagp;
*tmpflagp = GCF_FINAL; /* signifying that thing is free */ *tmpflagp = GCF_FINAL; /* signifying that thing is free */
@ -2024,6 +2024,7 @@ testReservedObjects:
lastptr = &tmpthing->next; lastptr = &tmpthing->next;
} }
*lastptr = NULL; *lastptr = NULL;
arenaList->lastCount = lastCount;
#endif #endif
break; break;
} }
@ -3620,7 +3621,7 @@ js_GC(JSContext *cx, JSGCInvocationKind gckind)
*/ */
freeList = arenaList->freeList; freeList = arenaList->freeList;
if (a == arenaList->last) if (a == arenaList->last)
arenaList->lastCount = (uint16) indexLimit; arenaList->lastCount = indexLimit;
*ap = a->prev; *ap = a->prev;
a->prev = emptyArenas; a->prev = emptyArenas;
emptyArenas = a; emptyArenas = a;

4
js/src/jsgc.h
View File

@ -284,9 +284,9 @@ typedef struct JSGCChunkInfo JSGCChunkInfo;
struct JSGCArenaList { struct JSGCArenaList {
JSGCArenaInfo *last; /* last allocated GC arena */ JSGCArenaInfo *last; /* last allocated GC arena */
uint16 lastCount; /* number of allocated things in the last uint32 lastCount; /* number of allocated things in the last
arena */ arena */
uint16 thingSize; /* size of things to allocate on this list uint32 thingSize; /* size of things to allocate on this list
*/ */
JSGCThing *freeList; /* list of free GC things */ JSGCThing *freeList; /* list of free GC things */
}; };