ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-22 12:28:11 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

preserve operands to CombineEvent and TranslateEvent when necessary

Browse Source
This commit is contained in:
Joel Dice 2008-04-29 10:25:20 -06:00
parent 22382a5c8b
commit d50e3aaee0
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compile.cpp
View File

@ -3875,11 +3875,11 @@ finish(MyThread* t, Context* context)
strcmp strcmp
(reinterpret_cast<const char*> (reinterpret_cast<const char*>
(&byteArrayBody(t, className(t, methodClass(t, context->method)), 0)), (&byteArrayBody(t, className(t, methodClass(t, context->method)), 0)),
"java/lang/Number") == 0 and "java/nio/ByteBuffer") == 0 and
strcmp strcmp
(reinterpret_cast<const char*> (reinterpret_cast<const char*>
(&byteArrayBody(t, methodName(t, context->method), 0)), (&byteArrayBody(t, methodName(t, context->method), 0)),
"<init>") == 0) "get") == 0)
{ {
asm("int3"); asm("int3");
} }

19
src/compiler.cpp
View File

@ -355,7 +355,7 @@ bool
tryAddSite(Context* c, Stack* stack, unsigned size, Value* v, Site* s) tryAddSite(Context* c, Stack* stack, unsigned size, Value* v, Site* s)
{ {
if (not findSite(c, v, s)) { if (not findSite(c, v, s)) {
// fprintf(stderr, "add site %p to %p\n", s, v); // fprintf(stderr, "add site %p (%d) to %p\n", s, s->type(c), v);
if (s->tryAcquire(c, stack, size, v)) { if (s->tryAcquire(c, stack, size, v)) {
s->next = v->sites; s->next = v->sites;
v->sites = s; v->sites = s;
@ -377,7 +377,7 @@ removeSite(Context* c, Value* v, Site* s)
{ {
for (Site** p = &(v->sites); *p;) { for (Site** p = &(v->sites); *p;) {
if (s == *p) { if (s == *p) {
// fprintf(stderr, "remove site %p from %p\n", s, v); // fprintf(stderr, "remove site %p (%d) from %p\n", s, s->type(c), v);
s->release(c); s->release(c);
*p = (*p)->next; *p = (*p)->next;
break; break;
@ -1271,6 +1271,17 @@ appendCompare(Context* c, unsigned size, Value* first, Value* second)
CompareEvent(c, size, first, second); CompareEvent(c, size, first, second);
} }
void
maybePreserve(Context* c, Stack* stack, unsigned size, Value* v, Site* s)
{
if (v->reads->next and v->sites->next == 0) {
assert(c, v->sites == s);
Site* r = freeRegister(c, size, true);
addSite(c, stack, size, v, r);
apply(c, Move, size, s, r);
}
}
class CombineEvent: public Event { class CombineEvent: public Event {
public: public:
CombineEvent(Context* c, BinaryOperation type, unsigned size, Value* first, CombineEvent(Context* c, BinaryOperation type, unsigned size, Value* first,
@ -1295,6 +1306,8 @@ class CombineEvent: public Event {
fprintf(stderr, "CombineEvent.compile\n"); fprintf(stderr, "CombineEvent.compile\n");
} }
maybePreserve(c, stack, size, second, second->source);
apply(c, type, size, first->source, second->source); apply(c, type, size, first->source, second->source);
nextRead(c, first); nextRead(c, first);
@ -1351,6 +1364,8 @@ class TranslateEvent: public Event {
fprintf(stderr, "TranslateEvent.compile\n"); fprintf(stderr, "TranslateEvent.compile\n");
} }
maybePreserve(c, stack, size, value, value->source);
apply(c, type, size, value->source); apply(c, type, size, value->source);
nextRead(c, value); nextRead(c, value);