summaryrefslogtreecommitdiff
path: root/runtime/interpreter/interpreter.cc
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2017-11-05 16:32:19 -0800
committer Mathieu Chartier <mathieuc@google.com> 2017-11-05 17:11:15 -0800
commitfc9555dac51a3cf12bb13f4e3781d2f2f6c9f91f (patch)
tree4b7e722061366679f2fbe3478c3fb3ca029b8620 /runtime/interpreter/interpreter.cc
parentfd443eb00b2456006f03252ba085c1f851e8adf5 (diff)
Remove mterp reliance on code item layout
Pass dex instruction pointer intead of code item pointer to the mterp entry code. This removes a dependency on the code item layout since it may change in the future for compact dex. Bug: 63756964 Test: test/testrunner/testrunner.py --host -j40 Change-Id: Icfffb2e17372439f0833ecce1c0ddb05e7e7e69c
Diffstat (limited to 'runtime/interpreter/interpreter.cc')
-rw-r--r--runtime/interpreter/interpreter.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc
index 038405eebc..01b7d4e457 100644
--- a/runtime/interpreter/interpreter.cc
+++ b/runtime/interpreter/interpreter.cc
@@ -314,7 +314,10 @@ static inline JValue Execute(
return ExecuteSwitchImpl<false, false>(self, code_item, shadow_frame, result_register,
false);
}
- bool returned = ExecuteMterpImpl(self, code_item, &shadow_frame, &result_register);
+ bool returned = ExecuteMterpImpl(self,
+ code_item->insns_,
+ &shadow_frame,
+ &result_register);
if (returned) {
return result_register;
} else {