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

fix stack and local snapshots for DummyEvents

Browse Source
This commit is contained in:
Joel Dice 2008-10-04 18:14:43 -06:00
parent d54ee9081b
commit adb63778f0
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/compiler.cpp
View File

@ -470,7 +470,7 @@ class Event {
public: public:
Event(Context* c): Event(Context* c):
next(0), stackBefore(c->stack), localsBefore(c->locals), next(0), stackBefore(c->stack), localsBefore(c->locals),
stackAfter(c->stack), localsAfter(c->locals), promises(0), reads(0), stackAfter(0), localsAfter(0), promises(0), reads(0),
junctionSites(0), savedSites(0), predecessors(0), successors(0), block(0), junctionSites(0), savedSites(0), predecessors(0), successors(0), block(0),
logicalInstruction(c->logicalCode[c->logicalIp]), state(c->state), logicalInstruction(c->logicalCode[c->logicalIp]), state(c->state),
junctionReads(0), readCount(0) junctionReads(0), readCount(0)
@ -668,7 +668,7 @@ class ConstantSite: public Site {
virtual void toString(Context*, char* buffer, unsigned bufferSize) { virtual void toString(Context*, char* buffer, unsigned bufferSize) {
if (value.value->resolved()) { if (value.value->resolved()) {
snprintf(buffer, bufferSize, "constant %ld", value.value->value()); snprintf(buffer, bufferSize, "constant %"LLD, value.value->value());
} else { } else {
snprintf(buffer, bufferSize, "constant unresolved"); snprintf(buffer, bufferSize, "constant unresolved");
} }
@ -718,7 +718,7 @@ class AddressSite: public Site {
virtual void toString(Context*, char* buffer, unsigned bufferSize) { virtual void toString(Context*, char* buffer, unsigned bufferSize) {
if (address.address->resolved()) { if (address.address->resolved()) {
snprintf(buffer, bufferSize, "address %ld", address.address->value()); snprintf(buffer, bufferSize, "address %"LLD, address.address->value());
} else { } else {
snprintf(buffer, bufferSize, "address unresolved"); snprintf(buffer, bufferSize, "address unresolved");
} }
@ -2672,14 +2672,17 @@ appendFrameSite(Context* c, Value* value, unsigned size, int index)
(c, value, size, index); (c, value, size, index);
} }
unsigned
frameFootprint(Context* c, Stack* s)
{
return c->localFootprint + (s ? (s->index + s->size) : 0);
}
class DummyEvent: public Event { class DummyEvent: public Event {
public: public:
DummyEvent(Context* c): DummyEvent(Context* c):
Event(c) Event(c)
{ { }
stackBefore = stackAfter = logicalInstruction->stack;
localsBefore = localsAfter = logicalInstruction->locals;
}
virtual const char* name() { virtual const char* name() {
return "DummyEvent"; return "DummyEvent";
@ -2691,7 +2694,17 @@ class DummyEvent: public Event {
void void
appendDummy(Context* c) appendDummy(Context* c)
{ {
Stack* stack = c->stack;
Local* locals = c->locals;
LogicalInstruction* i = c->logicalCode[c->logicalIp];
c->stack = i->stack;
c->locals = i->locals;
new (c->zone->allocate(sizeof(DummyEvent))) DummyEvent(c); new (c->zone->allocate(sizeof(DummyEvent))) DummyEvent(c);
c->stack = stack;
c->locals = locals;
} }
Site* Site*
@ -2737,12 +2750,6 @@ pickJunctionSite(Context* c, Value* v, Read* r, unsigned index)
} }
} }
unsigned
frameFootprint(Context* c, Stack* s)
{
return c->localFootprint + (s ? (s->index + s->size) : 0);
}
unsigned unsigned
resolveJunctionSite(Context* c, Event* e, Value* v, unsigned index, resolveJunctionSite(Context* c, Event* e, Value* v, unsigned index,
Site** frozenSites, unsigned frozenSiteIndex) Site** frozenSites, unsigned frozenSiteIndex)
@ -3039,6 +3046,10 @@ block(Context* c, Event* head)
unsigned unsigned
compile(Context* c) compile(Context* c)
{ {
if (c->logicalIp >= 0 and c->logicalCode[c->logicalIp]->lastEvent == 0) {
appendDummy(c);
}
Assembler* a = c->assembler; Assembler* a = c->assembler;
c->pass = CompilePass; c->pass = CompilePass;