ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-05 20:54:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix handling of subroutines in methods of return type long on 32-bit systems

Browse Source
This commit is contained in:
Joel Dice 2009-10-06 03:17:12 +00:00
parent 4f78783ef1
commit 23197da679
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/compiler.cpp
View File

@ -5405,6 +5405,28 @@ maybeBuddy(Context* c, Value* v)
} }
} }
void
linkLocals(Context* c, Local* oldLocals, Local* newLocals)
{
for (int i = 0; i < static_cast<int>(c->localFootprint); ++i) {
Local* local = oldLocals + i;
if (local->value) {
int highOffset = c->arch->bigEndian() ? 1 : -1;
if (i + highOffset >= 0
and i + highOffset < static_cast<int>(c->localFootprint)
and local->value->next == local[highOffset].value)
{
Value* v = newLocals[i].value;
Value* next = newLocals[i + highOffset].value;
v->next = next;
next->next = v;
next->index = 1;
}
}
}
}
class Client: public Assembler::Client { class Client: public Assembler::Client {
public: public:
Client(Context* c): c(c) { } Client(Context* c): c(c) { }
@ -5467,7 +5489,9 @@ class MyCompiler: public Compiler {
} }
virtual void linkSubroutine(Subroutine* subroutine) { virtual void linkSubroutine(Subroutine* subroutine) {
Local* oldLocals = c.locals;
restoreState(static_cast<MySubroutine*>(subroutine)->forkState); restoreState(static_cast<MySubroutine*>(subroutine)->forkState);
linkLocals(&c, oldLocals, c.locals);
} }
virtual void init(unsigned logicalCodeLength, unsigned parameterFootprint, virtual void init(unsigned logicalCodeLength, unsigned parameterFootprint,
@ -5878,23 +5902,7 @@ class MyCompiler: public Compiler {
} }
} }
for (int i = 0; i < static_cast<int>(c.localFootprint); ++i) { linkLocals(&c, e->localsBefore, newLocals);
Local* local = e->localsBefore + i;
if (local->value) {
int highOffset = c.arch->bigEndian() ? 1 : -1;
if (i + highOffset >= 0
and i + highOffset < static_cast<int>(c.localFootprint)
and local->value->next == local[highOffset].value)
{
Value* v = c.locals[i].value;
Value* next = c.locals[i + highOffset].value;
v->next = next;
next->next = v;
next->index = 1;
}
}
}
} }
virtual void storeLocal(unsigned footprint, Operand* src, unsigned index) { virtual void storeLocal(unsigned footprint, Operand* src, unsigned index) {

4
test/Subroutine.java
View File

@ -118,7 +118,7 @@ public class Subroutine {
try { try {
switch (path) { switch (path) {
case 1: case 1:
return 0xFFFFFFFFFFL; return 0xFABFABFABFL;
case 2: { case 2: {
int a = 42; int a = 42;
@ -187,7 +187,7 @@ public class Subroutine {
String.valueOf(test4(2)); String.valueOf(test4(2));
String.valueOf(test4(3)); String.valueOf(test4(3));
expect(test4(1) == 0xFFFFFFFFFFL); expect(test4(1) == 0xFABFABFABFL);
} }
private static class DummyException extends RuntimeException { } private static class DummyException extends RuntimeException { }