diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2018-01-05 11:00:42 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2018-01-08 09:11:49 -0800 |
| commit | 698ebbca3c54d17c696e87b9e5838df6a5ac9b08 (patch) | |
| tree | 7887b2cd4662410114f205bbe1896ff094d51407 /dexdump | |
| parent | 4b9a11f1d43df69c50e93ba1793fce1c2216682b (diff) | |
| download | art-698ebbca3c54d17c696e87b9e5838df6a5ac9b08.tar.gz art-698ebbca3c54d17c696e87b9e5838df6a5ac9b08.tar.bz2 art-698ebbca3c54d17c696e87b9e5838df6a5ac9b08.zip | |
Clean up CodeItemAccessors and Compact/StandardDexFile
Change constructor to use a reference to a dex file.
Remove duplicated logic for GetCodeItemSize.
Bug: 63756964
Test: test-art-host
Change-Id: I69af8b93abdf6bdfa4454e16db8f4e75883bca46
Diffstat (limited to 'dexdump')
| -rw-r--r-- | dexdump/dexdump.cc | 8 | ||||
| -rw-r--r-- | dexdump/dexdump_cfg.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dexdump/dexdump.cc b/dexdump/dexdump.cc index 8a06f44628..2c98e12741 100644 --- a/dexdump/dexdump.cc +++ b/dexdump/dexdump.cc @@ -736,7 +736,7 @@ static void dumpInterface(const DexFile* pDexFile, const DexFile::TypeItem& pTyp * Dumps the catches table associated with the code. */ static void dumpCatches(const DexFile* pDexFile, const DexFile::CodeItem* pCode) { - CodeItemDataAccessor accessor(pDexFile, pCode); + CodeItemDataAccessor accessor(*pDexFile, pCode); const u4 triesSize = accessor.TriesSize(); // No catch table. @@ -951,7 +951,7 @@ static void dumpInstruction(const DexFile* pDexFile, fprintf(gOutFile, "%06x:", codeOffset + 0x10 + insnIdx * 2); // Dump (part of) raw bytes. - CodeItemInstructionAccessor accessor(pDexFile, pCode); + CodeItemInstructionAccessor accessor(*pDexFile, pCode); for (u4 i = 0; i < 8; i++) { if (i < insnWidth) { if (i == 7) { @@ -1169,7 +1169,7 @@ static void dumpBytecodes(const DexFile* pDexFile, u4 idx, codeOffset, codeOffset, dot.get(), name, signature.ToString().c_str()); // Iterate over all instructions. - CodeItemDataAccessor accessor(pDexFile, pCode); + CodeItemDataAccessor accessor(*pDexFile, pCode); for (const DexInstructionPcPair& pair : accessor) { const Instruction* instruction = &pair.Inst(); const u4 insnWidth = instruction->SizeInCodeUnits(); @@ -1186,7 +1186,7 @@ static void dumpBytecodes(const DexFile* pDexFile, u4 idx, */ static void dumpCode(const DexFile* pDexFile, u4 idx, u4 flags, const DexFile::CodeItem* pCode, u4 codeOffset) { - CodeItemDebugInfoAccessor accessor(pDexFile, pCode, pDexFile->GetDebugInfoOffset(pCode)); + CodeItemDebugInfoAccessor accessor(*pDexFile, pCode, pDexFile->GetDebugInfoOffset(pCode)); fprintf(gOutFile, " registers : %d\n", accessor.RegistersSize()); fprintf(gOutFile, " ins : %d\n", accessor.InsSize()); diff --git a/dexdump/dexdump_cfg.cc b/dexdump/dexdump_cfg.cc index f08ea746d3..0e313572bc 100644 --- a/dexdump/dexdump_cfg.cc +++ b/dexdump/dexdump_cfg.cc @@ -39,7 +39,7 @@ static void dumpMethodCFGImpl(const DexFile* dex_file, os << "digraph {\n"; os << " # /* " << dex_file->PrettyMethod(dex_method_idx, true) << " */\n"; - CodeItemDataAccessor accessor(dex_file, code_item); + CodeItemDataAccessor accessor(*dex_file, code_item); std::set<uint32_t> dex_pc_is_branch_target; { |