diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/dex_instruction-inl.h | 104 | ||||
| -rw-r--r-- | runtime/dex_instruction.h | 178 | ||||
| -rw-r--r-- | runtime/interpreter/interpreter_common.h | 50 | ||||
| -rw-r--r-- | runtime/interpreter/interpreter_goto_table_impl.cc | 543 | ||||
| -rw-r--r-- | runtime/interpreter/interpreter_switch_impl.cc | 522 |
5 files changed, 754 insertions, 643 deletions
diff --git a/runtime/dex_instruction-inl.h b/runtime/dex_instruction-inl.h index 6e21273358..4d39024013 100644 --- a/runtime/dex_instruction-inl.h +++ b/runtime/dex_instruction-inl.h @@ -24,29 +24,29 @@ namespace art { //------------------------------------------------------------------------------ // VRegA //------------------------------------------------------------------------------ -inline int8_t Instruction::VRegA_10t() const { +inline int8_t Instruction::VRegA_10t(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k10t); - return static_cast<int8_t>(InstAA()); + return static_cast<int8_t>(InstAA(inst_data)); } -inline uint8_t Instruction::VRegA_10x() const { +inline uint8_t Instruction::VRegA_10x(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k10x); - return InstAA(); + return InstAA(inst_data); } -inline uint4_t Instruction::VRegA_11n() const { +inline uint4_t Instruction::VRegA_11n(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k11n); - return InstA(); + return InstA(inst_data); } -inline uint8_t Instruction::VRegA_11x() const { +inline uint8_t Instruction::VRegA_11x(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k11x); - return InstAA(); + return InstAA(inst_data); } -inline uint4_t Instruction::VRegA_12x() const { +inline uint4_t Instruction::VRegA_12x(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k12x); - return InstA(); + return InstA(inst_data); } inline int16_t Instruction::VRegA_20t() const { @@ -54,54 +54,54 @@ inline int16_t Instruction::VRegA_20t() const { return static_cast<int16_t>(Fetch16(1)); } -inline uint8_t Instruction::VRegA_21c() const { +inline uint8_t Instruction::VRegA_21c(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k21c); - return InstAA(); + return InstAA(inst_data); } -inline uint8_t Instruction::VRegA_21h() const { +inline uint8_t Instruction::VRegA_21h(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k21h); - return InstAA(); + return InstAA(inst_data); } -inline uint8_t Instruction::VRegA_21s() const { +inline uint8_t Instruction::VRegA_21s(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k21s); - return InstAA(); + return InstAA(inst_data); } -inline uint8_t Instruction::VRegA_21t() const { +inline uint8_t Instruction::VRegA_21t(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k21t); - return InstAA(); + return InstAA(inst_data); } -inline uint8_t Instruction::VRegA_22b() const { +inline uint8_t Instruction::VRegA_22b(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k22b); - return InstAA(); + return InstAA(inst_data); } -inline uint4_t Instruction::VRegA_22c() const { +inline uint4_t Instruction::VRegA_22c(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k22c); - return InstA(); + return InstA(inst_data); } -inline uint4_t Instruction::VRegA_22s() const { +inline uint4_t Instruction::VRegA_22s(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k22s); - return InstA(); + return InstA(inst_data); } -inline uint4_t Instruction::VRegA_22t() const { +inline uint4_t Instruction::VRegA_22t(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k22t); - return InstA(); + return InstA(inst_data); } -inline uint8_t Instruction::VRegA_22x() const { +inline uint8_t Instruction::VRegA_22x(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k22x); - return InstAA(); + return InstAA(inst_data); } -inline uint8_t Instruction::VRegA_23x() const { +inline uint8_t Instruction::VRegA_23x(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k23x); - return InstAA(); + return InstAA(inst_data); } inline int32_t Instruction::VRegA_30t() const { @@ -109,19 +109,19 @@ inline int32_t Instruction::VRegA_30t() const { return static_cast<int32_t>(Fetch32(1)); } -inline uint8_t Instruction::VRegA_31c() const { +inline uint8_t Instruction::VRegA_31c(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k31c); - return InstAA(); + return InstAA(inst_data); } -inline uint8_t Instruction::VRegA_31i() const { +inline uint8_t Instruction::VRegA_31i(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k31i); - return InstAA(); + return InstAA(inst_data); } -inline uint8_t Instruction::VRegA_31t() const { +inline uint8_t Instruction::VRegA_31t(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k31t); - return InstAA(); + return InstAA(inst_data); } inline uint16_t Instruction::VRegA_32x() const { @@ -129,32 +129,32 @@ inline uint16_t Instruction::VRegA_32x() const { return Fetch16(1); } -inline uint4_t Instruction::VRegA_35c() const { +inline uint4_t Instruction::VRegA_35c(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k35c); - return InstB(); // This is labeled A in the spec. + return InstB(inst_data); // This is labeled A in the spec. } -inline uint8_t Instruction::VRegA_3rc() const { +inline uint8_t Instruction::VRegA_3rc(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k3rc); - return InstAA(); + return InstAA(inst_data); } -inline uint8_t Instruction::VRegA_51l() const { +inline uint8_t Instruction::VRegA_51l(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k51l); - return InstAA(); + return InstAA(inst_data); } //------------------------------------------------------------------------------ // VRegB //------------------------------------------------------------------------------ -inline int4_t Instruction::VRegB_11n() const { +inline int4_t Instruction::VRegB_11n(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k11n); - return static_cast<int4_t>((InstB() << 28) >> 28); + return static_cast<int4_t>((InstB(inst_data) << 28) >> 28); } -inline uint4_t Instruction::VRegB_12x() const { +inline uint4_t Instruction::VRegB_12x(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k12x); - return InstB(); + return InstB(inst_data); } inline uint16_t Instruction::VRegB_21c() const { @@ -182,19 +182,19 @@ inline uint8_t Instruction::VRegB_22b() const { return static_cast<uint8_t>(Fetch16(1) & 0xff); } -inline uint4_t Instruction::VRegB_22c() const { +inline uint4_t Instruction::VRegB_22c(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k22c); - return InstB(); + return InstB(inst_data); } -inline uint4_t Instruction::VRegB_22s() const { +inline uint4_t Instruction::VRegB_22s(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k22s); - return InstB(); + return InstB(inst_data); } -inline uint4_t Instruction::VRegB_22t() const { +inline uint4_t Instruction::VRegB_22t(uint16_t inst_data) const { DCHECK_EQ(FormatOf(Opcode()), k22t); - return InstB(); + return InstB(inst_data); } inline uint16_t Instruction::VRegB_22x() const { diff --git a/runtime/dex_instruction.h b/runtime/dex_instruction.h index 13b0f1c270..e8db3bcf4f 100644 --- a/runtime/dex_instruction.h +++ b/runtime/dex_instruction.h @@ -217,44 +217,122 @@ class Instruction { // VRegA bool HasVRegA() const; int32_t VRegA() const; - int8_t VRegA_10t() const; - uint8_t VRegA_10x() const; - uint4_t VRegA_11n() const; - uint8_t VRegA_11x() const; - uint4_t VRegA_12x() const; + + int8_t VRegA_10t() const { + return VRegA_10t(Fetch16(0)); + } + uint8_t VRegA_10x() const { + return VRegA_10x(Fetch16(0)); + } + uint4_t VRegA_11n() const { + return VRegA_11n(Fetch16(0)); + } + uint8_t VRegA_11x() const { + return VRegA_11x(Fetch16(0)); + } + uint4_t VRegA_12x() const { + return VRegA_12x(Fetch16(0)); + } int16_t VRegA_20t() const; - uint8_t VRegA_21c() const; - uint8_t VRegA_21h() const; - uint8_t VRegA_21s() const; - uint8_t VRegA_21t() const; - uint8_t VRegA_22b() const; - uint4_t VRegA_22c() const; - uint4_t VRegA_22s() const; - uint4_t VRegA_22t() const; - uint8_t VRegA_22x() const; - uint8_t VRegA_23x() const; + uint8_t VRegA_21c() const { + return VRegA_21c(Fetch16(0)); + } + uint8_t VRegA_21h() const { + return VRegA_21h(Fetch16(0)); + } + uint8_t VRegA_21s() const { + return VRegA_21s(Fetch16(0)); + } + uint8_t VRegA_21t() const { + return VRegA_21t(Fetch16(0)); + } + uint8_t VRegA_22b() const { + return VRegA_22b(Fetch16(0)); + } + uint4_t VRegA_22c() const { + return VRegA_22c(Fetch16(0)); + } + uint4_t VRegA_22s() const { + return VRegA_22s(Fetch16(0)); + } + uint4_t VRegA_22t() const { + return VRegA_22t(Fetch16(0)); + } + uint8_t VRegA_22x() const { + return VRegA_22x(Fetch16(0)); + } + uint8_t VRegA_23x() const { + return VRegA_23x(Fetch16(0)); + } int32_t VRegA_30t() const; - uint8_t VRegA_31c() const; - uint8_t VRegA_31i() const; - uint8_t VRegA_31t() const; + uint8_t VRegA_31c() const { + return VRegA_31c(Fetch16(0)); + } + uint8_t VRegA_31i() const { + return VRegA_31i(Fetch16(0)); + } + uint8_t VRegA_31t() const { + return VRegA_31t(Fetch16(0)); + } uint16_t VRegA_32x() const; - uint4_t VRegA_35c() const; - uint8_t VRegA_3rc() const; - uint8_t VRegA_51l() const; + uint4_t VRegA_35c() const { + return VRegA_35c(Fetch16(0)); + } + uint8_t VRegA_3rc() const { + return VRegA_3rc(Fetch16(0)); + } + uint8_t VRegA_51l() const { + return VRegA_51l(Fetch16(0)); + } + + // The following methods return the vA operand for various instruction formats. The "inst_data" + // parameter holds the first 16 bits of instruction which the returned value is decoded from. + int8_t VRegA_10t(uint16_t inst_data) const; + uint8_t VRegA_10x(uint16_t inst_data) const; + uint4_t VRegA_11n(uint16_t inst_data) const; + uint8_t VRegA_11x(uint16_t inst_data) const; + uint4_t VRegA_12x(uint16_t inst_data) const; + uint8_t VRegA_21c(uint16_t inst_data) const; + uint8_t VRegA_21h(uint16_t inst_data) const; + uint8_t VRegA_21s(uint16_t inst_data) const; + uint8_t VRegA_21t(uint16_t inst_data) const; + uint8_t VRegA_22b(uint16_t inst_data) const; + uint4_t VRegA_22c(uint16_t inst_data) const; + uint4_t VRegA_22s(uint16_t inst_data) const; + uint4_t VRegA_22t(uint16_t inst_data) const; + uint8_t VRegA_22x(uint16_t inst_data) const; + uint8_t VRegA_23x(uint16_t inst_data) const; + uint8_t VRegA_31c(uint16_t inst_data) const; + uint8_t VRegA_31i(uint16_t inst_data) const; + uint8_t VRegA_31t(uint16_t inst_data) const; + uint4_t VRegA_35c(uint16_t inst_data) const; + uint8_t VRegA_3rc(uint16_t inst_data) const; + uint8_t VRegA_51l(uint16_t inst_data) const; // VRegB bool HasVRegB() const; int32_t VRegB() const; - int4_t VRegB_11n() const; - uint4_t VRegB_12x() const; + + int4_t VRegB_11n() const { + return VRegB_11n(Fetch16(0)); + } + uint4_t VRegB_12x() const { + return VRegB_12x(Fetch16(0)); + } uint16_t VRegB_21c() const; uint16_t VRegB_21h() const; int16_t VRegB_21s() const; int16_t VRegB_21t() const; uint8_t VRegB_22b() const; - uint4_t VRegB_22c() const; - uint4_t VRegB_22s() const; - uint4_t VRegB_22t() const; + uint4_t VRegB_22c() const { + return VRegB_22c(Fetch16(0)); + } + uint4_t VRegB_22s() const { + return VRegB_22s(Fetch16(0)); + } + uint4_t VRegB_22t() const { + return VRegB_22t(Fetch16(0)); + } uint16_t VRegB_22x() const; uint8_t VRegB_23x() const; uint32_t VRegB_31c() const; @@ -265,9 +343,19 @@ class Instruction { uint16_t VRegB_3rc() const; uint64_t VRegB_51l() const; // vB_wide + // The following methods return the vB operand for all instruction formats where it is encoded in + // the first 16 bits of instruction. The "inst_data" parameter holds these 16 bits. The returned + // value is decoded from it. + int4_t VRegB_11n(uint16_t inst_data) const; + uint4_t VRegB_12x(uint16_t inst_data) const; + uint4_t VRegB_22c(uint16_t inst_data) const; + uint4_t VRegB_22s(uint16_t inst_data) const; + uint4_t VRegB_22t(uint16_t inst_data) const; + // VRegC bool HasVRegC() const; int32_t VRegC() const; + int8_t VRegC_22b() const; uint16_t VRegC_22c() const; int16_t VRegC_22s() const; @@ -279,9 +367,16 @@ class Instruction { // Fills the given array with the 'arg' array of the instruction. void GetArgs(uint32_t args[5]) const; - // Returns the opcode field of the instruction. + // Returns the opcode field of the instruction. The given "inst_data" parameter must be the first + // 16 bits of instruction. + Code Opcode(uint16_t inst_data) const { + DCHECK_EQ(inst_data, Fetch16(0)); + return static_cast<Code>(inst_data & 0xFF); + } + + // Returns the opcode field of the instruction from the first 16 bits of instruction. Code Opcode() const { - return static_cast<Code>(Fetch16(0) & 0xFF); + return Opcode(Fetch16(0)); } void SetOpcode(Code opcode) { @@ -395,28 +490,43 @@ class Instruction { // Dump code_units worth of this instruction, padding to code_units for shorter instructions std::string DumpHex(size_t code_units) const; - private: - size_t SizeInCodeUnitsComplexOpcode() const; - uint16_t Fetch16(size_t offset) const { const uint16_t* insns = reinterpret_cast<const uint16_t*>(this); return insns[offset]; } + private: + size_t SizeInCodeUnitsComplexOpcode() const; + uint32_t Fetch32(size_t offset) const { return (Fetch16(offset) | ((uint32_t) Fetch16(offset + 1) << 16)); } uint4_t InstA() const { - return static_cast<uint4_t>((Fetch16(0) >> 8) & 0x0f); + return InstA(Fetch16(0)); } uint4_t InstB() const { - return static_cast<uint4_t>(Fetch16(0) >> 12); + return InstB(Fetch16(0)); } uint8_t InstAA() const { - return static_cast<uint8_t>(Fetch16(0) >> 8); + return InstAA(Fetch16(0)); + } + + uint4_t InstA(uint16_t inst_data) const { + DCHECK_EQ(inst_data, Fetch16(0)); + return static_cast<uint4_t>((inst_data >> 8) & 0x0f); + } + + uint4_t InstB(uint16_t inst_data) const { + DCHECK_EQ(inst_data, Fetch16(0)); + return static_cast<uint4_t>(inst_data >> 12); + } + + uint8_t InstAA(uint16_t inst_data) const { + DCHECK_EQ(inst_data, Fetch16(0)); + return static_cast<uint8_t>(inst_data >> 8); } static const char* const kInstructionNames[]; diff --git a/runtime/interpreter/interpreter_common.h b/runtime/interpreter/interpreter_common.h index 794891e501..ec1f9426bf 100644 --- a/runtime/interpreter/interpreter_common.h +++ b/runtime/interpreter/interpreter_common.h @@ -123,12 +123,12 @@ bool DoInvokeVirtualQuick(Thread* self, ShadowFrame& shadow_frame, // specialization. template<FindFieldType find_type, Primitive::Type field_type, bool do_access_check> static bool DoFieldGet(Thread* self, ShadowFrame& shadow_frame, - const Instruction* inst) + const Instruction* inst, uint16_t inst_data) NO_THREAD_SAFETY_ANALYSIS ALWAYS_INLINE; template<FindFieldType find_type, Primitive::Type field_type, bool do_access_check> static inline bool DoFieldGet(Thread* self, ShadowFrame& shadow_frame, - const Instruction* inst) { + const Instruction* inst, uint16_t inst_data) { bool is_static = (find_type == StaticObjectRead) || (find_type == StaticPrimitiveRead); uint32_t field_idx = is_static ? inst->VRegB_21c() : inst->VRegC_22c(); ArtField* f = FindFieldFromCode(field_idx, shadow_frame.GetMethod(), self, @@ -142,13 +142,13 @@ static inline bool DoFieldGet(Thread* self, ShadowFrame& shadow_frame, if (is_static) { obj = f->GetDeclaringClass(); } else { - obj = shadow_frame.GetVRegReference(inst->VRegB_22c()); + obj = shadow_frame.GetVRegReference(inst->VRegB_22c(inst_data)); if (UNLIKELY(obj == NULL)) { ThrowNullPointerExceptionForFieldAccess(shadow_frame.GetCurrentLocationForThrow(), f, true); return false; } } - uint32_t vregA = is_static ? inst->VRegA_21c() : inst->VRegA_22c(); + uint32_t vregA = is_static ? inst->VRegA_21c(inst_data) : inst->VRegA_22c(inst_data); switch (field_type) { case Primitive::kPrimBoolean: shadow_frame.SetVReg(vregA, f->GetBoolean(obj)); @@ -180,14 +180,12 @@ static inline bool DoFieldGet(Thread* self, ShadowFrame& shadow_frame, // TODO: should be SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) which is failing due to template // specialization. template<Primitive::Type field_type> -static bool DoIGetQuick(Thread* self, ShadowFrame& shadow_frame, - const Instruction* inst) +static bool DoIGetQuick(ShadowFrame& shadow_frame, const Instruction* inst, uint16_t inst_data) NO_THREAD_SAFETY_ANALYSIS ALWAYS_INLINE; template<Primitive::Type field_type> -static inline bool DoIGetQuick(Thread* self, ShadowFrame& shadow_frame, - const Instruction* inst) { - Object* obj = shadow_frame.GetVRegReference(inst->VRegB_22c()); +static inline bool DoIGetQuick(ShadowFrame& shadow_frame, const Instruction* inst, uint16_t inst_data) { + Object* obj = shadow_frame.GetVRegReference(inst->VRegB_22c(inst_data)); if (UNLIKELY(obj == NULL)) { // We lost the reference to the field index so we cannot get a more // precised exception message. @@ -196,7 +194,7 @@ static inline bool DoIGetQuick(Thread* self, ShadowFrame& shadow_frame, } MemberOffset field_offset(inst->VRegC_22c()); const bool is_volatile = false; // iget-x-quick only on non volatile fields. - const uint32_t vregA = inst->VRegA_22c(); + const uint32_t vregA = inst->VRegA_22c(inst_data); switch (field_type) { case Primitive::kPrimInt: shadow_frame.SetVReg(vregA, static_cast<int32_t>(obj->GetField32(field_offset, is_volatile))); @@ -217,12 +215,12 @@ static inline bool DoIGetQuick(Thread* self, ShadowFrame& shadow_frame, // specialization. template<FindFieldType find_type, Primitive::Type field_type, bool do_access_check> static bool DoFieldPut(Thread* self, const ShadowFrame& shadow_frame, - const Instruction* inst) + const Instruction* inst, uint16_t inst_data) NO_THREAD_SAFETY_ANALYSIS ALWAYS_INLINE; template<FindFieldType find_type, Primitive::Type field_type, bool do_access_check> static inline bool DoFieldPut(Thread* self, const ShadowFrame& shadow_frame, - const Instruction* inst) { + const Instruction* inst, uint16_t inst_data) { bool is_static = (find_type == StaticObjectWrite) || (find_type == StaticPrimitiveWrite); uint32_t field_idx = is_static ? inst->VRegB_21c() : inst->VRegC_22c(); ArtField* f = FindFieldFromCode(field_idx, shadow_frame.GetMethod(), self, @@ -236,14 +234,14 @@ static inline bool DoFieldPut(Thread* self, const ShadowFrame& shadow_frame, if (is_static) { obj = f->GetDeclaringClass(); } else { - obj = shadow_frame.GetVRegReference(inst->VRegB_22c()); + obj = shadow_frame.GetVRegReference(inst->VRegB_22c(inst_data)); if (UNLIKELY(obj == NULL)) { ThrowNullPointerExceptionForFieldAccess(shadow_frame.GetCurrentLocationForThrow(), f, false); return false; } } - uint32_t vregA = is_static ? inst->VRegA_21c() : inst->VRegA_22c(); + uint32_t vregA = is_static ? inst->VRegA_21c(inst_data) : inst->VRegA_22c(inst_data); switch (field_type) { case Primitive::kPrimBoolean: f->SetBoolean(obj, shadow_frame.GetVReg(vregA)); @@ -275,14 +273,12 @@ static inline bool DoFieldPut(Thread* self, const ShadowFrame& shadow_frame, // TODO: should be SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) which is failing due to template // specialization. template<Primitive::Type field_type> -static bool DoIPutQuick(Thread* self, ShadowFrame& shadow_frame, - const Instruction* inst) +static bool DoIPutQuick(ShadowFrame& shadow_frame, const Instruction* inst, uint16_t inst_data) NO_THREAD_SAFETY_ANALYSIS ALWAYS_INLINE; template<Primitive::Type field_type> -static inline bool DoIPutQuick(Thread* self, ShadowFrame& shadow_frame, - const Instruction* inst) { - Object* obj = shadow_frame.GetVRegReference(inst->VRegB_22c()); +static inline bool DoIPutQuick(ShadowFrame& shadow_frame, const Instruction* inst, uint16_t inst_data) { + Object* obj = shadow_frame.GetVRegReference(inst->VRegB_22c(inst_data)); if (UNLIKELY(obj == NULL)) { // We lost the reference to the field index so we cannot get a more // precised exception message. @@ -291,7 +287,7 @@ static inline bool DoIPutQuick(Thread* self, ShadowFrame& shadow_frame, } MemberOffset field_offset(inst->VRegC_22c()); const bool is_volatile = false; // iput-x-quick only on non volatile fields. - const uint32_t vregA = inst->VRegA_22c(); + const uint32_t vregA = inst->VRegA_22c(inst_data); switch (field_type) { case Primitive::kPrimInt: obj->SetField32(field_offset, shadow_frame.GetVReg(vregA), is_volatile); @@ -387,14 +383,14 @@ static inline bool DoLongRemainder(ShadowFrame& shadow_frame, size_t result_reg, // Returns true on success, otherwise throws an exception and returns false. template <bool is_range, bool do_access_check> bool DoFilledNewArray(const Instruction* inst, const ShadowFrame& shadow_frame, - Thread* self, JValue* result) NO_THREAD_SAFETY_ANALYSIS; + Thread* self, JValue* result) NO_THREAD_SAFETY_ANALYSIS; -static inline int32_t DoPackedSwitch(const Instruction* inst, - const ShadowFrame& shadow_frame) +static inline int32_t DoPackedSwitch(const Instruction* inst, const ShadowFrame& shadow_frame, + uint16_t inst_data) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { DCHECK(inst->Opcode() == Instruction::PACKED_SWITCH); const uint16_t* switch_data = reinterpret_cast<const uint16_t*>(inst) + inst->VRegB_31t(); - int32_t test_val = shadow_frame.GetVReg(inst->VRegA_31t()); + int32_t test_val = shadow_frame.GetVReg(inst->VRegA_31t(inst_data)); DCHECK_EQ(switch_data[0], static_cast<uint16_t>(Instruction::kPackedSwitchSignature)); uint16_t size = switch_data[1]; DCHECK_GT(size, 0); @@ -412,12 +408,12 @@ static inline int32_t DoPackedSwitch(const Instruction* inst, } } -static inline int32_t DoSparseSwitch(const Instruction* inst, - const ShadowFrame& shadow_frame) +static inline int32_t DoSparseSwitch(const Instruction* inst, const ShadowFrame& shadow_frame, + uint16_t inst_data) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { DCHECK(inst->Opcode() == Instruction::SPARSE_SWITCH); const uint16_t* switch_data = reinterpret_cast<const uint16_t*>(inst) + inst->VRegB_31t(); - int32_t test_val = shadow_frame.GetVReg(inst->VRegA_31t()); + int32_t test_val = shadow_frame.GetVReg(inst->VRegA_31t(inst_data)); DCHECK_EQ(switch_data[0], static_cast<uint16_t>(Instruction::kSparseSwitchSignature)); uint16_t size = switch_data[1]; DCHECK_GT(size, 0); diff --git a/runtime/interpreter/interpreter_goto_table_impl.cc b/runtime/interpreter/interpreter_goto_table_impl.cc index 4bef770408..b55c2c242d 100644 --- a/runtime/interpreter/interpreter_goto_table_impl.cc +++ b/runtime/interpreter/interpreter_goto_table_impl.cc @@ -22,6 +22,7 @@ namespace interpreter { // In the following macros, we expect the following local variables exist: // - "self": the current Thread*. // - "inst" : the current Instruction*. +// - "inst_data" : the current instruction's first 16 bits. // - "dex_pc": the current pc. // - "shadow_frame": the current shadow frame. // - "mh": the current MethodHelper. @@ -36,7 +37,8 @@ namespace interpreter { dex_pc = static_cast<uint32_t>(static_cast<int32_t>(dex_pc) + disp); \ shadow_frame.SetDexPC(dex_pc); \ TraceExecution(shadow_frame, inst, dex_pc, mh); \ - goto *currentHandlersTable[inst->Opcode()]; \ + inst_data = inst->Fetch16(0); \ + goto *currentHandlersTable[inst->Opcode(inst_data)]; \ } while (false) #define HANDLE_PENDING_EXCEPTION() goto exception_pending_label @@ -87,6 +89,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* } } const Instruction* inst = Instruction::At(code_item->insns_ + dex_pc); + uint16_t inst_data; // Define handlers table. static const void* handlersTable[kNumPackedOpcodes] = { @@ -117,13 +120,13 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MOVE) - shadow_frame.SetVReg(inst->VRegA_12x(), - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MOVE_FROM16) - shadow_frame.SetVReg(inst->VRegA_22x(), + shadow_frame.SetVReg(inst->VRegA_22x(inst_data), shadow_frame.GetVReg(inst->VRegB_22x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); @@ -135,13 +138,13 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MOVE_WIDE) - shadow_frame.SetVRegLong(inst->VRegA_12x(), - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.SetVRegLong(inst->VRegA_12x(inst_data), + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MOVE_WIDE_FROM16) - shadow_frame.SetVRegLong(inst->VRegA_22x(), + shadow_frame.SetVRegLong(inst->VRegA_22x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_22x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); @@ -153,13 +156,13 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MOVE_OBJECT) - shadow_frame.SetVRegReference(inst->VRegA_12x(), - shadow_frame.GetVRegReference(inst->VRegB_12x())); + shadow_frame.SetVRegReference(inst->VRegA_12x(inst_data), + shadow_frame.GetVRegReference(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MOVE_OBJECT_FROM16) - shadow_frame.SetVRegReference(inst->VRegA_22x(), + shadow_frame.SetVRegReference(inst->VRegA_22x(inst_data), shadow_frame.GetVRegReference(inst->VRegB_22x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); @@ -171,24 +174,24 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MOVE_RESULT) - shadow_frame.SetVReg(inst->VRegA_11x(), result_register.GetI()); + shadow_frame.SetVReg(inst->VRegA_11x(inst_data), result_register.GetI()); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MOVE_RESULT_WIDE) - shadow_frame.SetVRegLong(inst->VRegA_11x(), result_register.GetJ()); + shadow_frame.SetVRegLong(inst->VRegA_11x(inst_data), result_register.GetJ()); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MOVE_RESULT_OBJECT) - shadow_frame.SetVRegReference(inst->VRegA_11x(), result_register.GetL()); + shadow_frame.SetVRegReference(inst->VRegA_11x(inst_data), result_register.GetL()); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MOVE_EXCEPTION) { Throwable* exception = self->GetException(NULL); self->ClearException(); - shadow_frame.SetVRegReference(inst->VRegA_11x(), exception); + shadow_frame.SetVRegReference(inst->VRegA_11x(inst_data), exception); ADVANCE(1); } HANDLE_INSTRUCTION_END(); @@ -231,7 +234,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_START(RETURN) { JValue result; result.SetJ(0); - result.SetI(shadow_frame.GetVReg(inst->VRegA_11x())); + result.SetI(shadow_frame.GetVReg(inst->VRegA_11x(inst_data))); if (UNLIKELY(self->TestAllFlags())) { CheckSuspend(self); } @@ -246,7 +249,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_START(RETURN_WIDE) { JValue result; - result.SetJ(shadow_frame.GetVRegLong(inst->VRegA_11x())); + result.SetJ(shadow_frame.GetVRegLong(inst->VRegA_11x(inst_data))); if (UNLIKELY(self->TestAllFlags())) { CheckSuspend(self); } @@ -262,7 +265,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_START(RETURN_OBJECT) { JValue result; result.SetJ(0); - result.SetL(shadow_frame.GetVRegReference(inst->VRegA_11x())); + result.SetL(shadow_frame.GetVRegReference(inst->VRegA_11x(inst_data))); if (UNLIKELY(self->TestAllFlags())) { CheckSuspend(self); } @@ -276,8 +279,8 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(CONST_4) { - uint32_t dst = inst->VRegA_11n(); - int32_t val = inst->VRegB_11n(); + uint32_t dst = inst->VRegA_11n(inst_data); + int32_t val = inst->VRegB_11n(inst_data); shadow_frame.SetVReg(dst, val); if (val == 0) { shadow_frame.SetVRegReference(dst, NULL); @@ -287,7 +290,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(CONST_16) { - uint32_t dst = inst->VRegA_21s(); + uint32_t dst = inst->VRegA_21s(inst_data); int32_t val = inst->VRegB_21s(); shadow_frame.SetVReg(dst, val); if (val == 0) { @@ -298,7 +301,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(CONST) { - uint32_t dst = inst->VRegA_31i(); + uint32_t dst = inst->VRegA_31i(inst_data); int32_t val = inst->VRegB_31i(); shadow_frame.SetVReg(dst, val); if (val == 0) { @@ -309,7 +312,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(CONST_HIGH16) { - uint32_t dst = inst->VRegA_21h(); + uint32_t dst = inst->VRegA_21h(inst_data); int32_t val = static_cast<int32_t>(inst->VRegB_21h() << 16); shadow_frame.SetVReg(dst, val); if (val == 0) { @@ -320,22 +323,22 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(CONST_WIDE_16) - shadow_frame.SetVRegLong(inst->VRegA_21s(), inst->VRegB_21s()); + shadow_frame.SetVRegLong(inst->VRegA_21s(inst_data), inst->VRegB_21s()); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(CONST_WIDE_32) - shadow_frame.SetVRegLong(inst->VRegA_31i(), inst->VRegB_31i()); + shadow_frame.SetVRegLong(inst->VRegA_31i(inst_data), inst->VRegB_31i()); ADVANCE(3); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(CONST_WIDE) - shadow_frame.SetVRegLong(inst->VRegA_51l(), inst->VRegB_51l()); + shadow_frame.SetVRegLong(inst->VRegA_51l(inst_data), inst->VRegB_51l()); ADVANCE(5); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(CONST_WIDE_HIGH16) - shadow_frame.SetVRegLong(inst->VRegA_21h(), + shadow_frame.SetVRegLong(inst->VRegA_21h(inst_data), static_cast<uint64_t>(inst->VRegB_21h()) << 48); ADVANCE(2); HANDLE_INSTRUCTION_END(); @@ -345,7 +348,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* if (UNLIKELY(s == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { - shadow_frame.SetVRegReference(inst->VRegA_21c(), s); + shadow_frame.SetVRegReference(inst->VRegA_21c(inst_data), s); ADVANCE(2); } } @@ -356,7 +359,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* if (UNLIKELY(s == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { - shadow_frame.SetVRegReference(inst->VRegA_31c(), s); + shadow_frame.SetVRegReference(inst->VRegA_31c(inst_data), s); ADVANCE(3); } } @@ -368,14 +371,14 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* if (UNLIKELY(c == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { - shadow_frame.SetVRegReference(inst->VRegA_21c(), c); + shadow_frame.SetVRegReference(inst->VRegA_21c(inst_data), c); ADVANCE(2); } } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MONITOR_ENTER) { - Object* obj = shadow_frame.GetVRegReference(inst->VRegA_11x()); + Object* obj = shadow_frame.GetVRegReference(inst->VRegA_11x(inst_data)); if (UNLIKELY(obj == NULL)) { ThrowNullPointerExceptionFromDexPC(shadow_frame.GetCurrentLocationForThrow()); HANDLE_PENDING_EXCEPTION(); @@ -387,7 +390,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MONITOR_EXIT) { - Object* obj = shadow_frame.GetVRegReference(inst->VRegA_11x()); + Object* obj = shadow_frame.GetVRegReference(inst->VRegA_11x(inst_data)); if (UNLIKELY(obj == NULL)) { ThrowNullPointerExceptionFromDexPC(shadow_frame.GetCurrentLocationForThrow()); HANDLE_PENDING_EXCEPTION(); @@ -404,7 +407,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* if (UNLIKELY(c == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { - Object* obj = shadow_frame.GetVRegReference(inst->VRegA_21c()); + Object* obj = shadow_frame.GetVRegReference(inst->VRegA_21c(inst_data)); if (UNLIKELY(obj != NULL && !obj->InstanceOf(c))) { ThrowClassCastException(c, obj->GetClass()); HANDLE_PENDING_EXCEPTION(); @@ -421,20 +424,20 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* if (UNLIKELY(c == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { - Object* obj = shadow_frame.GetVRegReference(inst->VRegB_22c()); - shadow_frame.SetVReg(inst->VRegA_22c(), (obj != NULL && obj->InstanceOf(c)) ? 1 : 0); + Object* obj = shadow_frame.GetVRegReference(inst->VRegB_22c(inst_data)); + shadow_frame.SetVReg(inst->VRegA_22c(inst_data), (obj != NULL && obj->InstanceOf(c)) ? 1 : 0); ADVANCE(2); } } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(ARRAY_LENGTH) { - Object* array = shadow_frame.GetVRegReference(inst->VRegB_12x()); + Object* array = shadow_frame.GetVRegReference(inst->VRegB_12x(inst_data)); if (UNLIKELY(array == NULL)) { ThrowNullPointerExceptionFromDexPC(shadow_frame.GetCurrentLocationForThrow()); HANDLE_PENDING_EXCEPTION(); } else { - shadow_frame.SetVReg(inst->VRegA_12x(), array->AsArray()->GetLength()); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), array->AsArray()->GetLength()); ADVANCE(1); } } @@ -446,20 +449,20 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* if (UNLIKELY(obj == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { - shadow_frame.SetVRegReference(inst->VRegA_21c(), obj); + shadow_frame.SetVRegReference(inst->VRegA_21c(inst_data), obj); ADVANCE(2); } } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(NEW_ARRAY) { - int32_t length = shadow_frame.GetVReg(inst->VRegB_22c()); + int32_t length = shadow_frame.GetVReg(inst->VRegB_22c(inst_data)); Object* obj = AllocArrayFromCode(inst->VRegC_22c(), shadow_frame.GetMethod(), length, self, do_access_check); if (UNLIKELY(obj == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { - shadow_frame.SetVRegReference(inst->VRegA_22c(), obj); + shadow_frame.SetVRegReference(inst->VRegA_22c(inst_data), obj); ADVANCE(2); } } @@ -480,7 +483,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(FILL_ARRAY_DATA) { - Object* obj = shadow_frame.GetVRegReference(inst->VRegA_31t()); + Object* obj = shadow_frame.GetVRegReference(inst->VRegA_31t(inst_data)); if (UNLIKELY(obj == NULL)) { ThrowNullPointerException(NULL, "null array in FILL_ARRAY_DATA"); HANDLE_PENDING_EXCEPTION(); @@ -506,7 +509,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(THROW) { - Object* exception = shadow_frame.GetVRegReference(inst->VRegA_11x()); + Object* exception = shadow_frame.GetVRegReference(inst->VRegA_11x(inst_data)); if (UNLIKELY(exception == NULL)) { ThrowNullPointerException(NULL, "throw with null exception"); } else { @@ -517,7 +520,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(GOTO) { - int8_t offset = inst->VRegA_10t(); + int8_t offset = inst->VRegA_10t(inst_data); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { CheckSuspend(self); @@ -553,7 +556,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(PACKED_SWITCH) { - int32_t offset = DoPackedSwitch(inst, shadow_frame); + int32_t offset = DoPackedSwitch(inst, shadow_frame, inst_data); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { CheckSuspend(self); @@ -565,7 +568,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SPARSE_SWITCH) { - int32_t offset = DoSparseSwitch(inst, shadow_frame); + int32_t offset = DoSparseSwitch(inst, shadow_frame, inst_data); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { CheckSuspend(self); @@ -587,7 +590,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* } else { result = -1; } - shadow_frame.SetVReg(inst->VRegA_23x(), result); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), result); ADVANCE(2); } HANDLE_INSTRUCTION_END(); @@ -603,7 +606,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* } else { result = 1; } - shadow_frame.SetVReg(inst->VRegA_23x(), result); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), result); ADVANCE(2); } HANDLE_INSTRUCTION_END(); @@ -619,7 +622,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* } else { result = -1; } - shadow_frame.SetVReg(inst->VRegA_23x(), result); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), result); ADVANCE(2); } HANDLE_INSTRUCTION_END(); @@ -635,7 +638,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* } else { result = 1; } - shadow_frame.SetVReg(inst->VRegA_23x(), result); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), result); ADVANCE(2); } HANDLE_INSTRUCTION_END(); @@ -651,13 +654,13 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* } else { result = -1; } - shadow_frame.SetVReg(inst->VRegA_23x(), result); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), result); ADVANCE(2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IF_EQ) { - if (shadow_frame.GetVReg(inst->VRegA_22t()) == shadow_frame.GetVReg(inst->VRegB_22t())) { + if (shadow_frame.GetVReg(inst->VRegA_22t(inst_data)) == shadow_frame.GetVReg(inst->VRegB_22t(inst_data))) { int16_t offset = inst->VRegC_22t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -673,7 +676,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IF_NE) { - if (shadow_frame.GetVReg(inst->VRegA_22t()) != shadow_frame.GetVReg(inst->VRegB_22t())) { + if (shadow_frame.GetVReg(inst->VRegA_22t(inst_data)) != shadow_frame.GetVReg(inst->VRegB_22t(inst_data))) { int16_t offset = inst->VRegC_22t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -689,7 +692,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IF_LT) { - if (shadow_frame.GetVReg(inst->VRegA_22t()) < shadow_frame.GetVReg(inst->VRegB_22t())) { + if (shadow_frame.GetVReg(inst->VRegA_22t(inst_data)) < shadow_frame.GetVReg(inst->VRegB_22t(inst_data))) { int16_t offset = inst->VRegC_22t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -705,7 +708,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IF_GE) { - if (shadow_frame.GetVReg(inst->VRegA_22t()) >= shadow_frame.GetVReg(inst->VRegB_22t())) { + if (shadow_frame.GetVReg(inst->VRegA_22t(inst_data)) >= shadow_frame.GetVReg(inst->VRegB_22t(inst_data))) { int16_t offset = inst->VRegC_22t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -721,7 +724,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IF_GT) { - if (shadow_frame.GetVReg(inst->VRegA_22t()) > shadow_frame.GetVReg(inst->VRegB_22t())) { + if (shadow_frame.GetVReg(inst->VRegA_22t(inst_data)) > shadow_frame.GetVReg(inst->VRegB_22t(inst_data))) { int16_t offset = inst->VRegC_22t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -737,7 +740,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IF_LE) { - if (shadow_frame.GetVReg(inst->VRegA_22t()) <= shadow_frame.GetVReg(inst->VRegB_22t())) { + if (shadow_frame.GetVReg(inst->VRegA_22t(inst_data)) <= shadow_frame.GetVReg(inst->VRegB_22t(inst_data))) { int16_t offset = inst->VRegC_22t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -753,7 +756,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IF_EQZ) { - if (shadow_frame.GetVReg(inst->VRegA_21t()) == 0) { + if (shadow_frame.GetVReg(inst->VRegA_21t(inst_data)) == 0) { int16_t offset = inst->VRegB_21t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -769,7 +772,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IF_NEZ) { - if (shadow_frame.GetVReg(inst->VRegA_21t()) != 0) { + if (shadow_frame.GetVReg(inst->VRegA_21t(inst_data)) != 0) { int16_t offset = inst->VRegB_21t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -785,7 +788,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IF_LTZ) { - if (shadow_frame.GetVReg(inst->VRegA_21t()) < 0) { + if (shadow_frame.GetVReg(inst->VRegA_21t(inst_data)) < 0) { int16_t offset = inst->VRegB_21t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -801,7 +804,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IF_GEZ) { - if (shadow_frame.GetVReg(inst->VRegA_21t()) >= 0) { + if (shadow_frame.GetVReg(inst->VRegA_21t(inst_data)) >= 0) { int16_t offset = inst->VRegB_21t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -817,7 +820,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IF_GTZ) { - if (shadow_frame.GetVReg(inst->VRegA_21t()) > 0) { + if (shadow_frame.GetVReg(inst->VRegA_21t(inst_data)) > 0) { int16_t offset = inst->VRegB_21t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -833,7 +836,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IF_LEZ) { - if (shadow_frame.GetVReg(inst->VRegA_21t()) <= 0) { + if (shadow_frame.GetVReg(inst->VRegA_21t(inst_data)) <= 0) { int16_t offset = inst->VRegB_21t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -857,7 +860,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); BooleanArray* array = a->AsBooleanArray(); if (LIKELY(array->IsValidIndex(index))) { - shadow_frame.SetVReg(inst->VRegA_23x(), array->GetData()[index]); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), array->GetData()[index]); ADVANCE(2); } else { HANDLE_PENDING_EXCEPTION(); @@ -875,7 +878,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); ByteArray* array = a->AsByteArray(); if (LIKELY(array->IsValidIndex(index))) { - shadow_frame.SetVReg(inst->VRegA_23x(), array->GetData()[index]); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), array->GetData()[index]); ADVANCE(2); } else { HANDLE_PENDING_EXCEPTION(); @@ -893,7 +896,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); CharArray* array = a->AsCharArray(); if (LIKELY(array->IsValidIndex(index))) { - shadow_frame.SetVReg(inst->VRegA_23x(), array->GetData()[index]); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), array->GetData()[index]); ADVANCE(2); } else { HANDLE_PENDING_EXCEPTION(); @@ -911,7 +914,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); ShortArray* array = a->AsShortArray(); if (LIKELY(array->IsValidIndex(index))) { - shadow_frame.SetVReg(inst->VRegA_23x(), array->GetData()[index]); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), array->GetData()[index]); ADVANCE(2); } else { HANDLE_PENDING_EXCEPTION(); @@ -929,7 +932,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); IntArray* array = a->AsIntArray(); if (LIKELY(array->IsValidIndex(index))) { - shadow_frame.SetVReg(inst->VRegA_23x(), array->GetData()[index]); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), array->GetData()[index]); ADVANCE(2); } else { HANDLE_PENDING_EXCEPTION(); @@ -947,7 +950,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); LongArray* array = a->AsLongArray(); if (LIKELY(array->IsValidIndex(index))) { - shadow_frame.SetVRegLong(inst->VRegA_23x(), array->GetData()[index]); + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), array->GetData()[index]); ADVANCE(2); } else { HANDLE_PENDING_EXCEPTION(); @@ -965,7 +968,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); ObjectArray<Object>* array = a->AsObjectArray<Object>(); if (LIKELY(array->IsValidIndex(index))) { - shadow_frame.SetVRegReference(inst->VRegA_23x(), array->GetWithoutChecks(index)); + shadow_frame.SetVRegReference(inst->VRegA_23x(inst_data), array->GetWithoutChecks(index)); ADVANCE(2); } else { HANDLE_PENDING_EXCEPTION(); @@ -980,7 +983,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* ThrowNullPointerExceptionFromDexPC(shadow_frame.GetCurrentLocationForThrow()); HANDLE_PENDING_EXCEPTION(); } else { - uint8_t val = shadow_frame.GetVReg(inst->VRegA_23x()); + uint8_t val = shadow_frame.GetVReg(inst->VRegA_23x(inst_data)); int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); BooleanArray* array = a->AsBooleanArray(); if (LIKELY(array->IsValidIndex(index))) { @@ -999,7 +1002,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* ThrowNullPointerExceptionFromDexPC(shadow_frame.GetCurrentLocationForThrow()); HANDLE_PENDING_EXCEPTION(); } else { - int8_t val = shadow_frame.GetVReg(inst->VRegA_23x()); + int8_t val = shadow_frame.GetVReg(inst->VRegA_23x(inst_data)); int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); ByteArray* array = a->AsByteArray(); if (LIKELY(array->IsValidIndex(index))) { @@ -1018,7 +1021,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* ThrowNullPointerExceptionFromDexPC(shadow_frame.GetCurrentLocationForThrow()); HANDLE_PENDING_EXCEPTION(); } else { - uint16_t val = shadow_frame.GetVReg(inst->VRegA_23x()); + uint16_t val = shadow_frame.GetVReg(inst->VRegA_23x(inst_data)); int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); CharArray* array = a->AsCharArray(); if (LIKELY(array->IsValidIndex(index))) { @@ -1037,7 +1040,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* ThrowNullPointerExceptionFromDexPC(shadow_frame.GetCurrentLocationForThrow()); HANDLE_PENDING_EXCEPTION(); } else { - int16_t val = shadow_frame.GetVReg(inst->VRegA_23x()); + int16_t val = shadow_frame.GetVReg(inst->VRegA_23x(inst_data)); int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); ShortArray* array = a->AsShortArray(); if (LIKELY(array->IsValidIndex(index))) { @@ -1056,7 +1059,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* ThrowNullPointerExceptionFromDexPC(shadow_frame.GetCurrentLocationForThrow()); HANDLE_PENDING_EXCEPTION(); } else { - int32_t val = shadow_frame.GetVReg(inst->VRegA_23x()); + int32_t val = shadow_frame.GetVReg(inst->VRegA_23x(inst_data)); int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); IntArray* array = a->AsIntArray(); if (LIKELY(array->IsValidIndex(index))) { @@ -1075,7 +1078,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* ThrowNullPointerExceptionFromDexPC(shadow_frame.GetCurrentLocationForThrow()); HANDLE_PENDING_EXCEPTION(); } else { - int64_t val = shadow_frame.GetVRegLong(inst->VRegA_23x()); + int64_t val = shadow_frame.GetVRegLong(inst->VRegA_23x(inst_data)); int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); LongArray* array = a->AsLongArray(); if (LIKELY(array->IsValidIndex(index))) { @@ -1095,7 +1098,7 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_PENDING_EXCEPTION(); } else { int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); - Object* val = shadow_frame.GetVRegReference(inst->VRegA_23x()); + Object* val = shadow_frame.GetVRegReference(inst->VRegA_23x(inst_data)); ObjectArray<Object>* array = a->AsObjectArray<Object>(); if (LIKELY(array->IsValidIndex(index) && array->CheckAssignable(val))) { array->SetWithoutChecks(index, val); @@ -1108,205 +1111,205 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IGET_BOOLEAN) { - bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IGET_BYTE) { - bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IGET_CHAR) { - bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IGET_SHORT) { - bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IGET) { - bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IGET_WIDE) { - bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IGET_OBJECT) { - bool success = DoFieldGet<InstanceObjectRead, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<InstanceObjectRead, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IGET_QUICK) { - bool success = DoIGetQuick<Primitive::kPrimInt>(self, shadow_frame, inst); + bool success = DoIGetQuick<Primitive::kPrimInt>(shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IGET_WIDE_QUICK) { - bool success = DoIGetQuick<Primitive::kPrimLong>(self, shadow_frame, inst); + bool success = DoIGetQuick<Primitive::kPrimLong>(shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IGET_OBJECT_QUICK) { - bool success = DoIGetQuick<Primitive::kPrimNot>(self, shadow_frame, inst); + bool success = DoIGetQuick<Primitive::kPrimNot>(shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SGET_BOOLEAN) { - bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SGET_BYTE) { - bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SGET_CHAR) { - bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SGET_SHORT) { - bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SGET) { - bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SGET_WIDE) { - bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SGET_OBJECT) { - bool success = DoFieldGet<StaticObjectRead, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<StaticObjectRead, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IPUT_BOOLEAN) { - bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IPUT_BYTE) { - bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IPUT_CHAR) { - bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IPUT_SHORT) { - bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IPUT) { - bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IPUT_WIDE) { - bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IPUT_OBJECT) { - bool success = DoFieldPut<InstanceObjectWrite, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<InstanceObjectWrite, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IPUT_QUICK) { - bool success = DoIPutQuick<Primitive::kPrimInt>(self, shadow_frame, inst); + bool success = DoIPutQuick<Primitive::kPrimInt>(shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IPUT_WIDE_QUICK) { - bool success = DoIPutQuick<Primitive::kPrimLong>(self, shadow_frame, inst); + bool success = DoIPutQuick<Primitive::kPrimLong>(shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(IPUT_OBJECT_QUICK) { - bool success = DoIPutQuick<Primitive::kPrimNot>(self, shadow_frame, inst); + bool success = DoIPutQuick<Primitive::kPrimNot>(shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SPUT_BOOLEAN) { - bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SPUT_BYTE) { - bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SPUT_CHAR) { - bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SPUT_SHORT) { - bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SPUT) { - bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SPUT_WIDE) { - bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SPUT_OBJECT) { - bool success = DoFieldPut<StaticObjectWrite, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<StaticObjectWrite, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); @@ -1396,67 +1399,67 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(NEG_INT) - shadow_frame.SetVReg(inst->VRegA_12x(), -shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), -shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(NOT_INT) - shadow_frame.SetVReg(inst->VRegA_12x(), ~shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), ~shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(NEG_LONG) - shadow_frame.SetVRegLong(inst->VRegA_12x(), -shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.SetVRegLong(inst->VRegA_12x(inst_data), -shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(NOT_LONG) - shadow_frame.SetVRegLong(inst->VRegA_12x(), ~shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.SetVRegLong(inst->VRegA_12x(inst_data), ~shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(NEG_FLOAT) - shadow_frame.SetVRegFloat(inst->VRegA_12x(), -shadow_frame.GetVRegFloat(inst->VRegB_12x())); + shadow_frame.SetVRegFloat(inst->VRegA_12x(inst_data), -shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(NEG_DOUBLE) - shadow_frame.SetVRegDouble(inst->VRegA_12x(), -shadow_frame.GetVRegDouble(inst->VRegB_12x())); + shadow_frame.SetVRegDouble(inst->VRegA_12x(inst_data), -shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(INT_TO_LONG) - shadow_frame.SetVRegLong(inst->VRegA_12x(), shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.SetVRegLong(inst->VRegA_12x(inst_data), shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(INT_TO_FLOAT) - shadow_frame.SetVRegFloat(inst->VRegA_12x(), shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.SetVRegFloat(inst->VRegA_12x(inst_data), shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(INT_TO_DOUBLE) - shadow_frame.SetVRegDouble(inst->VRegA_12x(), shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.SetVRegDouble(inst->VRegA_12x(inst_data), shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(LONG_TO_INT) - shadow_frame.SetVReg(inst->VRegA_12x(), shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(LONG_TO_FLOAT) - shadow_frame.SetVRegFloat(inst->VRegA_12x(), shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.SetVRegFloat(inst->VRegA_12x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(LONG_TO_DOUBLE) - shadow_frame.SetVRegDouble(inst->VRegA_12x(), shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.SetVRegDouble(inst->VRegA_12x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(FLOAT_TO_INT) { - float val = shadow_frame.GetVRegFloat(inst->VRegB_12x()); + float val = shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data)); int32_t result; if (val != val) { result = 0; @@ -1467,13 +1470,13 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* } else { result = val; } - shadow_frame.SetVReg(inst->VRegA_12x(), result); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), result); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(FLOAT_TO_LONG) { - float val = shadow_frame.GetVRegFloat(inst->VRegB_12x()); + float val = shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data)); int64_t result; if (val != val) { result = 0; @@ -1484,18 +1487,18 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* } else { result = val; } - shadow_frame.SetVRegLong(inst->VRegA_12x(), result); + shadow_frame.SetVRegLong(inst->VRegA_12x(inst_data), result); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(FLOAT_TO_DOUBLE) - shadow_frame.SetVRegDouble(inst->VRegA_12x(), shadow_frame.GetVRegFloat(inst->VRegB_12x())); + shadow_frame.SetVRegDouble(inst->VRegA_12x(inst_data), shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(DOUBLE_TO_INT) { - double val = shadow_frame.GetVRegDouble(inst->VRegB_12x()); + double val = shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data)); int32_t result; if (val != val) { result = 0; @@ -1506,13 +1509,13 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* } else { result = val; } - shadow_frame.SetVReg(inst->VRegA_12x(), result); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), result); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(DOUBLE_TO_LONG) { - double val = shadow_frame.GetVRegDouble(inst->VRegB_12x()); + double val = shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data)); int64_t result; if (val != val) { result = 0; @@ -1523,674 +1526,674 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* } else { result = val; } - shadow_frame.SetVRegLong(inst->VRegA_12x(), result); + shadow_frame.SetVRegLong(inst->VRegA_12x(inst_data), result); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(DOUBLE_TO_FLOAT) - shadow_frame.SetVRegFloat(inst->VRegA_12x(), shadow_frame.GetVRegDouble(inst->VRegB_12x())); + shadow_frame.SetVRegFloat(inst->VRegA_12x(inst_data), shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(INT_TO_BYTE) - shadow_frame.SetVReg(inst->VRegA_12x(), - static_cast<int8_t>(shadow_frame.GetVReg(inst->VRegB_12x()))); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), + static_cast<int8_t>(shadow_frame.GetVReg(inst->VRegB_12x(inst_data)))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(INT_TO_CHAR) - shadow_frame.SetVReg(inst->VRegA_12x(), - static_cast<uint16_t>(shadow_frame.GetVReg(inst->VRegB_12x()))); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), + static_cast<uint16_t>(shadow_frame.GetVReg(inst->VRegB_12x(inst_data)))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(INT_TO_SHORT) - shadow_frame.SetVReg(inst->VRegA_12x(), - static_cast<int16_t>(shadow_frame.GetVReg(inst->VRegB_12x()))); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), + static_cast<int16_t>(shadow_frame.GetVReg(inst->VRegB_12x(inst_data)))); ADVANCE(1); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(ADD_INT) - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) + shadow_frame.GetVReg(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SUB_INT) - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) - shadow_frame.GetVReg(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MUL_INT) - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) * shadow_frame.GetVReg(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(DIV_INT) { - bool success = DoIntDivide(shadow_frame, inst->VRegA_23x(), - shadow_frame.GetVReg(inst->VRegB_23x()), - shadow_frame.GetVReg(inst->VRegC_23x())); + bool success = DoIntDivide(shadow_frame, inst->VRegA_23x(inst_data), + shadow_frame.GetVReg(inst->VRegB_23x()), + shadow_frame.GetVReg(inst->VRegC_23x())); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(REM_INT) { - bool success = DoIntRemainder(shadow_frame, inst->VRegA_23x(), - shadow_frame.GetVReg(inst->VRegB_23x()), - shadow_frame.GetVReg(inst->VRegC_23x())); + bool success = DoIntRemainder(shadow_frame, inst->VRegA_23x(inst_data), + shadow_frame.GetVReg(inst->VRegB_23x()), + shadow_frame.GetVReg(inst->VRegC_23x())); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SHL_INT) - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) << (shadow_frame.GetVReg(inst->VRegC_23x()) & 0x1f)); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SHR_INT) - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) >> (shadow_frame.GetVReg(inst->VRegC_23x()) & 0x1f)); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(USHR_INT) - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), static_cast<uint32_t>(shadow_frame.GetVReg(inst->VRegB_23x())) >> (shadow_frame.GetVReg(inst->VRegC_23x()) & 0x1f)); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(AND_INT) - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) & shadow_frame.GetVReg(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(OR_INT) - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) | shadow_frame.GetVReg(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(XOR_INT) - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) ^ shadow_frame.GetVReg(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(ADD_LONG) - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) + shadow_frame.GetVRegLong(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SUB_LONG) - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) - shadow_frame.GetVRegLong(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MUL_LONG) - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) * shadow_frame.GetVRegLong(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(DIV_LONG) { - bool success = DoLongDivide(shadow_frame, inst->VRegA_23x(), - shadow_frame.GetVRegLong(inst->VRegB_23x()), - shadow_frame.GetVRegLong(inst->VRegC_23x())); + bool success = DoLongDivide(shadow_frame, inst->VRegA_23x(inst_data), + shadow_frame.GetVRegLong(inst->VRegB_23x()), + shadow_frame.GetVRegLong(inst->VRegC_23x())); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(REM_LONG) { - bool success = DoLongRemainder(shadow_frame, inst->VRegA_23x(), - shadow_frame.GetVRegLong(inst->VRegB_23x()), - shadow_frame.GetVRegLong(inst->VRegC_23x())); + bool success = DoLongRemainder(shadow_frame, inst->VRegA_23x(inst_data), + shadow_frame.GetVRegLong(inst->VRegB_23x()), + shadow_frame.GetVRegLong(inst->VRegC_23x())); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(AND_LONG) - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) & shadow_frame.GetVRegLong(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(OR_LONG) - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) | shadow_frame.GetVRegLong(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(XOR_LONG) - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) ^ shadow_frame.GetVRegLong(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SHL_LONG) - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) << (shadow_frame.GetVReg(inst->VRegC_23x()) & 0x3f)); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SHR_LONG) - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) >> (shadow_frame.GetVReg(inst->VRegC_23x()) & 0x3f)); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(USHR_LONG) - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), static_cast<uint64_t>(shadow_frame.GetVRegLong(inst->VRegB_23x())) >> (shadow_frame.GetVReg(inst->VRegC_23x()) & 0x3f)); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(ADD_FLOAT) - shadow_frame.SetVRegFloat(inst->VRegA_23x(), + shadow_frame.SetVRegFloat(inst->VRegA_23x(inst_data), shadow_frame.GetVRegFloat(inst->VRegB_23x()) + shadow_frame.GetVRegFloat(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SUB_FLOAT) - shadow_frame.SetVRegFloat(inst->VRegA_23x(), + shadow_frame.SetVRegFloat(inst->VRegA_23x(inst_data), shadow_frame.GetVRegFloat(inst->VRegB_23x()) - shadow_frame.GetVRegFloat(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MUL_FLOAT) - shadow_frame.SetVRegFloat(inst->VRegA_23x(), + shadow_frame.SetVRegFloat(inst->VRegA_23x(inst_data), shadow_frame.GetVRegFloat(inst->VRegB_23x()) * shadow_frame.GetVRegFloat(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(DIV_FLOAT) - shadow_frame.SetVRegFloat(inst->VRegA_23x(), + shadow_frame.SetVRegFloat(inst->VRegA_23x(inst_data), shadow_frame.GetVRegFloat(inst->VRegB_23x()) / shadow_frame.GetVRegFloat(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(REM_FLOAT) - shadow_frame.SetVRegFloat(inst->VRegA_23x(), + shadow_frame.SetVRegFloat(inst->VRegA_23x(inst_data), fmodf(shadow_frame.GetVRegFloat(inst->VRegB_23x()), shadow_frame.GetVRegFloat(inst->VRegC_23x()))); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(ADD_DOUBLE) - shadow_frame.SetVRegDouble(inst->VRegA_23x(), + shadow_frame.SetVRegDouble(inst->VRegA_23x(inst_data), shadow_frame.GetVRegDouble(inst->VRegB_23x()) + shadow_frame.GetVRegDouble(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SUB_DOUBLE) - shadow_frame.SetVRegDouble(inst->VRegA_23x(), + shadow_frame.SetVRegDouble(inst->VRegA_23x(inst_data), shadow_frame.GetVRegDouble(inst->VRegB_23x()) - shadow_frame.GetVRegDouble(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MUL_DOUBLE) - shadow_frame.SetVRegDouble(inst->VRegA_23x(), + shadow_frame.SetVRegDouble(inst->VRegA_23x(inst_data), shadow_frame.GetVRegDouble(inst->VRegB_23x()) * shadow_frame.GetVRegDouble(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(DIV_DOUBLE) - shadow_frame.SetVRegDouble(inst->VRegA_23x(), + shadow_frame.SetVRegDouble(inst->VRegA_23x(inst_data), shadow_frame.GetVRegDouble(inst->VRegB_23x()) / shadow_frame.GetVRegDouble(inst->VRegC_23x())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(REM_DOUBLE) - shadow_frame.SetVRegDouble(inst->VRegA_23x(), + shadow_frame.SetVRegDouble(inst->VRegA_23x(inst_data), fmod(shadow_frame.GetVRegDouble(inst->VRegB_23x()), shadow_frame.GetVRegDouble(inst->VRegC_23x()))); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(ADD_INT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) + - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SUB_INT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) - - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MUL_INT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) * - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(DIV_INT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); bool success = DoIntDivide(shadow_frame, vregA, shadow_frame.GetVReg(vregA), - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(REM_INT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); bool success = DoIntRemainder(shadow_frame, vregA, shadow_frame.GetVReg(vregA), - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SHL_INT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) << - (shadow_frame.GetVReg(inst->VRegB_12x()) & 0x1f)); + (shadow_frame.GetVReg(inst->VRegB_12x(inst_data)) & 0x1f)); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SHR_INT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) >> - (shadow_frame.GetVReg(inst->VRegB_12x()) & 0x1f)); + (shadow_frame.GetVReg(inst->VRegB_12x(inst_data)) & 0x1f)); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(USHR_INT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, static_cast<uint32_t>(shadow_frame.GetVReg(vregA)) >> - (shadow_frame.GetVReg(inst->VRegB_12x()) & 0x1f)); + (shadow_frame.GetVReg(inst->VRegB_12x(inst_data)) & 0x1f)); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(AND_INT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) & - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(OR_INT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) | - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(XOR_INT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) ^ - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(ADD_LONG_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) + - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SUB_LONG_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) - - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MUL_LONG_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) * - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(DIV_LONG_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); bool success = DoLongDivide(shadow_frame, vregA, shadow_frame.GetVRegLong(vregA), - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(REM_LONG_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); bool success = DoLongRemainder(shadow_frame, vregA, shadow_frame.GetVRegLong(vregA), - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(AND_LONG_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) & - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(OR_LONG_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) | - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(XOR_LONG_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) ^ - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SHL_LONG_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) << - (shadow_frame.GetVReg(inst->VRegB_12x()) & 0x3f)); + (shadow_frame.GetVReg(inst->VRegB_12x(inst_data)) & 0x3f)); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SHR_LONG_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) >> - (shadow_frame.GetVReg(inst->VRegB_12x()) & 0x3f)); + (shadow_frame.GetVReg(inst->VRegB_12x(inst_data)) & 0x3f)); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(USHR_LONG_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, static_cast<uint64_t>(shadow_frame.GetVRegLong(vregA)) >> - (shadow_frame.GetVReg(inst->VRegB_12x()) & 0x3f)); + (shadow_frame.GetVReg(inst->VRegB_12x(inst_data)) & 0x3f)); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(ADD_FLOAT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegFloat(vregA, shadow_frame.GetVRegFloat(vregA) + - shadow_frame.GetVRegFloat(inst->VRegB_12x())); + shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SUB_FLOAT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegFloat(vregA, shadow_frame.GetVRegFloat(vregA) - - shadow_frame.GetVRegFloat(inst->VRegB_12x())); + shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MUL_FLOAT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegFloat(vregA, shadow_frame.GetVRegFloat(vregA) * - shadow_frame.GetVRegFloat(inst->VRegB_12x())); + shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(DIV_FLOAT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegFloat(vregA, shadow_frame.GetVRegFloat(vregA) / - shadow_frame.GetVRegFloat(inst->VRegB_12x())); + shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(REM_FLOAT_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegFloat(vregA, fmodf(shadow_frame.GetVRegFloat(vregA), - shadow_frame.GetVRegFloat(inst->VRegB_12x()))); + shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data)))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(ADD_DOUBLE_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegDouble(vregA, shadow_frame.GetVRegDouble(vregA) + - shadow_frame.GetVRegDouble(inst->VRegB_12x())); + shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SUB_DOUBLE_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegDouble(vregA, shadow_frame.GetVRegDouble(vregA) - - shadow_frame.GetVRegDouble(inst->VRegB_12x())); + shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MUL_DOUBLE_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegDouble(vregA, shadow_frame.GetVRegDouble(vregA) * - shadow_frame.GetVRegDouble(inst->VRegB_12x())); + shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(DIV_DOUBLE_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegDouble(vregA, shadow_frame.GetVRegDouble(vregA) / - shadow_frame.GetVRegDouble(inst->VRegB_12x())); + shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(REM_DOUBLE_2ADDR) { - uint32_t vregA = inst->VRegA_12x(); + uint32_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegDouble(vregA, fmod(shadow_frame.GetVRegDouble(vregA), - shadow_frame.GetVRegDouble(inst->VRegB_12x()))); + shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data)))); ADVANCE(1); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(ADD_INT_LIT16) - shadow_frame.SetVReg(inst->VRegA_22s(), - shadow_frame.GetVReg(inst->VRegB_22s()) + + shadow_frame.SetVReg(inst->VRegA_22s(inst_data), + shadow_frame.GetVReg(inst->VRegB_22s(inst_data)) + inst->VRegC_22s()); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(RSUB_INT) - shadow_frame.SetVReg(inst->VRegA_22s(), + shadow_frame.SetVReg(inst->VRegA_22s(inst_data), inst->VRegC_22s() - - shadow_frame.GetVReg(inst->VRegB_22s())); + shadow_frame.GetVReg(inst->VRegB_22s(inst_data))); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MUL_INT_LIT16) - shadow_frame.SetVReg(inst->VRegA_22s(), - shadow_frame.GetVReg(inst->VRegB_22s()) * + shadow_frame.SetVReg(inst->VRegA_22s(inst_data), + shadow_frame.GetVReg(inst->VRegB_22s(inst_data)) * inst->VRegC_22s()); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(DIV_INT_LIT16) { - bool success = DoIntDivide(shadow_frame, inst->VRegA_22s(), - shadow_frame.GetVReg(inst->VRegB_22s()), inst->VRegC_22s()); + bool success = DoIntDivide(shadow_frame, inst->VRegA_22s(inst_data), + shadow_frame.GetVReg(inst->VRegB_22s(inst_data)), inst->VRegC_22s()); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(REM_INT_LIT16) { - bool success = DoIntRemainder(shadow_frame, inst->VRegA_22s(), - shadow_frame.GetVReg(inst->VRegB_22s()), inst->VRegC_22s()); + bool success = DoIntRemainder(shadow_frame, inst->VRegA_22s(inst_data), + shadow_frame.GetVReg(inst->VRegB_22s(inst_data)), inst->VRegC_22s()); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(AND_INT_LIT16) - shadow_frame.SetVReg(inst->VRegA_22s(), - shadow_frame.GetVReg(inst->VRegB_22s()) & + shadow_frame.SetVReg(inst->VRegA_22s(inst_data), + shadow_frame.GetVReg(inst->VRegB_22s(inst_data)) & inst->VRegC_22s()); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(OR_INT_LIT16) - shadow_frame.SetVReg(inst->VRegA_22s(), - shadow_frame.GetVReg(inst->VRegB_22s()) | + shadow_frame.SetVReg(inst->VRegA_22s(inst_data), + shadow_frame.GetVReg(inst->VRegB_22s(inst_data)) | inst->VRegC_22s()); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(XOR_INT_LIT16) - shadow_frame.SetVReg(inst->VRegA_22s(), - shadow_frame.GetVReg(inst->VRegB_22s()) ^ + shadow_frame.SetVReg(inst->VRegA_22s(inst_data), + shadow_frame.GetVReg(inst->VRegB_22s(inst_data)) ^ inst->VRegC_22s()); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(ADD_INT_LIT8) - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()) + inst->VRegC_22b()); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(RSUB_INT_LIT8) - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), inst->VRegC_22b() - shadow_frame.GetVReg(inst->VRegB_22b())); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(MUL_INT_LIT8) - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()) * inst->VRegC_22b()); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(DIV_INT_LIT8) { - bool success = DoIntDivide(shadow_frame, inst->VRegA_22b(), - shadow_frame.GetVReg(inst->VRegB_22b()), inst->VRegC_22b()); + bool success = DoIntDivide(shadow_frame, inst->VRegA_22b(inst_data), + shadow_frame.GetVReg(inst->VRegB_22b()), inst->VRegC_22b()); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(REM_INT_LIT8) { - bool success = DoIntRemainder(shadow_frame, inst->VRegA_22b(), - shadow_frame.GetVReg(inst->VRegB_22b()), inst->VRegC_22b()); + bool success = DoIntRemainder(shadow_frame, inst->VRegA_22b(inst_data), + shadow_frame.GetVReg(inst->VRegB_22b()), inst->VRegC_22b()); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, 2); } HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(AND_INT_LIT8) - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()) & inst->VRegC_22b()); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(OR_INT_LIT8) - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()) | inst->VRegC_22b()); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(XOR_INT_LIT8) - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()) ^ inst->VRegC_22b()); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SHL_INT_LIT8) - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()) << (inst->VRegC_22b() & 0x1f)); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(SHR_INT_LIT8) - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()) >> (inst->VRegC_22b() & 0x1f)); ADVANCE(2); HANDLE_INSTRUCTION_END(); HANDLE_INSTRUCTION_START(USHR_INT_LIT8) - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), static_cast<uint32_t>(shadow_frame.GetVReg(inst->VRegB_22b())) >> (inst->VRegC_22b() & 0x1f)); ADVANCE(2); diff --git a/runtime/interpreter/interpreter_switch_impl.cc b/runtime/interpreter/interpreter_switch_impl.cc index 01a0e4b457..b2e480f3a4 100644 --- a/runtime/interpreter/interpreter_switch_impl.cc +++ b/runtime/interpreter/interpreter_switch_impl.cc @@ -69,6 +69,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } const uint16_t* const insns = code_item->insns_; const Instruction* inst = Instruction::At(insns + dex_pc); + uint16_t inst_data; while (true) { dex_pc = inst->GetDexPc(insns); shadow_frame.SetDexPC(dex_pc); @@ -77,20 +78,21 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C shadow_frame.GetMethod(), dex_pc); } TraceExecution(shadow_frame, inst, dex_pc, mh); - switch (inst->Opcode()) { + inst_data = inst->Fetch16(0); + switch (inst->Opcode(inst_data)) { case Instruction::NOP: PREAMBLE(); inst = inst->Next_1xx(); break; case Instruction::MOVE: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_12x(), - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::MOVE_FROM16: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22x(), + shadow_frame.SetVReg(inst->VRegA_22x(inst_data), shadow_frame.GetVReg(inst->VRegB_22x())); inst = inst->Next_2xx(); break; @@ -102,13 +104,13 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C break; case Instruction::MOVE_WIDE: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_12x(), - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.SetVRegLong(inst->VRegA_12x(inst_data), + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::MOVE_WIDE_FROM16: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_22x(), + shadow_frame.SetVRegLong(inst->VRegA_22x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_22x())); inst = inst->Next_2xx(); break; @@ -120,13 +122,13 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C break; case Instruction::MOVE_OBJECT: PREAMBLE(); - shadow_frame.SetVRegReference(inst->VRegA_12x(), - shadow_frame.GetVRegReference(inst->VRegB_12x())); + shadow_frame.SetVRegReference(inst->VRegA_12x(inst_data), + shadow_frame.GetVRegReference(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::MOVE_OBJECT_FROM16: PREAMBLE(); - shadow_frame.SetVRegReference(inst->VRegA_22x(), + shadow_frame.SetVRegReference(inst->VRegA_22x(inst_data), shadow_frame.GetVRegReference(inst->VRegB_22x())); inst = inst->Next_2xx(); break; @@ -138,24 +140,24 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C break; case Instruction::MOVE_RESULT: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_11x(), result_register.GetI()); + shadow_frame.SetVReg(inst->VRegA_11x(inst_data), result_register.GetI()); inst = inst->Next_1xx(); break; case Instruction::MOVE_RESULT_WIDE: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_11x(), result_register.GetJ()); + shadow_frame.SetVRegLong(inst->VRegA_11x(inst_data), result_register.GetJ()); inst = inst->Next_1xx(); break; case Instruction::MOVE_RESULT_OBJECT: PREAMBLE(); - shadow_frame.SetVRegReference(inst->VRegA_11x(), result_register.GetL()); + shadow_frame.SetVRegReference(inst->VRegA_11x(inst_data), result_register.GetL()); inst = inst->Next_1xx(); break; case Instruction::MOVE_EXCEPTION: { PREAMBLE(); Throwable* exception = self->GetException(NULL); self->ClearException(); - shadow_frame.SetVRegReference(inst->VRegA_11x(), exception); + shadow_frame.SetVRegReference(inst->VRegA_11x(inst_data), exception); inst = inst->Next_1xx(); break; } @@ -196,7 +198,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C PREAMBLE(); JValue result; result.SetJ(0); - result.SetI(shadow_frame.GetVReg(inst->VRegA_11x())); + result.SetI(shadow_frame.GetVReg(inst->VRegA_11x(inst_data))); if (UNLIKELY(self->TestAllFlags())) { CheckSuspend(self); } @@ -210,7 +212,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C case Instruction::RETURN_WIDE: { PREAMBLE(); JValue result; - result.SetJ(shadow_frame.GetVRegLong(inst->VRegA_11x())); + result.SetJ(shadow_frame.GetVRegLong(inst->VRegA_11x(inst_data))); if (UNLIKELY(self->TestAllFlags())) { CheckSuspend(self); } @@ -225,7 +227,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C PREAMBLE(); JValue result; result.SetJ(0); - result.SetL(shadow_frame.GetVRegReference(inst->VRegA_11x())); + result.SetL(shadow_frame.GetVRegReference(inst->VRegA_11x(inst_data))); if (UNLIKELY(self->TestAllFlags())) { CheckSuspend(self); } @@ -238,8 +240,8 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::CONST_4: { PREAMBLE(); - uint4_t dst = inst->VRegA_11n(); - int4_t val = inst->VRegB_11n(); + uint4_t dst = inst->VRegA_11n(inst_data); + int4_t val = inst->VRegB_11n(inst_data); shadow_frame.SetVReg(dst, val); if (val == 0) { shadow_frame.SetVRegReference(dst, NULL); @@ -249,7 +251,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::CONST_16: { PREAMBLE(); - uint8_t dst = inst->VRegA_21s(); + uint8_t dst = inst->VRegA_21s(inst_data); int16_t val = inst->VRegB_21s(); shadow_frame.SetVReg(dst, val); if (val == 0) { @@ -260,7 +262,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::CONST: { PREAMBLE(); - uint8_t dst = inst->VRegA_31i(); + uint8_t dst = inst->VRegA_31i(inst_data); int32_t val = inst->VRegB_31i(); shadow_frame.SetVReg(dst, val); if (val == 0) { @@ -271,7 +273,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::CONST_HIGH16: { PREAMBLE(); - uint8_t dst = inst->VRegA_21h(); + uint8_t dst = inst->VRegA_21h(inst_data); int32_t val = static_cast<int32_t>(inst->VRegB_21h() << 16); shadow_frame.SetVReg(dst, val); if (val == 0) { @@ -282,21 +284,21 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::CONST_WIDE_16: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_21s(), inst->VRegB_21s()); + shadow_frame.SetVRegLong(inst->VRegA_21s(inst_data), inst->VRegB_21s()); inst = inst->Next_2xx(); break; case Instruction::CONST_WIDE_32: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_31i(), inst->VRegB_31i()); + shadow_frame.SetVRegLong(inst->VRegA_31i(inst_data), inst->VRegB_31i()); inst = inst->Next_3xx(); break; case Instruction::CONST_WIDE: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_51l(), inst->VRegB_51l()); + shadow_frame.SetVRegLong(inst->VRegA_51l(inst_data), inst->VRegB_51l()); inst = inst->Next_51l(); break; case Instruction::CONST_WIDE_HIGH16: - shadow_frame.SetVRegLong(inst->VRegA_21h(), + shadow_frame.SetVRegLong(inst->VRegA_21h(inst_data), static_cast<uint64_t>(inst->VRegB_21h()) << 48); inst = inst->Next_2xx(); break; @@ -306,7 +308,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C if (UNLIKELY(s == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { - shadow_frame.SetVRegReference(inst->VRegA_21c(), s); + shadow_frame.SetVRegReference(inst->VRegA_21c(inst_data), s); inst = inst->Next_2xx(); } break; @@ -317,7 +319,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C if (UNLIKELY(s == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { - shadow_frame.SetVRegReference(inst->VRegA_31c(), s); + shadow_frame.SetVRegReference(inst->VRegA_31c(inst_data), s); inst = inst->Next_3xx(); } break; @@ -329,14 +331,14 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C if (UNLIKELY(c == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { - shadow_frame.SetVRegReference(inst->VRegA_21c(), c); + shadow_frame.SetVRegReference(inst->VRegA_21c(inst_data), c); inst = inst->Next_2xx(); } break; } case Instruction::MONITOR_ENTER: { PREAMBLE(); - Object* obj = shadow_frame.GetVRegReference(inst->VRegA_11x()); + Object* obj = shadow_frame.GetVRegReference(inst->VRegA_11x(inst_data)); if (UNLIKELY(obj == NULL)) { ThrowNullPointerExceptionFromDexPC(shadow_frame.GetCurrentLocationForThrow()); HANDLE_PENDING_EXCEPTION(); @@ -348,7 +350,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::MONITOR_EXIT: { PREAMBLE(); - Object* obj = shadow_frame.GetVRegReference(inst->VRegA_11x()); + Object* obj = shadow_frame.GetVRegReference(inst->VRegA_11x(inst_data)); if (UNLIKELY(obj == NULL)) { ThrowNullPointerExceptionFromDexPC(shadow_frame.GetCurrentLocationForThrow()); HANDLE_PENDING_EXCEPTION(); @@ -365,7 +367,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C if (UNLIKELY(c == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { - Object* obj = shadow_frame.GetVRegReference(inst->VRegA_21c()); + Object* obj = shadow_frame.GetVRegReference(inst->VRegA_21c(inst_data)); if (UNLIKELY(obj != NULL && !obj->InstanceOf(c))) { ThrowClassCastException(c, obj->GetClass()); HANDLE_PENDING_EXCEPTION(); @@ -382,20 +384,20 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C if (UNLIKELY(c == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { - Object* obj = shadow_frame.GetVRegReference(inst->VRegB_22c()); - shadow_frame.SetVReg(inst->VRegA_22c(), (obj != NULL && obj->InstanceOf(c)) ? 1 : 0); + Object* obj = shadow_frame.GetVRegReference(inst->VRegB_22c(inst_data)); + shadow_frame.SetVReg(inst->VRegA_22c(inst_data), (obj != NULL && obj->InstanceOf(c)) ? 1 : 0); inst = inst->Next_2xx(); } break; } case Instruction::ARRAY_LENGTH: { PREAMBLE(); - Object* array = shadow_frame.GetVRegReference(inst->VRegB_12x()); + Object* array = shadow_frame.GetVRegReference(inst->VRegB_12x(inst_data)); if (UNLIKELY(array == NULL)) { ThrowNullPointerExceptionFromDexPC(shadow_frame.GetCurrentLocationForThrow()); HANDLE_PENDING_EXCEPTION(); } else { - shadow_frame.SetVReg(inst->VRegA_12x(), array->AsArray()->GetLength()); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), array->AsArray()->GetLength()); inst = inst->Next_1xx(); } break; @@ -407,20 +409,20 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C if (UNLIKELY(obj == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { - shadow_frame.SetVRegReference(inst->VRegA_21c(), obj); + shadow_frame.SetVRegReference(inst->VRegA_21c(inst_data), obj); inst = inst->Next_2xx(); } break; } case Instruction::NEW_ARRAY: { PREAMBLE(); - int32_t length = shadow_frame.GetVReg(inst->VRegB_22c()); + int32_t length = shadow_frame.GetVReg(inst->VRegB_22c(inst_data)); Object* obj = AllocArrayFromCode(inst->VRegC_22c(), shadow_frame.GetMethod(), length, self, do_access_check); if (UNLIKELY(obj == NULL)) { HANDLE_PENDING_EXCEPTION(); } else { - shadow_frame.SetVRegReference(inst->VRegA_22c(), obj); + shadow_frame.SetVRegReference(inst->VRegA_22c(inst_data), obj); inst = inst->Next_2xx(); } break; @@ -441,7 +443,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::FILL_ARRAY_DATA: { PREAMBLE(); - Object* obj = shadow_frame.GetVRegReference(inst->VRegA_31t()); + Object* obj = shadow_frame.GetVRegReference(inst->VRegA_31t(inst_data)); if (UNLIKELY(obj == NULL)) { ThrowNullPointerException(NULL, "null array in FILL_ARRAY_DATA"); HANDLE_PENDING_EXCEPTION(); @@ -467,7 +469,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::THROW: { PREAMBLE(); - Object* exception = shadow_frame.GetVRegReference(inst->VRegA_11x()); + Object* exception = shadow_frame.GetVRegReference(inst->VRegA_11x(inst_data)); if (UNLIKELY(exception == NULL)) { ThrowNullPointerException(NULL, "throw with null exception"); } else { @@ -478,7 +480,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::GOTO: { PREAMBLE(); - int8_t offset = inst->VRegA_10t(); + int8_t offset = inst->VRegA_10t(inst_data); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { CheckSuspend(self); @@ -511,7 +513,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::PACKED_SWITCH: { PREAMBLE(); - int32_t offset = DoPackedSwitch(inst, shadow_frame); + int32_t offset = DoPackedSwitch(inst, shadow_frame, inst_data); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { CheckSuspend(self); @@ -522,7 +524,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::SPARSE_SWITCH: { PREAMBLE(); - int32_t offset = DoSparseSwitch(inst, shadow_frame); + int32_t offset = DoSparseSwitch(inst, shadow_frame, inst_data); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { CheckSuspend(self); @@ -543,7 +545,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } else { result = -1; } - shadow_frame.SetVReg(inst->VRegA_23x(), result); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), result); inst = inst->Next_2xx(); break; } @@ -559,7 +561,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } else { result = 1; } - shadow_frame.SetVReg(inst->VRegA_23x(), result); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), result); inst = inst->Next_2xx(); break; } @@ -575,7 +577,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } else { result = -1; } - shadow_frame.SetVReg(inst->VRegA_23x(), result); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), result); inst = inst->Next_2xx(); break; } @@ -592,7 +594,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } else { result = 1; } - shadow_frame.SetVReg(inst->VRegA_23x(), result); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), result); inst = inst->Next_2xx(); break; } @@ -608,13 +610,13 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } else { result = -1; } - shadow_frame.SetVReg(inst->VRegA_23x(), result); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), result); inst = inst->Next_2xx(); break; } case Instruction::IF_EQ: { PREAMBLE(); - if (shadow_frame.GetVReg(inst->VRegA_22t()) == shadow_frame.GetVReg(inst->VRegB_22t())) { + if (shadow_frame.GetVReg(inst->VRegA_22t(inst_data)) == shadow_frame.GetVReg(inst->VRegB_22t(inst_data))) { int16_t offset = inst->VRegC_22t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -629,7 +631,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::IF_NE: { PREAMBLE(); - if (shadow_frame.GetVReg(inst->VRegA_22t()) != shadow_frame.GetVReg(inst->VRegB_22t())) { + if (shadow_frame.GetVReg(inst->VRegA_22t(inst_data)) != shadow_frame.GetVReg(inst->VRegB_22t(inst_data))) { int16_t offset = inst->VRegC_22t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -644,7 +646,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::IF_LT: { PREAMBLE(); - if (shadow_frame.GetVReg(inst->VRegA_22t()) < shadow_frame.GetVReg(inst->VRegB_22t())) { + if (shadow_frame.GetVReg(inst->VRegA_22t(inst_data)) < shadow_frame.GetVReg(inst->VRegB_22t(inst_data))) { int16_t offset = inst->VRegC_22t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -659,7 +661,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::IF_GE: { PREAMBLE(); - if (shadow_frame.GetVReg(inst->VRegA_22t()) >= shadow_frame.GetVReg(inst->VRegB_22t())) { + if (shadow_frame.GetVReg(inst->VRegA_22t(inst_data)) >= shadow_frame.GetVReg(inst->VRegB_22t(inst_data))) { int16_t offset = inst->VRegC_22t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -674,7 +676,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::IF_GT: { PREAMBLE(); - if (shadow_frame.GetVReg(inst->VRegA_22t()) > shadow_frame.GetVReg(inst->VRegB_22t())) { + if (shadow_frame.GetVReg(inst->VRegA_22t(inst_data)) > shadow_frame.GetVReg(inst->VRegB_22t(inst_data))) { int16_t offset = inst->VRegC_22t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -689,7 +691,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::IF_LE: { PREAMBLE(); - if (shadow_frame.GetVReg(inst->VRegA_22t()) <= shadow_frame.GetVReg(inst->VRegB_22t())) { + if (shadow_frame.GetVReg(inst->VRegA_22t(inst_data)) <= shadow_frame.GetVReg(inst->VRegB_22t(inst_data))) { int16_t offset = inst->VRegC_22t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -704,7 +706,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::IF_EQZ: { PREAMBLE(); - if (shadow_frame.GetVReg(inst->VRegA_21t()) == 0) { + if (shadow_frame.GetVReg(inst->VRegA_21t(inst_data)) == 0) { int16_t offset = inst->VRegB_21t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -719,7 +721,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::IF_NEZ: { PREAMBLE(); - if (shadow_frame.GetVReg(inst->VRegA_21t()) != 0) { + if (shadow_frame.GetVReg(inst->VRegA_21t(inst_data)) != 0) { int16_t offset = inst->VRegB_21t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -734,7 +736,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::IF_LTZ: { PREAMBLE(); - if (shadow_frame.GetVReg(inst->VRegA_21t()) < 0) { + if (shadow_frame.GetVReg(inst->VRegA_21t(inst_data)) < 0) { int16_t offset = inst->VRegB_21t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -749,7 +751,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::IF_GEZ: { PREAMBLE(); - if (shadow_frame.GetVReg(inst->VRegA_21t()) >= 0) { + if (shadow_frame.GetVReg(inst->VRegA_21t(inst_data)) >= 0) { int16_t offset = inst->VRegB_21t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -764,7 +766,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::IF_GTZ: { PREAMBLE(); - if (shadow_frame.GetVReg(inst->VRegA_21t()) > 0) { + if (shadow_frame.GetVReg(inst->VRegA_21t(inst_data)) > 0) { int16_t offset = inst->VRegB_21t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -779,7 +781,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::IF_LEZ: { PREAMBLE(); - if (shadow_frame.GetVReg(inst->VRegA_21t()) <= 0) { + if (shadow_frame.GetVReg(inst->VRegA_21t(inst_data)) <= 0) { int16_t offset = inst->VRegB_21t(); if (IsBackwardBranch(offset)) { if (UNLIKELY(self->TestAllFlags())) { @@ -803,7 +805,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); BooleanArray* array = a->AsBooleanArray(); if (LIKELY(array->IsValidIndex(index))) { - shadow_frame.SetVReg(inst->VRegA_23x(), array->GetData()[index]); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), array->GetData()[index]); inst = inst->Next_2xx(); } else { HANDLE_PENDING_EXCEPTION(); @@ -821,7 +823,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); ByteArray* array = a->AsByteArray(); if (LIKELY(array->IsValidIndex(index))) { - shadow_frame.SetVReg(inst->VRegA_23x(), array->GetData()[index]); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), array->GetData()[index]); inst = inst->Next_2xx(); } else { HANDLE_PENDING_EXCEPTION(); @@ -839,7 +841,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); CharArray* array = a->AsCharArray(); if (LIKELY(array->IsValidIndex(index))) { - shadow_frame.SetVReg(inst->VRegA_23x(), array->GetData()[index]); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), array->GetData()[index]); inst = inst->Next_2xx(); } else { HANDLE_PENDING_EXCEPTION(); @@ -857,7 +859,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); ShortArray* array = a->AsShortArray(); if (LIKELY(array->IsValidIndex(index))) { - shadow_frame.SetVReg(inst->VRegA_23x(), array->GetData()[index]); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), array->GetData()[index]); inst = inst->Next_2xx(); } else { HANDLE_PENDING_EXCEPTION(); @@ -875,7 +877,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); IntArray* array = a->AsIntArray(); if (LIKELY(array->IsValidIndex(index))) { - shadow_frame.SetVReg(inst->VRegA_23x(), array->GetData()[index]); + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), array->GetData()[index]); inst = inst->Next_2xx(); } else { HANDLE_PENDING_EXCEPTION(); @@ -893,7 +895,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); LongArray* array = a->AsLongArray(); if (LIKELY(array->IsValidIndex(index))) { - shadow_frame.SetVRegLong(inst->VRegA_23x(), array->GetData()[index]); + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), array->GetData()[index]); inst = inst->Next_2xx(); } else { HANDLE_PENDING_EXCEPTION(); @@ -911,7 +913,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); ObjectArray<Object>* array = a->AsObjectArray<Object>(); if (LIKELY(array->IsValidIndex(index))) { - shadow_frame.SetVRegReference(inst->VRegA_23x(), array->GetWithoutChecks(index)); + shadow_frame.SetVRegReference(inst->VRegA_23x(inst_data), array->GetWithoutChecks(index)); inst = inst->Next_2xx(); } else { HANDLE_PENDING_EXCEPTION(); @@ -926,7 +928,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C HANDLE_PENDING_EXCEPTION(); break; } - uint8_t val = shadow_frame.GetVReg(inst->VRegA_23x()); + uint8_t val = shadow_frame.GetVReg(inst->VRegA_23x(inst_data)); int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); BooleanArray* array = a->AsBooleanArray(); if (LIKELY(array->IsValidIndex(index))) { @@ -945,7 +947,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C HANDLE_PENDING_EXCEPTION(); break; } - int8_t val = shadow_frame.GetVReg(inst->VRegA_23x()); + int8_t val = shadow_frame.GetVReg(inst->VRegA_23x(inst_data)); int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); ByteArray* array = a->AsByteArray(); if (LIKELY(array->IsValidIndex(index))) { @@ -964,7 +966,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C HANDLE_PENDING_EXCEPTION(); break; } - uint16_t val = shadow_frame.GetVReg(inst->VRegA_23x()); + uint16_t val = shadow_frame.GetVReg(inst->VRegA_23x(inst_data)); int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); CharArray* array = a->AsCharArray(); if (LIKELY(array->IsValidIndex(index))) { @@ -983,7 +985,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C HANDLE_PENDING_EXCEPTION(); break; } - int16_t val = shadow_frame.GetVReg(inst->VRegA_23x()); + int16_t val = shadow_frame.GetVReg(inst->VRegA_23x(inst_data)); int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); ShortArray* array = a->AsShortArray(); if (LIKELY(array->IsValidIndex(index))) { @@ -1002,7 +1004,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C HANDLE_PENDING_EXCEPTION(); break; } - int32_t val = shadow_frame.GetVReg(inst->VRegA_23x()); + int32_t val = shadow_frame.GetVReg(inst->VRegA_23x(inst_data)); int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); IntArray* array = a->AsIntArray(); if (LIKELY(array->IsValidIndex(index))) { @@ -1021,7 +1023,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C HANDLE_PENDING_EXCEPTION(); break; } - int64_t val = shadow_frame.GetVRegLong(inst->VRegA_23x()); + int64_t val = shadow_frame.GetVRegLong(inst->VRegA_23x(inst_data)); int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); LongArray* array = a->AsLongArray(); if (LIKELY(array->IsValidIndex(index))) { @@ -1041,7 +1043,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C break; } int32_t index = shadow_frame.GetVReg(inst->VRegC_23x()); - Object* val = shadow_frame.GetVRegReference(inst->VRegA_23x()); + Object* val = shadow_frame.GetVRegReference(inst->VRegA_23x(inst_data)); ObjectArray<Object>* array = a->AsObjectArray<Object>(); if (LIKELY(array->IsValidIndex(index) && array->CheckAssignable(val))) { array->SetWithoutChecks(index, val); @@ -1053,205 +1055,205 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::IGET_BOOLEAN: { PREAMBLE(); - bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IGET_BYTE: { PREAMBLE(); - bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IGET_CHAR: { PREAMBLE(); - bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IGET_SHORT: { PREAMBLE(); - bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IGET: { PREAMBLE(); - bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IGET_WIDE: { PREAMBLE(); - bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<InstancePrimitiveRead, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IGET_OBJECT: { PREAMBLE(); - bool success = DoFieldGet<InstanceObjectRead, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<InstanceObjectRead, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IGET_QUICK: { PREAMBLE(); - bool success = DoIGetQuick<Primitive::kPrimInt>(self, shadow_frame, inst); + bool success = DoIGetQuick<Primitive::kPrimInt>(shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IGET_WIDE_QUICK: { PREAMBLE(); - bool success = DoIGetQuick<Primitive::kPrimLong>(self, shadow_frame, inst); + bool success = DoIGetQuick<Primitive::kPrimLong>(shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IGET_OBJECT_QUICK: { PREAMBLE(); - bool success = DoIGetQuick<Primitive::kPrimNot>(self, shadow_frame, inst); + bool success = DoIGetQuick<Primitive::kPrimNot>(shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::SGET_BOOLEAN: { PREAMBLE(); - bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::SGET_BYTE: { PREAMBLE(); - bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::SGET_CHAR: { PREAMBLE(); - bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::SGET_SHORT: { PREAMBLE(); - bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::SGET: { PREAMBLE(); - bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::SGET_WIDE: { PREAMBLE(); - bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<StaticPrimitiveRead, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::SGET_OBJECT: { PREAMBLE(); - bool success = DoFieldGet<StaticObjectRead, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldGet<StaticObjectRead, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IPUT_BOOLEAN: { PREAMBLE(); - bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IPUT_BYTE: { PREAMBLE(); - bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IPUT_CHAR: { PREAMBLE(); - bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IPUT_SHORT: { PREAMBLE(); - bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IPUT: { PREAMBLE(); - bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IPUT_WIDE: { PREAMBLE(); - bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<InstancePrimitiveWrite, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IPUT_OBJECT: { PREAMBLE(); - bool success = DoFieldPut<InstanceObjectWrite, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<InstanceObjectWrite, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IPUT_QUICK: { PREAMBLE(); - bool success = DoIPutQuick<Primitive::kPrimInt>(self, shadow_frame, inst); + bool success = DoIPutQuick<Primitive::kPrimInt>(shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IPUT_WIDE_QUICK: { PREAMBLE(); - bool success = DoIPutQuick<Primitive::kPrimLong>(self, shadow_frame, inst); + bool success = DoIPutQuick<Primitive::kPrimLong>(shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::IPUT_OBJECT_QUICK: { PREAMBLE(); - bool success = DoIPutQuick<Primitive::kPrimNot>(self, shadow_frame, inst); + bool success = DoIPutQuick<Primitive::kPrimNot>(shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::SPUT_BOOLEAN: { PREAMBLE(); - bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimBoolean, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::SPUT_BYTE: { PREAMBLE(); - bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimByte, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::SPUT_CHAR: { PREAMBLE(); - bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimChar, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::SPUT_SHORT: { PREAMBLE(); - bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimShort, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::SPUT: { PREAMBLE(); - bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimInt, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::SPUT_WIDE: { PREAMBLE(); - bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<StaticPrimitiveWrite, Primitive::kPrimLong, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::SPUT_OBJECT: { PREAMBLE(); - bool success = DoFieldPut<StaticObjectWrite, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst); + bool success = DoFieldPut<StaticObjectWrite, Primitive::kPrimNot, do_access_check>(self, shadow_frame, inst, inst_data); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } @@ -1329,67 +1331,67 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::NEG_INT: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_12x(), -shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), -shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::NOT_INT: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_12x(), ~shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), ~shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::NEG_LONG: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_12x(), -shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.SetVRegLong(inst->VRegA_12x(inst_data), -shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::NOT_LONG: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_12x(), ~shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.SetVRegLong(inst->VRegA_12x(inst_data), ~shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::NEG_FLOAT: PREAMBLE(); - shadow_frame.SetVRegFloat(inst->VRegA_12x(), -shadow_frame.GetVRegFloat(inst->VRegB_12x())); + shadow_frame.SetVRegFloat(inst->VRegA_12x(inst_data), -shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::NEG_DOUBLE: PREAMBLE(); - shadow_frame.SetVRegDouble(inst->VRegA_12x(), -shadow_frame.GetVRegDouble(inst->VRegB_12x())); + shadow_frame.SetVRegDouble(inst->VRegA_12x(inst_data), -shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::INT_TO_LONG: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_12x(), shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.SetVRegLong(inst->VRegA_12x(inst_data), shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::INT_TO_FLOAT: PREAMBLE(); - shadow_frame.SetVRegFloat(inst->VRegA_12x(), shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.SetVRegFloat(inst->VRegA_12x(inst_data), shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::INT_TO_DOUBLE: PREAMBLE(); - shadow_frame.SetVRegDouble(inst->VRegA_12x(), shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.SetVRegDouble(inst->VRegA_12x(inst_data), shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::LONG_TO_INT: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_12x(), shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::LONG_TO_FLOAT: PREAMBLE(); - shadow_frame.SetVRegFloat(inst->VRegA_12x(), shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.SetVRegFloat(inst->VRegA_12x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::LONG_TO_DOUBLE: PREAMBLE(); - shadow_frame.SetVRegDouble(inst->VRegA_12x(), shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.SetVRegDouble(inst->VRegA_12x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::FLOAT_TO_INT: { PREAMBLE(); - float val = shadow_frame.GetVRegFloat(inst->VRegB_12x()); + float val = shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data)); int32_t result; if (val != val) { result = 0; @@ -1400,13 +1402,13 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } else { result = val; } - shadow_frame.SetVReg(inst->VRegA_12x(), result); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), result); inst = inst->Next_1xx(); break; } case Instruction::FLOAT_TO_LONG: { PREAMBLE(); - float val = shadow_frame.GetVRegFloat(inst->VRegB_12x()); + float val = shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data)); int64_t result; if (val != val) { result = 0; @@ -1417,18 +1419,18 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } else { result = val; } - shadow_frame.SetVRegLong(inst->VRegA_12x(), result); + shadow_frame.SetVRegLong(inst->VRegA_12x(inst_data), result); inst = inst->Next_1xx(); break; } case Instruction::FLOAT_TO_DOUBLE: PREAMBLE(); - shadow_frame.SetVRegDouble(inst->VRegA_12x(), shadow_frame.GetVRegFloat(inst->VRegB_12x())); + shadow_frame.SetVRegDouble(inst->VRegA_12x(inst_data), shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::DOUBLE_TO_INT: { PREAMBLE(); - double val = shadow_frame.GetVRegDouble(inst->VRegB_12x()); + double val = shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data)); int32_t result; if (val != val) { result = 0; @@ -1439,13 +1441,13 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } else { result = val; } - shadow_frame.SetVReg(inst->VRegA_12x(), result); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), result); inst = inst->Next_1xx(); break; } case Instruction::DOUBLE_TO_LONG: { PREAMBLE(); - double val = shadow_frame.GetVRegDouble(inst->VRegB_12x()); + double val = shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data)); int64_t result; if (val != val) { result = 0; @@ -1456,57 +1458,57 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } else { result = val; } - shadow_frame.SetVRegLong(inst->VRegA_12x(), result); + shadow_frame.SetVRegLong(inst->VRegA_12x(inst_data), result); inst = inst->Next_1xx(); break; } case Instruction::DOUBLE_TO_FLOAT: PREAMBLE(); - shadow_frame.SetVRegFloat(inst->VRegA_12x(), shadow_frame.GetVRegDouble(inst->VRegB_12x())); + shadow_frame.SetVRegFloat(inst->VRegA_12x(inst_data), shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; case Instruction::INT_TO_BYTE: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_12x(), - static_cast<int8_t>(shadow_frame.GetVReg(inst->VRegB_12x()))); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), + static_cast<int8_t>(shadow_frame.GetVReg(inst->VRegB_12x(inst_data)))); inst = inst->Next_1xx(); break; case Instruction::INT_TO_CHAR: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_12x(), - static_cast<uint16_t>(shadow_frame.GetVReg(inst->VRegB_12x()))); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), + static_cast<uint16_t>(shadow_frame.GetVReg(inst->VRegB_12x(inst_data)))); inst = inst->Next_1xx(); break; case Instruction::INT_TO_SHORT: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_12x(), - static_cast<int16_t>(shadow_frame.GetVReg(inst->VRegB_12x()))); + shadow_frame.SetVReg(inst->VRegA_12x(inst_data), + static_cast<int16_t>(shadow_frame.GetVReg(inst->VRegB_12x(inst_data)))); inst = inst->Next_1xx(); break; case Instruction::ADD_INT: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) + shadow_frame.GetVReg(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::SUB_INT: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) - shadow_frame.GetVReg(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::MUL_INT: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) * shadow_frame.GetVReg(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::DIV_INT: { PREAMBLE(); - bool success = DoIntDivide(shadow_frame, inst->VRegA_23x(), + bool success = DoIntDivide(shadow_frame, inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()), shadow_frame.GetVReg(inst->VRegC_23x())); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); @@ -1514,7 +1516,7 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::REM_INT: { PREAMBLE(); - bool success = DoIntRemainder(shadow_frame, inst->VRegA_23x(), + bool success = DoIntRemainder(shadow_frame, inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()), shadow_frame.GetVReg(inst->VRegC_23x())); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); @@ -1522,606 +1524,606 @@ static JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::C } case Instruction::SHL_INT: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) << (shadow_frame.GetVReg(inst->VRegC_23x()) & 0x1f)); inst = inst->Next_2xx(); break; case Instruction::SHR_INT: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) >> (shadow_frame.GetVReg(inst->VRegC_23x()) & 0x1f)); inst = inst->Next_2xx(); break; case Instruction::USHR_INT: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), static_cast<uint32_t>(shadow_frame.GetVReg(inst->VRegB_23x())) >> (shadow_frame.GetVReg(inst->VRegC_23x()) & 0x1f)); inst = inst->Next_2xx(); break; case Instruction::AND_INT: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) & shadow_frame.GetVReg(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::OR_INT: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) | shadow_frame.GetVReg(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::XOR_INT: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_23x(), + shadow_frame.SetVReg(inst->VRegA_23x(inst_data), shadow_frame.GetVReg(inst->VRegB_23x()) ^ shadow_frame.GetVReg(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::ADD_LONG: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) + shadow_frame.GetVRegLong(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::SUB_LONG: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) - shadow_frame.GetVRegLong(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::MUL_LONG: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) * shadow_frame.GetVRegLong(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::DIV_LONG: PREAMBLE(); - DoLongDivide(shadow_frame, inst->VRegA_23x(), + DoLongDivide(shadow_frame, inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()), shadow_frame.GetVRegLong(inst->VRegC_23x())); POSSIBLY_HANDLE_PENDING_EXCEPTION(self->IsExceptionPending(), Next_2xx); break; case Instruction::REM_LONG: PREAMBLE(); - DoLongRemainder(shadow_frame, inst->VRegA_23x(), + DoLongRemainder(shadow_frame, inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()), shadow_frame.GetVRegLong(inst->VRegC_23x())); POSSIBLY_HANDLE_PENDING_EXCEPTION(self->IsExceptionPending(), Next_2xx); break; case Instruction::AND_LONG: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) & shadow_frame.GetVRegLong(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::OR_LONG: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) | shadow_frame.GetVRegLong(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::XOR_LONG: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) ^ shadow_frame.GetVRegLong(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::SHL_LONG: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) << (shadow_frame.GetVReg(inst->VRegC_23x()) & 0x3f)); inst = inst->Next_2xx(); break; case Instruction::SHR_LONG: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), shadow_frame.GetVRegLong(inst->VRegB_23x()) >> (shadow_frame.GetVReg(inst->VRegC_23x()) & 0x3f)); inst = inst->Next_2xx(); break; case Instruction::USHR_LONG: PREAMBLE(); - shadow_frame.SetVRegLong(inst->VRegA_23x(), + shadow_frame.SetVRegLong(inst->VRegA_23x(inst_data), static_cast<uint64_t>(shadow_frame.GetVRegLong(inst->VRegB_23x())) >> (shadow_frame.GetVReg(inst->VRegC_23x()) & 0x3f)); inst = inst->Next_2xx(); break; case Instruction::ADD_FLOAT: PREAMBLE(); - shadow_frame.SetVRegFloat(inst->VRegA_23x(), + shadow_frame.SetVRegFloat(inst->VRegA_23x(inst_data), shadow_frame.GetVRegFloat(inst->VRegB_23x()) + shadow_frame.GetVRegFloat(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::SUB_FLOAT: PREAMBLE(); - shadow_frame.SetVRegFloat(inst->VRegA_23x(), + shadow_frame.SetVRegFloat(inst->VRegA_23x(inst_data), shadow_frame.GetVRegFloat(inst->VRegB_23x()) - shadow_frame.GetVRegFloat(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::MUL_FLOAT: PREAMBLE(); - shadow_frame.SetVRegFloat(inst->VRegA_23x(), + shadow_frame.SetVRegFloat(inst->VRegA_23x(inst_data), shadow_frame.GetVRegFloat(inst->VRegB_23x()) * shadow_frame.GetVRegFloat(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::DIV_FLOAT: PREAMBLE(); - shadow_frame.SetVRegFloat(inst->VRegA_23x(), + shadow_frame.SetVRegFloat(inst->VRegA_23x(inst_data), shadow_frame.GetVRegFloat(inst->VRegB_23x()) / shadow_frame.GetVRegFloat(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::REM_FLOAT: PREAMBLE(); - shadow_frame.SetVRegFloat(inst->VRegA_23x(), + shadow_frame.SetVRegFloat(inst->VRegA_23x(inst_data), fmodf(shadow_frame.GetVRegFloat(inst->VRegB_23x()), shadow_frame.GetVRegFloat(inst->VRegC_23x()))); inst = inst->Next_2xx(); break; case Instruction::ADD_DOUBLE: PREAMBLE(); - shadow_frame.SetVRegDouble(inst->VRegA_23x(), + shadow_frame.SetVRegDouble(inst->VRegA_23x(inst_data), shadow_frame.GetVRegDouble(inst->VRegB_23x()) + shadow_frame.GetVRegDouble(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::SUB_DOUBLE: PREAMBLE(); - shadow_frame.SetVRegDouble(inst->VRegA_23x(), + shadow_frame.SetVRegDouble(inst->VRegA_23x(inst_data), shadow_frame.GetVRegDouble(inst->VRegB_23x()) - shadow_frame.GetVRegDouble(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::MUL_DOUBLE: PREAMBLE(); - shadow_frame.SetVRegDouble(inst->VRegA_23x(), + shadow_frame.SetVRegDouble(inst->VRegA_23x(inst_data), shadow_frame.GetVRegDouble(inst->VRegB_23x()) * shadow_frame.GetVRegDouble(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::DIV_DOUBLE: PREAMBLE(); - shadow_frame.SetVRegDouble(inst->VRegA_23x(), + shadow_frame.SetVRegDouble(inst->VRegA_23x(inst_data), shadow_frame.GetVRegDouble(inst->VRegB_23x()) / shadow_frame.GetVRegDouble(inst->VRegC_23x())); inst = inst->Next_2xx(); break; case Instruction::REM_DOUBLE: PREAMBLE(); - shadow_frame.SetVRegDouble(inst->VRegA_23x(), + shadow_frame.SetVRegDouble(inst->VRegA_23x(inst_data), fmod(shadow_frame.GetVRegDouble(inst->VRegB_23x()), shadow_frame.GetVRegDouble(inst->VRegC_23x()))); inst = inst->Next_2xx(); break; case Instruction::ADD_INT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) + - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::SUB_INT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) - - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::MUL_INT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) * - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::DIV_INT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); bool success = DoIntDivide(shadow_frame, vregA, shadow_frame.GetVReg(vregA), - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_1xx); break; } case Instruction::REM_INT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); bool success = DoIntRemainder(shadow_frame, vregA, shadow_frame.GetVReg(vregA), - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_1xx); break; } case Instruction::SHL_INT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) << - (shadow_frame.GetVReg(inst->VRegB_12x()) & 0x1f)); + (shadow_frame.GetVReg(inst->VRegB_12x(inst_data)) & 0x1f)); inst = inst->Next_1xx(); break; } case Instruction::SHR_INT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) >> - (shadow_frame.GetVReg(inst->VRegB_12x()) & 0x1f)); + (shadow_frame.GetVReg(inst->VRegB_12x(inst_data)) & 0x1f)); inst = inst->Next_1xx(); break; } case Instruction::USHR_INT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, static_cast<uint32_t>(shadow_frame.GetVReg(vregA)) >> - (shadow_frame.GetVReg(inst->VRegB_12x()) & 0x1f)); + (shadow_frame.GetVReg(inst->VRegB_12x(inst_data)) & 0x1f)); inst = inst->Next_1xx(); break; } case Instruction::AND_INT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) & - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::OR_INT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) | - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::XOR_INT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVReg(vregA, shadow_frame.GetVReg(vregA) ^ - shadow_frame.GetVReg(inst->VRegB_12x())); + shadow_frame.GetVReg(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::ADD_LONG_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) + - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::SUB_LONG_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) - - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::MUL_LONG_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) * - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::DIV_LONG_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); DoLongDivide(shadow_frame, vregA, shadow_frame.GetVRegLong(vregA), - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); POSSIBLY_HANDLE_PENDING_EXCEPTION(self->IsExceptionPending(), Next_1xx); break; } case Instruction::REM_LONG_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); DoLongRemainder(shadow_frame, vregA, shadow_frame.GetVRegLong(vregA), - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); POSSIBLY_HANDLE_PENDING_EXCEPTION(self->IsExceptionPending(), Next_1xx); break; } case Instruction::AND_LONG_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) & - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::OR_LONG_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) | - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::XOR_LONG_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) ^ - shadow_frame.GetVRegLong(inst->VRegB_12x())); + shadow_frame.GetVRegLong(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::SHL_LONG_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) << - (shadow_frame.GetVReg(inst->VRegB_12x()) & 0x3f)); + (shadow_frame.GetVReg(inst->VRegB_12x(inst_data)) & 0x3f)); inst = inst->Next_1xx(); break; } case Instruction::SHR_LONG_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, shadow_frame.GetVRegLong(vregA) >> - (shadow_frame.GetVReg(inst->VRegB_12x()) & 0x3f)); + (shadow_frame.GetVReg(inst->VRegB_12x(inst_data)) & 0x3f)); inst = inst->Next_1xx(); break; } case Instruction::USHR_LONG_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegLong(vregA, static_cast<uint64_t>(shadow_frame.GetVRegLong(vregA)) >> - (shadow_frame.GetVReg(inst->VRegB_12x()) & 0x3f)); + (shadow_frame.GetVReg(inst->VRegB_12x(inst_data)) & 0x3f)); inst = inst->Next_1xx(); break; } case Instruction::ADD_FLOAT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegFloat(vregA, shadow_frame.GetVRegFloat(vregA) + - shadow_frame.GetVRegFloat(inst->VRegB_12x())); + shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::SUB_FLOAT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegFloat(vregA, shadow_frame.GetVRegFloat(vregA) - - shadow_frame.GetVRegFloat(inst->VRegB_12x())); + shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::MUL_FLOAT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegFloat(vregA, shadow_frame.GetVRegFloat(vregA) * - shadow_frame.GetVRegFloat(inst->VRegB_12x())); + shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::DIV_FLOAT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegFloat(vregA, shadow_frame.GetVRegFloat(vregA) / - shadow_frame.GetVRegFloat(inst->VRegB_12x())); + shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::REM_FLOAT_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegFloat(vregA, fmodf(shadow_frame.GetVRegFloat(vregA), - shadow_frame.GetVRegFloat(inst->VRegB_12x()))); + shadow_frame.GetVRegFloat(inst->VRegB_12x(inst_data)))); inst = inst->Next_1xx(); break; } case Instruction::ADD_DOUBLE_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegDouble(vregA, shadow_frame.GetVRegDouble(vregA) + - shadow_frame.GetVRegDouble(inst->VRegB_12x())); + shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::SUB_DOUBLE_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegDouble(vregA, shadow_frame.GetVRegDouble(vregA) - - shadow_frame.GetVRegDouble(inst->VRegB_12x())); + shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::MUL_DOUBLE_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegDouble(vregA, shadow_frame.GetVRegDouble(vregA) * - shadow_frame.GetVRegDouble(inst->VRegB_12x())); + shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::DIV_DOUBLE_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegDouble(vregA, shadow_frame.GetVRegDouble(vregA) / - shadow_frame.GetVRegDouble(inst->VRegB_12x())); + shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data))); inst = inst->Next_1xx(); break; } case Instruction::REM_DOUBLE_2ADDR: { PREAMBLE(); - uint4_t vregA = inst->VRegA_12x(); + uint4_t vregA = inst->VRegA_12x(inst_data); shadow_frame.SetVRegDouble(vregA, fmod(shadow_frame.GetVRegDouble(vregA), - shadow_frame.GetVRegDouble(inst->VRegB_12x()))); + shadow_frame.GetVRegDouble(inst->VRegB_12x(inst_data)))); inst = inst->Next_1xx(); break; } case Instruction::ADD_INT_LIT16: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22s(), - shadow_frame.GetVReg(inst->VRegB_22s()) + + shadow_frame.SetVReg(inst->VRegA_22s(inst_data), + shadow_frame.GetVReg(inst->VRegB_22s(inst_data)) + inst->VRegC_22s()); inst = inst->Next_2xx(); break; case Instruction::RSUB_INT: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22s(), + shadow_frame.SetVReg(inst->VRegA_22s(inst_data), inst->VRegC_22s() - - shadow_frame.GetVReg(inst->VRegB_22s())); + shadow_frame.GetVReg(inst->VRegB_22s(inst_data))); inst = inst->Next_2xx(); break; case Instruction::MUL_INT_LIT16: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22s(), - shadow_frame.GetVReg(inst->VRegB_22s()) * + shadow_frame.SetVReg(inst->VRegA_22s(inst_data), + shadow_frame.GetVReg(inst->VRegB_22s(inst_data)) * inst->VRegC_22s()); inst = inst->Next_2xx(); break; case Instruction::DIV_INT_LIT16: { PREAMBLE(); - bool success = DoIntDivide(shadow_frame, inst->VRegA_22s(), - shadow_frame.GetVReg(inst->VRegB_22s()), inst->VRegC_22s()); + bool success = DoIntDivide(shadow_frame, inst->VRegA_22s(inst_data), + shadow_frame.GetVReg(inst->VRegB_22s(inst_data)), inst->VRegC_22s()); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::REM_INT_LIT16: { PREAMBLE(); - bool success = DoIntRemainder(shadow_frame, inst->VRegA_22s(), - shadow_frame.GetVReg(inst->VRegB_22s()), inst->VRegC_22s()); + bool success = DoIntRemainder(shadow_frame, inst->VRegA_22s(inst_data), + shadow_frame.GetVReg(inst->VRegB_22s(inst_data)), inst->VRegC_22s()); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::AND_INT_LIT16: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22s(), - shadow_frame.GetVReg(inst->VRegB_22s()) & + shadow_frame.SetVReg(inst->VRegA_22s(inst_data), + shadow_frame.GetVReg(inst->VRegB_22s(inst_data)) & inst->VRegC_22s()); inst = inst->Next_2xx(); break; case Instruction::OR_INT_LIT16: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22s(), - shadow_frame.GetVReg(inst->VRegB_22s()) | + shadow_frame.SetVReg(inst->VRegA_22s(inst_data), + shadow_frame.GetVReg(inst->VRegB_22s(inst_data)) | inst->VRegC_22s()); inst = inst->Next_2xx(); break; case Instruction::XOR_INT_LIT16: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22s(), - shadow_frame.GetVReg(inst->VRegB_22s()) ^ + shadow_frame.SetVReg(inst->VRegA_22s(inst_data), + shadow_frame.GetVReg(inst->VRegB_22s(inst_data)) ^ inst->VRegC_22s()); inst = inst->Next_2xx(); break; case Instruction::ADD_INT_LIT8: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()) + inst->VRegC_22b()); inst = inst->Next_2xx(); break; case Instruction::RSUB_INT_LIT8: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), inst->VRegC_22b() - shadow_frame.GetVReg(inst->VRegB_22b())); inst = inst->Next_2xx(); break; case Instruction::MUL_INT_LIT8: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()) * inst->VRegC_22b()); inst = inst->Next_2xx(); break; case Instruction::DIV_INT_LIT8: { PREAMBLE(); - bool success = DoIntDivide(shadow_frame, inst->VRegA_22b(), + bool success = DoIntDivide(shadow_frame, inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()), inst->VRegC_22b()); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::REM_INT_LIT8: { PREAMBLE(); - bool success = DoIntRemainder(shadow_frame, inst->VRegA_22b(), + bool success = DoIntRemainder(shadow_frame, inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()), inst->VRegC_22b()); POSSIBLY_HANDLE_PENDING_EXCEPTION(!success, Next_2xx); break; } case Instruction::AND_INT_LIT8: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()) & inst->VRegC_22b()); inst = inst->Next_2xx(); break; case Instruction::OR_INT_LIT8: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()) | inst->VRegC_22b()); inst = inst->Next_2xx(); break; case Instruction::XOR_INT_LIT8: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()) ^ inst->VRegC_22b()); inst = inst->Next_2xx(); break; case Instruction::SHL_INT_LIT8: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()) << (inst->VRegC_22b() & 0x1f)); inst = inst->Next_2xx(); break; case Instruction::SHR_INT_LIT8: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), shadow_frame.GetVReg(inst->VRegB_22b()) >> (inst->VRegC_22b() & 0x1f)); inst = inst->Next_2xx(); break; case Instruction::USHR_INT_LIT8: PREAMBLE(); - shadow_frame.SetVReg(inst->VRegA_22b(), + shadow_frame.SetVReg(inst->VRegA_22b(inst_data), static_cast<uint32_t>(shadow_frame.GetVReg(inst->VRegB_22b())) >> (inst->VRegC_22b() & 0x1f)); inst = inst->Next_2xx(); |