diff options
| author | 2018-11-15 06:00:19 +0000 | |
|---|---|---|
| committer | 2018-11-15 06:00:19 +0000 | |
| commit | e923524e86b579846092487cc70d5e639d448603 (patch) | |
| tree | 3128336a1b879758dd656104411b26d6910daaac | |
| parent | 0bcbe9399dfc546db5c81b13979afc85da19d025 (diff) | |
| parent | ec3adef6e4a5c71d16d4e9d00ef810759ea7da15 (diff) | |
Merge "libdexfile: rename kVerifyNone to kVerifyNothing"
| -rw-r--r-- | libdexfile/dex/dex_instruction.h | 2 | ||||
| -rw-r--r-- | libdexfile/dex/dex_instruction_list.h | 6 | ||||
| -rw-r--r-- | libdexfile/dex/dex_instruction_test.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libdexfile/dex/dex_instruction.h b/libdexfile/dex/dex_instruction.h index ad8a1842fc..4b389043d7 100644 --- a/libdexfile/dex/dex_instruction.h +++ b/libdexfile/dex/dex_instruction.h @@ -173,7 +173,7 @@ class Instruction { }; enum VerifyFlag : uint32_t { - kVerifyNone = 0x0000000, + kVerifyNothing = 0x0000000, kVerifyRegA = 0x0000001, kVerifyRegAWide = 0x0000002, kVerifyRegB = 0x0000004, diff --git a/libdexfile/dex/dex_instruction_list.h b/libdexfile/dex/dex_instruction_list.h index 9f0aba421a..b9540a6e6f 100644 --- a/libdexfile/dex/dex_instruction_list.h +++ b/libdexfile/dex/dex_instruction_list.h @@ -19,7 +19,7 @@ // V(opcode, instruction_code, name, format, index, flags, extended_flags, verifier_flags); #define DEX_INSTRUCTION_LIST(V) \ - V(0x00, NOP, "nop", k10x, kIndexNone, kContinue, 0, kVerifyNone) \ + V(0x00, NOP, "nop", k10x, kIndexNone, kContinue, 0, kVerifyNothing) \ V(0x01, MOVE, "move", k12x, kIndexNone, kContinue, 0, kVerifyRegA | kVerifyRegB) \ V(0x02, MOVE_FROM16, "move/from16", k22x, kIndexNone, kContinue, 0, kVerifyRegA | kVerifyRegB) \ V(0x03, MOVE_16, "move/16", k32x, kIndexNone, kContinue, 0, kVerifyRegA | kVerifyRegB) \ @@ -33,7 +33,7 @@ V(0x0B, MOVE_RESULT_WIDE, "move-result-wide", k11x, kIndexNone, kContinue, 0, kVerifyRegAWide) \ V(0x0C, MOVE_RESULT_OBJECT, "move-result-object", k11x, kIndexNone, kContinue, 0, kVerifyRegA) \ V(0x0D, MOVE_EXCEPTION, "move-exception", k11x, kIndexNone, kContinue, 0, kVerifyRegA) \ - V(0x0E, RETURN_VOID, "return-void", k10x, kIndexNone, kReturn, 0, kVerifyNone) \ + V(0x0E, RETURN_VOID, "return-void", k10x, kIndexNone, kReturn, 0, kVerifyNothing) \ V(0x0F, RETURN, "return", k11x, kIndexNone, kReturn, 0, kVerifyRegA) \ V(0x10, RETURN_WIDE, "return-wide", k11x, kIndexNone, kReturn, 0, kVerifyRegAWide) \ V(0x11, RETURN_OBJECT, "return-object", k11x, kIndexNone, kReturn, 0, kVerifyRegA) \ @@ -134,7 +134,7 @@ V(0x70, INVOKE_DIRECT, "invoke-direct", k35c, kIndexMethodRef, kContinue | kThrow | kInvoke, 0, kVerifyRegBMethod | kVerifyVarArgNonZero) \ V(0x71, INVOKE_STATIC, "invoke-static", k35c, kIndexMethodRef, kContinue | kThrow | kInvoke, 0, kVerifyRegBMethod | kVerifyVarArg) \ V(0x72, INVOKE_INTERFACE, "invoke-interface", k35c, kIndexMethodRef, kContinue | kThrow | kInvoke, 0, kVerifyRegBMethod | kVerifyVarArgNonZero) \ - V(0x73, RETURN_VOID_NO_BARRIER, "return-void-no-barrier", k10x, kIndexNone, kReturn, 0, kVerifyNone) \ + V(0x73, RETURN_VOID_NO_BARRIER, "return-void-no-barrier", k10x, kIndexNone, kReturn, 0, kVerifyNothing) \ V(0x74, INVOKE_VIRTUAL_RANGE, "invoke-virtual/range", k3rc, kIndexMethodRef, kContinue | kThrow | kInvoke, 0, kVerifyRegBMethod | kVerifyVarArgRangeNonZero) \ V(0x75, INVOKE_SUPER_RANGE, "invoke-super/range", k3rc, kIndexMethodRef, kContinue | kThrow | kInvoke, 0, kVerifyRegBMethod | kVerifyVarArgRangeNonZero) \ V(0x76, INVOKE_DIRECT_RANGE, "invoke-direct/range", k3rc, kIndexMethodRef, kContinue | kThrow | kInvoke, 0, kVerifyRegBMethod | kVerifyVarArgRangeNonZero) \ diff --git a/libdexfile/dex/dex_instruction_test.cc b/libdexfile/dex/dex_instruction_test.cc index 02400f4a14..3f79abf1d8 100644 --- a/libdexfile/dex/dex_instruction_test.cc +++ b/libdexfile/dex/dex_instruction_test.cc @@ -26,7 +26,7 @@ TEST(StaticGetters, PropertiesOfNopTest) { EXPECT_EQ(Instruction::k10x, Instruction::FormatOf(nop)); EXPECT_EQ(Instruction::kIndexNone, Instruction::IndexTypeOf(nop)); EXPECT_EQ(Instruction::kContinue, Instruction::FlagsOf(nop)); - EXPECT_EQ(Instruction::kVerifyNone, Instruction::VerifyFlagsOf(nop)); + EXPECT_EQ(Instruction::kVerifyNothing, Instruction::VerifyFlagsOf(nop)); } static void Build45cc(uint8_t num_args, uint16_t method_idx, uint16_t proto_idx, |