From 0f78b15cd7f51196166019f90cc067ea3ba1ac65 Mon Sep 17 00:00:00 2001 From: "JesusFreke@JesusFreke.com" Date: Fri, 1 Jan 2010 22:36:09 +0000 Subject: [PATCH] Change the enum name of the execute-inline instruction from INVOKE_EXECUTE_INLINE to EXECUTE_INLINE git-svn-id: https://smali.googlecode.com/svn/trunk@546 55b6fa8a-2a1e-11de-a435-ffa8d773f76a --- dexlib/src/main/java/org/jf/dexlib/Code/Opcode.java | 2 +- dexlib/src/main/java/org/jf/dexlib/Util/DeodexUtil.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Opcode.java b/dexlib/src/main/java/org/jf/dexlib/Code/Opcode.java index 0bd92f62..8d456057 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Opcode.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Opcode.java @@ -254,7 +254,7 @@ public enum Opcode USHR_INT_LIT8((byte)0xe2, "ushr-int/lit8", ReferenceType.none, Format.Format22b), - INVOKE_EXECUTE_INLINE((byte)0xee, "execute-inline", ReferenceType.none, Format.Format35ms, true), + EXECUTE_INLINE((byte)0xee, "execute-inline", ReferenceType.none, Format.Format35ms, true), EXECUTE_INLINE_RANGE((byte)0xef, "execute-inline/range", ReferenceType.none, Format.Format3rms, true), INVOKE_DIRECT_EMPTY((byte)0xf0, "invoke-direct-empty", ReferenceType.method, Format.Format35s, true), IGET_QUICK((byte)0xf2, "iget-quick", ReferenceType.none, Format.Format22cs, true), diff --git a/dexlib/src/main/java/org/jf/dexlib/Util/DeodexUtil.java b/dexlib/src/main/java/org/jf/dexlib/Util/DeodexUtil.java index 2747fb94..2172c639 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Util/DeodexUtil.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/DeodexUtil.java @@ -119,7 +119,7 @@ public class DeodexUtil { instructionThrowTable.set(Opcode.DIV_INT_LIT8.value & 0xFF); instructionThrowTable.set(Opcode.REM_INT_LIT8.value & 0xFF); instructionThrowTable.set(Opcode.THROW.value & 0xFF); - instructionThrowTable.set(Opcode.INVOKE_EXECUTE_INLINE.value & 0xFF); + instructionThrowTable.set(Opcode.EXECUTE_INLINE.value & 0xFF); instructionThrowTable.set(Opcode.EXECUTE_INLINE_RANGE.value & 0xFF); instructionThrowTable.set(Opcode.IGET_QUICK.value & 0xFF); instructionThrowTable.set(Opcode.IGET_WIDE_QUICK.value & 0xFF); @@ -239,7 +239,7 @@ public class DeodexUtil { private boolean deodexInstruction(insn i) { switch (i.instruction.opcode) { - case INVOKE_EXECUTE_INLINE: + case EXECUTE_INLINE: { int inlineMethodIndex = ((Instruction35ms)i.instruction).getMethodIndex(); Deodexerant.InlineMethod inlineMethod =