Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jadx
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
jadx
Commits
5a40d960
Commit
5a40d960
authored
Jun 17, 2013
by
Skylot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify boolean conditions
parent
d6a468f0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
33 additions
and
17 deletions
+33
-17
RegionGen.java
src/main/java/jadx/codegen/RegionGen.java
+33
-17
No files found.
src/main/java/jadx/codegen/RegionGen.java
View file @
5a40d960
...
...
@@ -10,7 +10,7 @@ import jadx.dex.instructions.IfOp;
import
jadx.dex.instructions.SwitchNode
;
import
jadx.dex.instructions.args.ArgType
;
import
jadx.dex.instructions.args.InsnArg
;
import
jadx.dex.instructions.args.
PrimitiveType
;
import
jadx.dex.instructions.args.
LiteralArg
;
import
jadx.dex.instructions.args.RegisterArg
;
import
jadx.dex.nodes.IBlock
;
import
jadx.dex.nodes.IContainer
;
...
...
@@ -158,27 +158,43 @@ public class RegionGen extends InsnGen {
}
private
String
makeCondition
(
IfNode
insn
)
throws
CodegenException
{
String
simple
=
simplifyCondition
(
insn
);
if
(
simple
!=
null
)
return
simple
;
String
second
;
if
(
insn
.
isZeroCmp
())
{
second
=
arg
(
InsnArg
.
lit
(
0
,
insn
.
getArg
(
0
).
getType
()));
}
else
{
second
=
arg
(
insn
.
getArg
(
1
));
}
return
"("
+
arg
(
insn
.
getArg
(
0
))
+
" "
+
insn
.
getOp
().
getSymbol
()
+
" "
+
second
+
")"
;
}
private
String
simplifyCondition
(
IfNode
insn
)
throws
CodegenException
{
InsnArg
firstArg
=
insn
.
getArg
(
0
);
if
(
firstArg
.
getType
().
equals
(
ArgType
.
BOOLEAN
))
{
IfOp
op
=
insn
.
getOp
();
if
(
insn
.
isZeroCmp
())
{
ArgType
type
=
insn
.
getArg
(
0
).
getType
();
if
(
type
.
getPrimitiveType
()
==
PrimitiveType
.
BOOLEAN
)
{
op
=
op
.
invert
();
}
else
{
InsnArg
secondArg
=
insn
.
getArg
(
1
);
if
(!
secondArg
.
isLiteral
()
||
!
secondArg
.
getType
().
equals
(
ArgType
.
BOOLEAN
))
return
null
;
LiteralArg
lit
=
(
LiteralArg
)
secondArg
;
if
(
lit
.
getLiteral
()
==
0
)
op
=
op
.
invert
();
}
if
(
op
==
IfOp
.
EQ
)
{
// == false
return
"(!"
+
arg
(
insn
.
getArg
(
0
))
+
")"
;
return
"("
+
arg
(
firstArg
)
+
")"
;
// == true
}
else
if
(
op
==
IfOp
.
NE
)
{
// == true
return
"("
+
arg
(
insn
.
getArg
(
0
))
+
")"
;
return
"(!"
+
arg
(
firstArg
)
+
")"
;
// != true
}
LOG
.
warn
(
ErrorsCounter
.
formatErrorMsg
(
mth
,
"Unsupported boolean condition "
+
op
.
getSymbol
()));
}
second
=
arg
(
InsnArg
.
lit
(
0
,
type
));
}
else
{
second
=
arg
(
insn
.
getArg
(
1
));
}
return
"("
+
arg
(
insn
.
getArg
(
0
))
+
" "
+
op
.
getSymbol
()
+
" "
+
second
+
")"
;
return
null
;
}
private
CodeWriter
makeSwitch
(
SwitchRegion
sw
,
CodeWriter
code
)
throws
CodegenException
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment