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

Implemented verification for binary operation instructions

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

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

@ -760,6 +760,56 @@ public class MethodAnalyzer {
case INT_TO_SHORT: case INT_TO_SHORT:
handleUnaryOp(analyzedInstruction, Primitive32BitCategories, RegisterType.Category.Short); handleUnaryOp(analyzedInstruction, Primitive32BitCategories, RegisterType.Category.Short);
return; return;
case ADD_INT:
case SUB_INT:
case MUL_INT:
case DIV_INT:
case REM_INT:
case SHL_INT:
case SHR_INT:
case USHR_INT:
handleBinaryOp(analyzedInstruction, Primitive32BitCategories, Primitive32BitCategories,
RegisterType.Category.Integer, false);
return;
case AND_INT:
case OR_INT:
case XOR_INT:
handleBinaryOp(analyzedInstruction, Primitive32BitCategories, Primitive32BitCategories,
RegisterType.Category.Integer, true);
case ADD_LONG:
case SUB_LONG:
case MUL_LONG:
case DIV_LONG:
case REM_LONG:
case AND_LONG:
case OR_LONG:
case XOR_LONG:
handleBinaryOp(analyzedInstruction, WideLowCategories, WideLowCategories, RegisterType.Category.LongLo,
false);
return;
case SHL_LONG:
case SHR_LONG:
case USHR_LONG:
handleBinaryOp(analyzedInstruction, WideLowCategories, Primitive32BitCategories,
RegisterType.Category.LongLo, false);
return;
case ADD_FLOAT:
case SUB_FLOAT:
case MUL_FLOAT:
case DIV_FLOAT:
case REM_FLOAT:
handleBinaryOp(analyzedInstruction, Primitive32BitCategories, Primitive32BitCategories,
RegisterType.Category.Float, false);
return;
case ADD_DOUBLE:
case SUB_DOUBLE:
case MUL_DOUBLE:
case DIV_DOUBLE:
case REM_DOUBLE:
handleBinaryOp(analyzedInstruction, WideLowCategories, WideLowCategories,
RegisterType.Category.DoubleLo, false);
return;
} }
} }
@ -794,7 +844,10 @@ public class MethodAnalyzer {
RegisterType.Category.Float, RegisterType.Category.Float,
RegisterType.Category.Reference); RegisterType.Category.Reference);
private static final EnumSet<RegisterType.Category> BooleanCategories = EnumSet.of(
RegisterType.Category.Null,
RegisterType.Category.One,
RegisterType.Category.Boolean);
private void handleMove(AnalyzedInstruction analyzedInstruction, EnumSet validCategories) { private void handleMove(AnalyzedInstruction analyzedInstruction, EnumSet validCategories) {
TwoRegisterInstruction instruction = (TwoRegisterInstruction)analyzedInstruction.instruction; TwoRegisterInstruction instruction = (TwoRegisterInstruction)analyzedInstruction.instruction;
@ -2237,6 +2290,28 @@ public class MethodAnalyzer {
RegisterType.getRegisterType(destRegisterCategory, null)); RegisterType.getRegisterType(destRegisterCategory, null));
} }
private void handleBinaryOp(AnalyzedInstruction analyzedInstruction, EnumSet validSource1Categories,
EnumSet validSource2Categories, RegisterType.Category destRegisterCategory,
boolean checkForBoolean) {
ThreeRegisterInstruction instruction = (ThreeRegisterInstruction)analyzedInstruction.instruction;
RegisterType source1RegisterType = getAndCheckSourceRegister(analyzedInstruction, instruction.getRegisterB(),
validSource1Categories);
RegisterType source2RegisterType = getAndCheckSourceRegister(analyzedInstruction, instruction.getRegisterC(),
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) {