diff options
| author | 2016-08-02 08:09:35 +0000 | |
|---|---|---|
| committer | 2016-08-02 08:09:35 +0000 | |
| commit | 3d6094531e3790b25c43e59fd6cd0b6b99d3447c (patch) | |
| tree | 22f88d55fda3f363590bfc04d225840e7f4480fe /runtime/dex_instruction.cc | |
| parent | ba65cc4a71273904294245cb37ce70e5bce797e3 (diff) | |
| parent | bd48b3490a35480ad54586a4d8c7529e0a9a8c84 (diff) | |
Merge "dex_instruction: remove unused parameter from instruction definitions."
Diffstat (limited to 'runtime/dex_instruction.cc')
| -rw-r--r-- | runtime/dex_instruction.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/dex_instruction.cc b/runtime/dex_instruction.cc index 300e618c82..d04087aca3 100644 --- a/runtime/dex_instruction.cc +++ b/runtime/dex_instruction.cc @@ -28,7 +28,7 @@ namespace art { const char* const Instruction::kInstructionNames[] = { -#define INSTRUCTION_NAME(o, c, pname, f, r, i, a, v) pname, +#define INSTRUCTION_NAME(o, c, pname, f, i, a, v) pname, #include "dex_instruction_list.h" DEX_INSTRUCTION_LIST(INSTRUCTION_NAME) #undef DEX_INSTRUCTION_LIST @@ -36,7 +36,7 @@ const char* const Instruction::kInstructionNames[] = { }; Instruction::Format const Instruction::kInstructionFormats[] = { -#define INSTRUCTION_FORMAT(o, c, p, format, r, i, a, v) format, +#define INSTRUCTION_FORMAT(o, c, p, format, i, a, v) format, #include "dex_instruction_list.h" DEX_INSTRUCTION_LIST(INSTRUCTION_FORMAT) #undef DEX_INSTRUCTION_LIST @@ -44,7 +44,7 @@ Instruction::Format const Instruction::kInstructionFormats[] = { }; Instruction::IndexType const Instruction::kInstructionIndexTypes[] = { -#define INSTRUCTION_INDEX_TYPE(o, c, p, f, r, index, a, v) index, +#define INSTRUCTION_INDEX_TYPE(o, c, p, f, index, a, v) index, #include "dex_instruction_list.h" DEX_INSTRUCTION_LIST(INSTRUCTION_INDEX_TYPE) #undef DEX_INSTRUCTION_LIST @@ -52,7 +52,7 @@ Instruction::IndexType const Instruction::kInstructionIndexTypes[] = { }; int const Instruction::kInstructionFlags[] = { -#define INSTRUCTION_FLAGS(o, c, p, f, r, i, flags, v) flags, +#define INSTRUCTION_FLAGS(o, c, p, f, i, flags, v) flags, #include "dex_instruction_list.h" DEX_INSTRUCTION_LIST(INSTRUCTION_FLAGS) #undef DEX_INSTRUCTION_LIST @@ -60,7 +60,7 @@ int const Instruction::kInstructionFlags[] = { }; int const Instruction::kInstructionVerifyFlags[] = { -#define INSTRUCTION_VERIFY_FLAGS(o, c, p, f, r, i, a, vflags) vflags, +#define INSTRUCTION_VERIFY_FLAGS(o, c, p, f, i, a, vflags) vflags, #include "dex_instruction_list.h" DEX_INSTRUCTION_LIST(INSTRUCTION_VERIFY_FLAGS) #undef DEX_INSTRUCTION_LIST @@ -68,7 +68,7 @@ int const Instruction::kInstructionVerifyFlags[] = { }; int const Instruction::kInstructionSizeInCodeUnits[] = { -#define INSTRUCTION_SIZE(opcode, c, p, format, r, i, a, v) \ +#define INSTRUCTION_SIZE(opcode, c, p, format, i, a, v) \ (((opcode) == NOP) ? -1 : \ (((format) >= k10x) && ((format) <= k10t)) ? 1 : \ (((format) >= k20t) && ((format) <= k25x)) ? 2 : \ |