ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-04 08:30:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

update junction read based on liveness of local value on first visit to junction, not stub read value

Browse Source
This commit is contained in:
Joel Dice 2008-12-15 07:35:19 -07:00
parent 7f4bd51464
commit 39358e6652
1 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/compiler.cpp
View File

@ -504,9 +504,9 @@ class StubReadPair {
class JunctionState { class JunctionState {
public: public:
JunctionState(): readCount(0) { } JunctionState(unsigned frameFootprint): frameFootprint(frameFootprint) { }
unsigned readCount; unsigned frameFootprint;
StubReadPair reads[0]; StubReadPair reads[0];
}; };
@ -3449,10 +3449,13 @@ visit(Context* c, Link* link)
JunctionState* junctionState = link->junctionState; JunctionState* junctionState = link->junctionState;
if (junctionState) { if (junctionState) {
for (unsigned i = 0; i < junctionState->readCount; ++i) { for (unsigned i = 0; i < junctionState->frameFootprint; ++i) {
assert(c, junctionState->reads[i].value->reads StubReadPair* p = junctionState->reads + i;
== junctionState->reads[i].read);
nextRead(c, 0, junctionState->reads[i].value); if (p->value) {
assert(c, p->value->reads == p->read);
nextRead(c, 0, p->value);
}
} }
} }
} }
@ -3873,15 +3876,15 @@ populateSources(Context* c, Event* e)
} }
void void
addStubRead(Context* c, Value* v, unsigned size, JunctionState* state, setStubRead(Context* c, StubReadPair* p, Value* v, unsigned size)
unsigned* count)
{ {
if (v) { if (v) {
StubRead* r = stubRead(c, size); StubRead* r = stubRead(c, size);
// fprintf(stderr, "add stub read %p to %p\n", r, v); if (DebugReads) {
fprintf(stderr, "add stub read %p to %p\n", r, v);
}
addRead(c, 0, v, r); addRead(c, 0, v, r);
StubReadPair* p = state->reads + ((*count)++);
p->value = v; p->value = v;
p->read = r; p->read = r;
} }
@ -3894,32 +3897,44 @@ populateJunctionReads(Context* c, Link* link)
(c->zone->allocate (c->zone->allocate
(sizeof(JunctionState) (sizeof(JunctionState)
+ (sizeof(StubReadPair) * frameFootprint(c, c->stack)))) + (sizeof(StubReadPair) * frameFootprint(c, c->stack))))
JunctionState; JunctionState(frameFootprint(c, c->stack));
memset(state->reads, 0, sizeof(StubReadPair) * frameFootprint(c, c->stack));
link->junctionState = state; link->junctionState = state;
unsigned count = 0;
for (FrameIterator it(c, c->stack, c->locals); it.hasMore();) { for (FrameIterator it(c, c->stack, c->locals); it.hasMore();) {
FrameIterator::Element e = it.next(c); FrameIterator::Element e = it.next(c);
addStubRead(c, e.value, footprintSizeInBytes(e.footprint), state, &count); setStubRead(c, state->reads + e.localIndex, e.value,
footprintSizeInBytes(e.footprint));
} }
state->readCount = count;
} }
void void
updateJunctionReads(Context*, JunctionState* state) updateJunctionReads(Context* c, JunctionState* state)
{ {
for (unsigned i = 0; i < state->readCount; ++i) { for (FrameIterator it(c, c->stack, c->locals); it.hasMore();) {
StubReadPair* p = state->reads + i; FrameIterator::Element e = it.next(c);
if (p->read->read == 0) { StubReadPair* p = state->reads + e.localIndex;
Read* r = live(p->value); if (p->value and p->read->read == 0) {
Read* r = live(e.value);
if (r) { if (r) {
p->read->read = r; if (DebugReads) {
} else { fprintf(stderr, "stub read %p for %p valid: %p\n",
p->read->valid_ = false; p->read, p->value, r);
} }
p->read->read = r;
}
}
}
for (unsigned i = 0; i < frameFootprint(c, c->stack); ++i) {
StubReadPair* p = state->reads + i;
if (p->value and p->read->read == 0) {
if (DebugReads) {
fprintf(stderr, "stub read %p for %p invalid\n", p->read, p->value);
}
p->read->valid_ = false;
} }
} }
} }
@ -4105,7 +4120,9 @@ addForkElement(Context* c, Value* v, unsigned size, ForkState* state,
unsigned index) unsigned index)
{ {
MultiRead* r = multiRead(c, size); MultiRead* r = multiRead(c, size);
// fprintf(stderr, "add multi read %p to %p\n", r, v); if (DebugReads) {
fprintf(stderr, "add multi read %p to %p\n", r, v);
}
addRead(c, 0, v, r); addRead(c, 0, v, r);
ForkElement* p = state->elements + index; ForkElement* p = state->elements + index;