Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a bug where the types in Dalvik code are not accurate for floats … #2110

Merged
merged 5 commits into from
Oct 11, 2024
Merged

Fix a bug where the types in Dalvik code are not accurate for floats … #2110

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09ffeb9
Fix a bug where the types in Dalvik code are not accurate for floats …
MarcMil Oct 10, 2024
b522c59
Avoid naming conflicts
MarcMil Oct 10, 2024
4934c98
Merge branch 'develop' into fixes
StevenArzt Oct 10, 2024
5e5a50e
One freshLocalName call was missing
MarcMil Oct 10, 2024
0fd35bf
Merge branch 'fixes' of github.com:MarcMil/soot into fixes
MarcMil Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion src/main/java/soot/dexpler/DexBody.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,15 @@
import soot.dexpler.tags.DoubleOpTag;
import soot.dexpler.tags.FloatOpTag;
import soot.dexpler.typing.DalvikTyper;
import soot.jimple.AddExpr;
import soot.jimple.AssignStmt;
import soot.jimple.BinopExpr;
import soot.jimple.CastExpr;
import soot.jimple.CaughtExceptionRef;
import soot.jimple.ConditionExpr;
import soot.jimple.Constant;
import soot.jimple.DefinitionStmt;
import soot.jimple.DivExpr;
import soot.jimple.DoubleConstant;
import soot.jimple.EqExpr;
import soot.jimple.FloatConstant;
Expand All @@ -109,9 +111,12 @@
import soot.jimple.Jimple;
import soot.jimple.JimpleBody;
import soot.jimple.LongConstant;
import soot.jimple.MulExpr;
import soot.jimple.NeExpr;
import soot.jimple.NullConstant;
import soot.jimple.NumericConstant;
import soot.jimple.RemExpr;
import soot.jimple.SubExpr;
import soot.jimple.internal.JIdentityStmt;
import soot.jimple.toolkits.base.Aggregator;
import soot.jimple.toolkits.scalar.ConditionalBranchFolder;
Expand Down Expand Up @@ -784,6 +789,8 @@ public Body jimplify(Body b, SootMethod m) {
UnconditionalBranchFolder.v().transform(jBody);
}
DexFillArrayDataTransformer.v().transform(jBody);
//SharedInitializationLocalSplitter destroys the inserted casts, so we have to reintroduce them
convertFloatsAndDoubles(b, jimple);

TypeAssigner.v().transform(jBody);

Expand Down Expand Up @@ -1005,15 +1012,37 @@ public Body jimplify(Body b, SootMethod m) {
public void convertFloatsAndDoubles(Body b, final Jimple jimple) {
UnitPatchingChain units = jBody.getUnits();
Unit u = units.getFirst();
Local convResultFloat = null;
Local convResultDouble = null;
Local[] convFloat = new Local[2], convDouble = new Local[2];

while (u != null) {
if (u instanceof AssignStmt) {
AssignStmt def = (AssignStmt) u;
Value rop = def.getRightOp();
if (rop instanceof BinopExpr) {
boolean isDouble = u.hasTag(DoubleOpTag.NAME);
boolean isFloat = u.hasTag(FloatOpTag.NAME);
if (rop instanceof AddExpr || rop instanceof SubExpr || rop instanceof MulExpr || rop instanceof DivExpr
|| rop instanceof RemExpr) {
if (isDouble) {
if (convResultDouble == null) {
convResultDouble = jimple.newLocal("lclConvToDouble", DoubleType.v());
b.getLocals().add(convResultDouble);
}
Value prev = def.getLeftOp();
def.setLeftOp(convResultDouble);
units.insertAfter(jimple.newAssignStmt(prev, jimple.newCastExpr(convResultDouble, DoubleType.v())), u);
}
if (isFloat) {
if (convResultFloat == null) {
convResultFloat = jimple.newLocal("lclConvToFloat", FloatType.v());
b.getLocals().add(convResultFloat);
}
Value prev = def.getLeftOp();
def.setLeftOp(convResultFloat);
units.insertAfter(jimple.newAssignStmt(prev, jimple.newCastExpr(convResultFloat, FloatType.v())), u);
}
}
BinopExpr bop = (BinopExpr) rop;
int idxConvVar = 0;
for (ValueBox cmp : bop.getUseBoxes()) {
Expand Down
Loading