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

Implemented verification for the 2-register binary operation instructions

Browse Source 
git-svn-id: https://smali.googlecode.com/svn/trunk@618 55b6fa8a-2a1e-11de-a435-ffa8d773f76a
This commit is contained in:
JesusFreke@JesusFreke.com 2010-02-08 02:28:18 +00:00
parent 195e1a1071
commit 122eba5cec
1 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -810,6 +810,56 @@ public class MethodAnalyzer {
handleBinaryOp(analyzedInstruction, WideLowCategories, WideLowCategories, handleBinaryOp(analyzedInstruction, WideLowCategories, WideLowCategories,
RegisterType.Category.DoubleLo, false); RegisterType.Category.DoubleLo, false);
return; return;
case ADD_INT_2ADDR:
case SUB_INT_2ADDR:
case MUL_INT_2ADDR:
case DIV_INT_2ADDR:
case REM_INT_2ADDR:
case SHL_INT_2ADDR:
case SHR_INT_2ADDR:
case USHR_INT_2ADDR:
handleBinary2AddrOp(analyzedInstruction, Primitive32BitCategories, Primitive32BitCategories,
RegisterType.Category.Integer, false);
return;
case AND_INT_2ADDR:
case OR_INT_2ADDR:
case XOR_INT_2ADDR:
handleBinary2AddrOp(analyzedInstruction, Primitive32BitCategories, Primitive32BitCategories,
RegisterType.Category.Integer, true);
return;
case ADD_LONG_2ADDR:
case SUB_LONG_2ADDR:
case MUL_LONG_2ADDR:
case DIV_LONG_2ADDR:
case REM_LONG_2ADDR:
case AND_LONG_2ADDR:
case OR_LONG_2ADDR:
case XOR_LONG_2ADDR:
handleBinary2AddrOp(analyzedInstruction, WideLowCategories, WideLowCategories,
RegisterType.Category.LongLo, false);
return;
case SHL_LONG_2ADDR:
case SHR_LONG_2ADDR:
case USHR_LONG_2ADDR:
handleBinary2AddrOp(analyzedInstruction, WideLowCategories, Primitive32BitCategories,
RegisterType.Category.LongLo, false);
return;
case ADD_FLOAT_2ADDR:
case SUB_FLOAT_2ADDR:
case MUL_FLOAT_2ADDR:
case DIV_FLOAT_2ADDR:
case REM_FLOAT_2ADDR:
handleBinary2AddrOp(analyzedInstruction, Primitive32BitCategories, Primitive32BitCategories,
RegisterType.Category.Float, false);
return;
case ADD_DOUBLE_2ADDR:
case SUB_DOUBLE_2ADDR:
case MUL_DOUBLE_2ADDR:
case DIV_DOUBLE_2ADDR:
case REM_DOUBLE_2ADDR:
handleBinary2AddrOp(analyzedInstruction, WideLowCategories, WideLowCategories,
RegisterType.Category.DoubleLo, false);
return;
} }
} }
@ -2312,6 +2362,28 @@ public class MethodAnalyzer {
RegisterType.getRegisterType(destRegisterCategory, null)); RegisterType.getRegisterType(destRegisterCategory, null));
} }
private void handleBinary2AddrOp(AnalyzedInstruction analyzedInstruction, EnumSet validSource1Categories,
EnumSet validSource2Categories, RegisterType.Category destRegisterCategory,
boolean checkForBoolean) {
TwoRegisterInstruction instruction = (TwoRegisterInstruction)analyzedInstruction.instruction;
RegisterType source1RegisterType = getAndCheckSourceRegister(analyzedInstruction, instruction.getRegisterA(),
validSource1Categories);
RegisterType source2RegisterType = getAndCheckSourceRegister(analyzedInstruction, instruction.getRegisterB(),
validSource2Categories);
if (checkForBoolean) {
if (BooleanCategories.contains(source1RegisterType.category) &&
BooleanCategories.contains(source2RegisterType.category)) {
destRegisterCategory = RegisterType.Category.Boolean;
}
}
setDestinationRegisterTypeAndPropagateChanges(analyzedInstruction,
RegisterType.getRegisterType(destRegisterCategory, null));
}
private static boolean checkArrayFieldAssignment(RegisterType.Category arrayFieldCategory, private static boolean checkArrayFieldAssignment(RegisterType.Category arrayFieldCategory,
RegisterType.Category instructionCategory) { RegisterType.Category instructionCategory) {
if (arrayFieldCategory == instructionCategory) { if (arrayFieldCategory == instructionCategory) {