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

frame should have handle to method, not just code

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/types.def
View File

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

6
src/vm.cpp
View File

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