summaryrefslogtreecommitdiffstats
path: root/runtime/dex_instruction.cc
diff options
context:
space:
mode:
authorAart Bik <ajcbik@google.com>2015-06-29 11:03:55 -0700
committerAart Bik <ajcbik@google.com>2015-06-29 14:26:02 -0700
commitb1f3753d890e17b7b0d4e2779e8dfd8aa5bf0e2d (patch)
tree160176ad18b64418b225b7031aa2bfbd1fd8320a /runtime/dex_instruction.cc
parent806af26f1a8f107cb4f4430ceec8dc9f360f3795 (diff)
downloadart-b1f3753d890e17b7b0d4e2779e8dfd8aa5bf0e2d.tar.gz
art-b1f3753d890e17b7b0d4e2779e8dfd8aa5bf0e2d.tar.bz2
art-b1f3753d890e17b7b0d4e2779e8dfd8aa5bf0e2d.zip
Added index type of dex byte instructions.
Rationale: The information was already in the instruction_list but not exposed as enum through a getter. This CL adds that ability. This information is needed by the upcoming Art-based dexdump. NOTE: Added "Index" to the enum constants naming convention. NOTE: Fixed few incorrect quickened entries in instruction_list. Bug: 17442393 Change-Id: Ica18ae43135f78f29e9832f5a101d497e54724cf
Diffstat (limited to 'runtime/dex_instruction.cc')
-rw-r--r--runtime/dex_instruction.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/runtime/dex_instruction.cc b/runtime/dex_instruction.cc
index 537fa154b1..fc4df1475a 100644
--- a/runtime/dex_instruction.cc
+++ b/runtime/dex_instruction.cc
@@ -43,6 +43,14 @@ Instruction::Format const Instruction::kInstructionFormats[] = {
#undef INSTRUCTION_FORMAT
};
+Instruction::IndexType const Instruction::kInstructionIndexTypes[] = {
+#define INSTRUCTION_INDEX_TYPE(o, c, p, f, r, index, a, v) index,
+#include "dex_instruction_list.h"
+ DEX_INSTRUCTION_LIST(INSTRUCTION_INDEX_TYPE)
+#undef DEX_INSTRUCTION_LIST
+#undef INSTRUCTION_FLAGS
+};
+
int const Instruction::kInstructionFlags[] = {
#define INSTRUCTION_FLAGS(o, c, p, f, r, i, flags, v) flags,
#include "dex_instruction_list.h"