ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-05 00:54:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add concrete implementations of RegisterIterator for Format35c and Format3rc

Browse Source 
git-svn-id: https://smali.googlecode.com/svn/trunk@609 55b6fa8a-2a1e-11de-a435-ffa8d773f76a
This commit is contained in:
JesusFreke@JesusFreke.com 2010-02-08 02:27:23 +00:00
parent 6192896f88
commit b615ba6f51
1 changed files with 61 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
dexlib/src/main/java/org/jf/dexlib/Code/Analysis/MethodAnalyzer.java
View File

@ -1080,6 +1080,64 @@ public class MethodAnalyzer {
boolean pastEnd(); boolean pastEnd();
} }
private static class Format35cRegisterIterator implements RegisterIterator {
private final int registerCount;
private final int[] registers;
private int currentRegister = 0;
public Format35cRegisterIterator(FiveRegisterInstruction instruction) {
registerCount = instruction.getRegCount();
registers = new int[]{instruction.getRegisterD(), instruction.getRegisterE(),
instruction.getRegisterF(), instruction.getRegisterG(),
instruction.getRegisterA()};
}
public int getRegister() {
return registers[currentRegister];
}
public boolean moveNext() {
currentRegister++;
return pastEnd();
}
public int getCount() {
return registerCount;
}
public boolean pastEnd() {
return currentRegister >= registerCount;
}
}
private static class Format3rcRegisterIterator implements RegisterIterator {
private final int startRegister;
private final int registerCount;
private int currentRegister = 0;
public Format3rcRegisterIterator(RegisterRangeInstruction instruction) {
startRegister = instruction.getStartRegister();
registerCount = instruction.getRegCount();
}
public int getRegister() {
return startRegister + currentRegister;
}
public boolean moveNext() {
currentRegister++;
return pastEnd();
}
public int getCount() {
return registerCount;
}
public boolean pastEnd() {
return currentRegister >= registerCount;
}
}
private boolean handleFilledNewArrayCommon(AnalyzedInstruction analyzedInstruction, private boolean handleFilledNewArrayCommon(AnalyzedInstruction analyzedInstruction,
RegisterIterator registerIterator) { RegisterIterator registerIterator) {
InstructionWithReference instruction = (InstructionWithReference)analyzedInstruction.instruction; InstructionWithReference instruction = (InstructionWithReference)analyzedInstruction.instruction;
@ -1129,35 +1187,11 @@ public class MethodAnalyzer {
private boolean handleFilledNewArray(AnalyzedInstruction analyzedInstruction) { private boolean handleFilledNewArray(AnalyzedInstruction analyzedInstruction) {
FiveRegisterInstruction instruction = (FiveRegisterInstruction)analyzedInstruction.instruction; FiveRegisterInstruction instruction = (FiveRegisterInstruction)analyzedInstruction.instruction;
final int registerCount = instruction.getRegCount(); return handleFilledNewArrayCommon(analyzedInstruction, new Format35cRegisterIterator(instruction));
final int[] registers = new int[]{instruction.getRegisterD(), instruction.getRegisterE(),
instruction.getRegisterF(), instruction.getRegisterG(),
instruction.getRegisterA()};
return handleFilledNewArrayCommon(analyzedInstruction,
new RegisterIterator() {
private int currentRegister = 0;
public int getRegister() {
return registers[currentRegister];
}
public boolean moveNext() {
currentRegister++;
return pastEnd();
}
public int getCount() {
return registerCount;
}
public boolean pastEnd() {
return currentRegister >= registerCount;
}
});
} }
private boolean handleFilledNewArrayRange(AnalyzedInstruction analyzedInstruction) { private boolean handleFilledNewArrayRange(AnalyzedInstruction analyzedInstruction) {
final RegisterRangeInstruction instruction = (RegisterRangeInstruction)analyzedInstruction.instruction; RegisterRangeInstruction instruction = (RegisterRangeInstruction)analyzedInstruction.instruction;
//instruction.getStartRegister() and instruction.getRegCount() both return an int value, but are actually //instruction.getStartRegister() and instruction.getRegCount() both return an int value, but are actually
//unsigned 16 bit values, so we don't have to worry about overflowing an int when adding them together //unsigned 16 bit values, so we don't have to worry about overflowing an int when adding them together
@ -1168,29 +1202,7 @@ public class MethodAnalyzer {
instruction.getStartRegister() + instruction.getRegCount() - 1)); instruction.getStartRegister() + instruction.getRegCount() - 1));
} }
return handleFilledNewArrayCommon(analyzedInstruction, return handleFilledNewArrayCommon(analyzedInstruction, new Format3rcRegisterIterator(instruction));
new RegisterIterator() {
private int currentRegister = 0;
private final int startRegister = instruction.getStartRegister();
private final int registerCount = instruction.getRegCount();
public int getRegister() {
return startRegister + currentRegister;
}
public boolean moveNext() {
currentRegister++;
return pastEnd();
}
public int getCount() {
return registerCount;
}
public boolean pastEnd() {
return currentRegister >= registerCount;
}
});
} }
private boolean handleFillArrayData(AnalyzedInstruction analyzedInstruction) { private boolean handleFillArrayData(AnalyzedInstruction analyzedInstruction) {