fix merge conflict bug preventing the bootimage code from seeing, marking, and fixing jsr addresses

This commit is contained in:
Joel Dice 2009-02-14 14:23:23 -07:00
parent f58f7b3bdf
commit 4b2d74f656

View File

@ -3111,7 +3111,7 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
frame->storedObject(index);
}
frame->pushAddress(frame->machineIp(ip));
frame->pushAddress(frame->addressOperand(c->machineIp(ip)));
c->jmp(frame->machineIp(newIp));