commit e1d2dce0cda2d223ac9c4e48958b9d5810e3e987
author Nicolas Geoffray <ngeoffray@google.com> Mon Sep 21 10:06:31 2020 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Wed Sep 23 08:12:33 2020 +0000
tree 3b9a664710cad714ad2ee1f9fec60908408aa23f
parent 9dfb1a9d642b9eb627895ef3364736fc839b4fe4

Add support for compact dex files in nterp.

Test: test.py
Bug: 112676029
Change-Id: I604af166dab0647037bf675cabc6ce433053a83c

tools/cpp-define-generator/code_item.def

diff --git a/tools/cpp-define-generator/code_item.def b/tools/cpp-define-generator/code_item.def
index 01b0e85..24d62a8 100644
--- a/tools/cpp-define-generator/code_item.def
+++ b/tools/cpp-define-generator/code_item.def
@@ -16,6 +16,7 @@
 
 #if ASM_DEFINE_INCLUDE_DEPENDENCIES
 #include "dex/standard_dex_file.h"
+#include "dex/compact_dex_file.h"
 #endif
 
 ASM_DEFINE(CODE_ITEM_REGISTERS_SIZE_OFFSET,
@@ -26,3 +27,37 @@
            art::StandardDexFile::CodeItem::OutsSizeOffset())
 ASM_DEFINE(CODE_ITEM_INSNS_OFFSET,
            art::StandardDexFile::CodeItem::InsnsOffset())
+
+ASM_DEFINE(COMPACT_CODE_ITEM_FIELDS_OFFSET,
+           art::CompactDexFile::CodeItem::FieldsOffset())
+ASM_DEFINE(COMPACT_CODE_ITEM_FLAGS_OFFSET,
+           art::CompactDexFile::CodeItem::InsnsCountAndFlagsOffset())
+ASM_DEFINE(COMPACT_CODE_ITEM_INSNS_OFFSET,
+           art::CompactDexFile::CodeItem::InsnsOffset())
+
+ASM_DEFINE(COMPACT_CODE_ITEM_REGISTERS_INS_OUTS_FLAGS,
+           art::CompactDexFile::CodeItem::kFlagPreHeaderRegistersSize |
+           art::CompactDexFile::CodeItem::kFlagPreHeaderInsSize |
+           art::CompactDexFile::CodeItem::kFlagPreHeaderOutsSize)
+ASM_DEFINE(COMPACT_CODE_ITEM_REGISTERS_FLAG,
+           art::CompactDexFile::CodeItem::kFlagPreHeaderRegistersSize)
+ASM_DEFINE(COMPACT_CODE_ITEM_INS_FLAG,
+           art::CompactDexFile::CodeItem::kFlagPreHeaderInsSize)
+ASM_DEFINE(COMPACT_CODE_ITEM_OUTS_FLAG,
+           art::CompactDexFile::CodeItem::kFlagPreHeaderOutsSize)
+ASM_DEFINE(COMPACT_CODE_ITEM_INSNS_FLAG,
+           art::CompactDexFile::CodeItem::kFlagPreHeaderInsnsSize)
+ASM_DEFINE(COMPACT_CODE_ITEM_REGISTERS_BIT,
+           art::CompactDexFile::CodeItem::kBitPreHeaderRegistersSize)
+ASM_DEFINE(COMPACT_CODE_ITEM_INS_BIT,
+           art::CompactDexFile::CodeItem::kBitPreHeaderInsSize)
+ASM_DEFINE(COMPACT_CODE_ITEM_OUTS_BIT,
+           art::CompactDexFile::CodeItem::kBitPreHeaderOutsSize)
+ASM_DEFINE(COMPACT_CODE_ITEM_INSNS_BIT,
+           art::CompactDexFile::CodeItem::kBitPreHeaderInsnsSize)
+ASM_DEFINE(COMPACT_CODE_ITEM_REGISTERS_SIZE_SHIFT,
+           art::CompactDexFile::CodeItem::kRegistersSizeShift)
+ASM_DEFINE(COMPACT_CODE_ITEM_INS_SIZE_SHIFT,
+           art::CompactDexFile::CodeItem::kInsSizeShift)
+ASM_DEFINE(COMPACT_CODE_ITEM_OUTS_SIZE_SHIFT,
+           art::CompactDexFile::CodeItem::kOutsSizeShift)