commit dc79917ece4418247230dc1885afbacc158999b9
author Ben Gruver <bgruv@google.com> Fri Jul 26 13:30:01 2019 -0700
committer Ben Gruver <bgruv@google.com> Wed Aug 07 14:05:34 2019 -0700
tree 5b85043cba6bff47b7fb91ed5780387aa89e867a
parent 862c767d58b3641a8e571041731b9b579a08a6dc

Refactor DexBackedMethodImplementation in preparation for the cdex implementation

This pulls out some of the operations into protected methods, to be
overridden in the cdex implementation.

dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethodImplementation.java

diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethodImplementation.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethodImplementation.java
index f754a11..7eabe6a 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethodImplementation.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethodImplementation.java
@@ -54,21 +54,31 @@
     @Nonnull public final DexBackedMethod method;
     private final int codeOffset;
 
-    public DexBackedMethodImplementation(@Nonnull DexBackedDexFile dexFile,
-                                         @Nonnull DexBackedMethod method,
-                                         int codeOffset) {
+    protected DexBackedMethodImplementation(@Nonnull DexBackedDexFile dexFile,
+                                  @Nonnull DexBackedMethod method,
+                                  int codeOffset) {
         this.dexFile = dexFile;
         this.method = method;
         this.codeOffset = codeOffset;
     }
 
-    @Override public int getRegisterCount() { return dexFile.getBuffer().readUshort(codeOffset); }
+    @Override public int getRegisterCount() {
+        return dexFile.getDataBuffer().readUshort(codeOffset);
+    }
+
+    protected int getInstructionsSize() {
+        return dexFile.getDataBuffer().readSmallUint(codeOffset + CodeItem.INSTRUCTION_COUNT_OFFSET);
+    }
+
+    protected int getInstructionsStartOffset() {
+        return codeOffset + CodeItem.INSTRUCTION_START_OFFSET;
+    }
 
     @Nonnull @Override public Iterable<? extends Instruction> getInstructions() {
         // instructionsSize is the number of 16-bit code units in the instruction list, not the number of instructions
-        int instructionsSize = dexFile.getDataBuffer().readSmallUint(codeOffset + CodeItem.INSTRUCTION_COUNT_OFFSET);
+        int instructionsSize = getInstructionsSize();
 
-        final int instructionsStartOffset = codeOffset + CodeItem.INSTRUCTION_START_OFFSET;
+        final int instructionsStartOffset = getInstructionsStartOffset();
         final int endOffset = instructionsStartOffset + (instructionsSize*2);
         return new Iterable<Instruction>() {
             @Override
@@ -95,14 +105,18 @@
         };
     }
 
+    protected int getTriesSize() {
+        return dexFile.getDataBuffer().readUshort(codeOffset + CodeItem.TRIES_SIZE_OFFSET);
+    }
+
     @Nonnull
     @Override
     public List<? extends DexBackedTryBlock> getTryBlocks() {
-        final int triesSize = dexFile.getDataBuffer().readUshort(codeOffset + CodeItem.TRIES_SIZE_OFFSET);
+        final int triesSize = getTriesSize();
         if (triesSize > 0) {
-            int instructionsSize = dexFile.getDataBuffer().readSmallUint(codeOffset + CodeItem.INSTRUCTION_COUNT_OFFSET);
+            int instructionsSize = getInstructionsSize();
             final int triesStartOffset = AlignmentUtils.alignOffset(
-                    codeOffset + CodeItem.INSTRUCTION_START_OFFSET + (instructionsSize*2), 4);
+                    getInstructionsStartOffset() + (instructionsSize*2), 4);
             final int handlersStartOffset = triesStartOffset + triesSize*CodeItem.TryItem.ITEM_SIZE;
 
             return new FixedSizeList<DexBackedTryBlock>() {
@@ -123,9 +137,13 @@
         return ImmutableList.of();
     }
 
+    protected int getDebugOffset() {
+        return dexFile.getDataBuffer().readInt(codeOffset + CodeItem.DEBUG_INFO_OFFSET);
+    }
+
     @Nonnull
     private DebugInfo getDebugInfo() {
-        int debugOffset = dexFile.getDataBuffer().readInt(codeOffset + CodeItem.DEBUG_INFO_OFFSET);
+        int debugOffset = getDebugOffset();
 
         if (debugOffset == -1 || debugOffset == 0) {
             return DebugInfo.newOrEmpty(dexFile, 0, this);
@@ -162,10 +180,10 @@
         int debugSize = getDebugInfo().getSize();
 
         //set last offset just before bytecode instructions (after insns_size)
-        int lastOffset = codeOffset + CodeItem.INSTRUCTION_START_OFFSET;
+        int lastOffset = getInstructionsStartOffset();
 
         //set code_item ending offset to the end of instructions list (insns_size * ushort)
-        lastOffset += dexFile.getDataBuffer().readSmallUint(codeOffset + CodeItem.INSTRUCTION_COUNT_OFFSET) * 2;
+        lastOffset += getInstructionsSize() * 2;
 
         //read any exception handlers and move code_item offset to the end
         for (DexBackedTryBlock tryBlock: getTryBlocks()) {