ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-19 03:06:36 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix regressions for non-bootimage case

Browse Source
This commit is contained in:
Joel Dice 2008-12-03 19:09:57 -07:00
parent 93d4fbc43d
commit 58a90f2b84
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/heap.cpp
View File

@ -430,15 +430,18 @@ class Segment {
class Fixie {
public:
Fixie(unsigned size, bool hasMask, Fixie** handle, bool immortal):
Fixie(Context* c, unsigned size, bool hasMask, Fixie** handle,
bool immortal):
age(immortal ? FixieTenureThreshold + 1 : 0),
hasMask(hasMask),
marked(false),
dirty(false),
size(size)
size(size),
next(0),
handle(0)
{
memset(mask(), 0, maskSize(size, hasMask));
add(handle);
add(c, handle);
if (DebugFixies) {
fprintf(stderr, "make fixie %p of size %d\n", this, totalSize());
}
@ -448,7 +451,10 @@ class Fixie {
return age == FixieTenureThreshold + 1;
}
void add(Fixie** handle) {
void add(Context* c UNUSED, Fixie** handle) {
assert(c, this->handle == 0);
assert(c, next == 0);
this->handle = handle;
if (handle) {
next = *handle;
@ -467,6 +473,7 @@ class Fixie {
if (next) {
next->handle = handle;
}
next = 0;
handle = 0;
}
@ -476,7 +483,7 @@ class Fixie {
}
remove(c);
add(handle);
add(c, handle);
}
void** body() {
@ -857,14 +864,14 @@ sweepFixies(Context* c)
}
if (f->dirty) {
f->add(&(c->dirtyTenuredFixies));
f->add(c, &(c->dirtyTenuredFixies));
} else {
f->add(&(c->tenuredFixies));
f->add(c, &(c->tenuredFixies));
}
} else {
c->untenuredFixieFootprint += f->totalSize();
f->add(&(c->fixies));
f->add(c, &(c->fixies));
}
f->marked = false;
@ -1470,7 +1477,7 @@ visitMarkedFixies(Context* c)
c->client->walk(f->body(), &w);
f->add(&(c->visitedFixies));
f->move(c, &(c->visitedFixies));
}
}
@ -1730,7 +1737,7 @@ class MyHeap: public Heap {
{
*totalInBytes = Fixie::totalSize(sizeInWords, objectMask);
return (new (allocator->allocate(*totalInBytes))
Fixie(sizeInWords, objectMask, &(c.fixies), false))->body();
Fixie(&c, sizeInWords, objectMask, &(c.fixies), false))->body();
}
virtual void* allocateImmortalFixed(Allocator* allocator,
@ -1739,7 +1746,7 @@ class MyHeap: public Heap {
{
*totalInBytes = Fixie::totalSize(sizeInWords, objectMask);
return (new (allocator->allocate(*totalInBytes))
Fixie(sizeInWords, objectMask, 0, true))->body();
Fixie(&c, sizeInWords, objectMask, 0, true))->body();
}
virtual bool needsMark(void* p) {

3
src/machine.cpp
View File

@ -1572,6 +1572,8 @@ boot(Thread* t)
m->stringMap = makeWeakHashMap(t, 0, 0);
m->processor->boot(t, 0);
{ object bootCode = makeCode(t, 0, 0, 0, 0, 0, 1, false);
codeBody(t, bootCode, 0) = impdep1;
object bootMethod = makeMethod
@ -1816,7 +1818,6 @@ Thread::init()
m->processor->boot(this, image);
} else {
boot(this);
m->processor->boot(this, 0);
}
m->monitorMap = makeWeakHashMap(this, 0, 0);