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

fix bytecode address calculations which broke when using -Os

Browse Source
This commit is contained in:
Joel Dice 2008-09-29 08:46:44 -06:00
parent 1910e1b837
commit 823327a00b
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/compile.cpp
View File

@ -2340,7 +2340,8 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
} break; } break;
case goto_: { case goto_: {
uint32_t newIp = (ip - 3) + codeReadInt16(t, code, ip); uint32_t offset = codeReadInt16(t, code, ip);
uint32_t newIp = (ip - 3) + offset;
assert(t, newIp < codeLength(t, code)); assert(t, newIp < codeLength(t, code));
c->jmp(frame->machineIp(newIp)); c->jmp(frame->machineIp(newIp));
@ -2348,7 +2349,8 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
} break; } break;
case goto_w: { case goto_w: {
uint32_t newIp = (ip - 5) + codeReadInt32(t, code, ip); uint32_t offset = codeReadInt32(t, code, ip);
uint32_t newIp = (ip - 5) + offset;
assert(t, newIp < codeLength(t, code)); assert(t, newIp < codeLength(t, code));
c->jmp(frame->machineIp(newIp)); c->jmp(frame->machineIp(newIp));
@ -2433,7 +2435,8 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
case if_acmpeq: case if_acmpeq:
case if_acmpne: { case if_acmpne: {
uint32_t newIp = (ip - 3) + codeReadInt16(t, code, ip); uint32_t offset = codeReadInt16(t, code, ip);
uint32_t newIp = (ip - 3) + offset;
assert(t, newIp < codeLength(t, code)); assert(t, newIp < codeLength(t, code));
Compiler::Operand* a = frame->popObject(); Compiler::Operand* a = frame->popObject();
@ -2457,7 +2460,8 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
case if_icmpge: case if_icmpge:
case if_icmplt: case if_icmplt:
case if_icmple: { case if_icmple: {
uint32_t newIp = (ip - 3) + codeReadInt16(t, code, ip); uint32_t offset = codeReadInt16(t, code, ip);
uint32_t newIp = (ip - 3) + offset;
assert(t, newIp < codeLength(t, code)); assert(t, newIp < codeLength(t, code));
Compiler::Operand* a = frame->popInt(); Compiler::Operand* a = frame->popInt();
@ -2496,7 +2500,8 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
case ifge: case ifge:
case iflt: case iflt:
case ifle: { case ifle: {
uint32_t newIp = (ip - 3) + codeReadInt16(t, code, ip); uint32_t offset = codeReadInt16(t, code, ip);
uint32_t newIp = (ip - 3) + offset;
assert(t, newIp < codeLength(t, code)); assert(t, newIp < codeLength(t, code));
Compiler::Operand* a = frame->popInt(); Compiler::Operand* a = frame->popInt();
@ -2530,7 +2535,8 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
case ifnull: case ifnull:
case ifnonnull: { case ifnonnull: {
uint32_t newIp = (ip - 3) + codeReadInt16(t, code, ip); uint32_t offset = codeReadInt16(t, code, ip);
uint32_t newIp = (ip - 3) + offset;
assert(t, newIp < codeLength(t, code)); assert(t, newIp < codeLength(t, code));
Compiler::Operand* a = frame->popObject(); Compiler::Operand* a = frame->popObject();
@ -2780,9 +2786,11 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
uint32_t newIp; uint32_t newIp;
if (instruction == jsr) { if (instruction == jsr) {
newIp = (ip - 3) + codeReadInt16(t, code, ip); uint32_t offset = codeReadInt16(t, code, ip);
newIp = (ip - 3) + offset;
} else { } else {
newIp = (ip - 5) + codeReadInt32(t, code, ip); uint32_t offset = codeReadInt32(t, code, ip);
newIp = (ip - 5) + offset;
} }
assert(t, newIp < codeLength(t, code)); assert(t, newIp < codeLength(t, code));