frame should have handle to method, not just code

This commit is contained in:
Joel Dice 2007-06-03 17:18:05 -06:00
parent 3ba88c12b0
commit f354e410c4
2 changed files with 4 additions and 4 deletions

View File

@ -48,7 +48,7 @@
(array uint8_t body))
(type frame
(object code)
(object method)
(object next)
(uint32_t ip)
(uint32_t stackBase)

View File

@ -373,7 +373,7 @@ run(Thread* t)
case lreturn: {
t->frame = frameNext(t->frame);
if (t->frame) {
t->code = frameCode(t->frame);
t->code = methodCode(frameMethod(t->frame));
ip = frameIp(t->frame);
goto loop;
} else {
@ -1478,7 +1478,7 @@ run(Thread* t)
case return_: {
t->frame = frameNext(t->frame);
if (t->frame) {
t->code = frameCode(t->frame);
t->code = methodCode(frameMethod(t->frame));
ip = frameIp(t->frame);
goto loop;
} else {
@ -1608,7 +1608,7 @@ run(Thread* t)
throw_:
for (; t->frame; t->frame = frameNext(t->frame)) {
t->code = frameCode(t->frame);
t->code = methodCode(frameMethod(t->frame));
object eht = codeExceptionHandlerTable(t->code);
if (eht) {
for (unsigned i = 0; i < exceptionHandleTableLength(eht); ++i) {