diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-03-19 12:43:20 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-03-19 20:00:50 -0700 |
| commit | d7cbf8a6629942e7bd315ffae7e1c77b082f3e11 (patch) | |
| tree | fc8c3371ed4ddac96bbe90a2f94ef5fb5c5472ee /tools | |
| parent | f5988cf0c47ff935bb19c89ed0398be5fbe44bb6 (diff) | |
| download | art-d7cbf8a6629942e7bd315ffae7e1c77b082f3e11.zip art-d7cbf8a6629942e7bd315ffae7e1c77b082f3e11.tar.gz art-d7cbf8a6629942e7bd315ffae7e1c77b082f3e11.tar.bz2 | |
Change RETURN_VOID_BARRIER to RETURN_VOID_NO_BARRIER
We want to default to having a barrier for the case where we don't
dex to dex.
Bug: 19762303
Change-Id: I60348d89eaf0b9e1e480298afcecbb5f52e8661b
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dexfuzz/src/dexfuzz/rawdex/Instruction.java | 2 | ||||
| -rw-r--r-- | tools/dexfuzz/src/dexfuzz/rawdex/Opcode.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/dexfuzz/src/dexfuzz/rawdex/Instruction.java b/tools/dexfuzz/src/dexfuzz/rawdex/Instruction.java index 2dda78f..adafa62 100644 --- a/tools/dexfuzz/src/dexfuzz/rawdex/Instruction.java +++ b/tools/dexfuzz/src/dexfuzz/rawdex/Instruction.java @@ -434,7 +434,7 @@ public class Instruction implements RawDexObject { addOpcodeInfo(Opcode.INVOKE_DIRECT, "invoke-direct", 0x70, new Format35c()); addOpcodeInfo(Opcode.INVOKE_STATIC, "invoke-static", 0x71, new Format35c()); addOpcodeInfo(Opcode.INVOKE_INTERFACE, "invoke-interface", 0x72, new Format35c()); - addOpcodeInfo(Opcode.RETURN_VOID_BARRIER, "return-void-barrier", 0x73, new Format10x()); + addOpcodeInfo(Opcode.RETURN_VOID_NO_BARRIER, "return-void-no-barrier", 0x73, new Format10x()); addOpcodeInfo(Opcode.INVOKE_VIRTUAL_RANGE, "invoke-virtual/range", 0x74, new Format3rc()); addOpcodeInfo(Opcode.INVOKE_SUPER_RANGE, "invoke-super/range", 0x75, new Format3rc()); addOpcodeInfo(Opcode.INVOKE_DIRECT_RANGE, "invoke-direct/range", 0x76, new Format3rc()); diff --git a/tools/dexfuzz/src/dexfuzz/rawdex/Opcode.java b/tools/dexfuzz/src/dexfuzz/rawdex/Opcode.java index 312e855..f7c7788 100644 --- a/tools/dexfuzz/src/dexfuzz/rawdex/Opcode.java +++ b/tools/dexfuzz/src/dexfuzz/rawdex/Opcode.java @@ -132,7 +132,7 @@ public enum Opcode { INVOKE_DIRECT, INVOKE_STATIC, INVOKE_INTERFACE, - RETURN_VOID_BARRIER, + RETURN_VOID_NO_BARRIER, INVOKE_VIRTUAL_RANGE, INVOKE_SUPER_RANGE, INVOKE_DIRECT_RANGE, @@ -277,4 +277,4 @@ public enum Opcode { public static boolean isBetween(Opcode opcode, Opcode opcode1, Opcode opcode2) { return (opcode.ordinal() >= opcode1.ordinal() && opcode.ordinal() <= opcode2.ordinal()); } -}
\ No newline at end of file +} |