Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2301_76393173
jadx
提交
3ccab60f
J
jadx
项目概览
2301_76393173
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jadx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3ccab60f
编写于
3月 09, 2014
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: remove redundant parenthesis for arithmetic operations
上级
ed64b8c1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
53 addition
and
14 deletion
+53
-14
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
+11
-14
jadx-core/src/main/java/jadx/core/dex/attributes/AttributeFlag.java
...src/main/java/jadx/core/dex/attributes/AttributeFlag.java
+1
-0
jadx-core/src/main/java/jadx/core/dex/visitors/PrepareForCodeGen.java
...c/main/java/jadx/core/dex/visitors/PrepareForCodeGen.java
+34
-0
jadx-core/src/test/java/jadx/tests/internal/arith/TestArith2.java
...e/src/test/java/jadx/tests/internal/arith/TestArith2.java
+7
-0
未找到文件。
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
浏览文件 @
3ccab60f
...
...
@@ -720,22 +720,19 @@ public class InsnGen {
}
private
void
makeArith
(
ArithNode
insn
,
CodeWriter
code
,
EnumSet
<
Flags
>
state
)
throws
CodegenException
{
ArithOp
op
=
insn
.
getOp
();
if
(
state
.
contains
(
Flags
.
BODY_ONLY
))
{
// wrap insn in brackets for save correct operation order
// wrap insn in brackets for save correct operation order
boolean
wrap
=
state
.
contains
(
Flags
.
BODY_ONLY
)
&&
!
insn
.
getAttributes
().
contains
(
AttributeFlag
.
DONT_WRAP
);
if
(
wrap
)
{
code
.
add
(
'('
);
addArg
(
code
,
insn
.
getArg
(
0
));
code
.
add
(
' '
);
code
.
add
(
op
.
getSymbol
());
code
.
add
(
' '
);
addArg
(
code
,
insn
.
getArg
(
1
));
}
addArg
(
code
,
insn
.
getArg
(
0
));
code
.
add
(
' '
);
code
.
add
(
insn
.
getOp
().
getSymbol
());
code
.
add
(
' '
);
addArg
(
code
,
insn
.
getArg
(
1
));
if
(
wrap
)
{
code
.
add
(
')'
);
}
else
{
addArg
(
code
,
insn
.
getArg
(
0
));
code
.
add
(
' '
);
code
.
add
(
op
.
getSymbol
());
code
.
add
(
' '
);
addArg
(
code
,
insn
.
getArg
(
1
));
}
}
...
...
jadx-core/src/main/java/jadx/core/dex/attributes/AttributeFlag.java
浏览文件 @
3ccab60f
...
...
@@ -13,6 +13,7 @@ public enum AttributeFlag {
RETURN
,
// block contains only return instruction
DECLARE_VAR
,
DONT_WRAP
,
DONT_SHRINK
,
DONT_GENERATE
,
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/PrepareForCodeGen.java
浏览文件 @
3ccab60f
package
jadx.core.dex.visitors
;
import
jadx.core.dex.attributes.AttributeFlag
;
import
jadx.core.dex.instructions.ArithNode
;
import
jadx.core.dex.instructions.ArithOp
;
import
jadx.core.dex.instructions.InsnType
;
import
jadx.core.dex.instructions.args.InsnArg
;
import
jadx.core.dex.instructions.args.InsnWrapArg
;
import
jadx.core.dex.instructions.args.RegisterArg
;
import
jadx.core.dex.instructions.mods.ConstructorInsn
;
import
jadx.core.dex.nodes.BlockNode
;
...
...
@@ -23,6 +26,7 @@ public class PrepareForCodeGen extends AbstractVisitor {
}
for
(
BlockNode
block
:
blocks
)
{
removeInstructions
(
block
);
removeBrackets
(
block
);
modifyArith
(
block
);
}
}
...
...
@@ -48,6 +52,36 @@ public class PrepareForCodeGen extends AbstractVisitor {
}
}
private
static
void
removeBrackets
(
BlockNode
block
)
{
for
(
InsnNode
insn
:
block
.
getInstructions
())
{
checkInsn
(
insn
);
}
}
private
static
void
checkInsn
(
InsnNode
insn
)
{
if
(
insn
.
getType
()
==
InsnType
.
ARITH
)
{
ArithNode
arith
=
(
ArithNode
)
insn
;
ArithOp
op
=
arith
.
getOp
();
if
(
op
==
ArithOp
.
ADD
||
op
==
ArithOp
.
SUB
)
{
for
(
int
i
=
0
;
i
<
2
;
i
++)
{
InsnArg
arg
=
arith
.
getArg
(
i
);
if
(
arg
.
isInsnWrap
())
{
InsnNode
wrapInsn
=
((
InsnWrapArg
)
arg
).
getWrapInsn
();
wrapInsn
.
getAttributes
().
add
(
AttributeFlag
.
DONT_WRAP
);
checkInsn
(
wrapInsn
);
}
}
}
}
else
{
for
(
InsnArg
arg
:
insn
.
getArguments
())
{
if
(
arg
.
isInsnWrap
())
{
InsnNode
wrapInsn
=
((
InsnWrapArg
)
arg
).
getWrapInsn
();
checkInsn
(
wrapInsn
);
}
}
}
}
private
static
void
modifyArith
(
BlockNode
block
)
{
List
<
InsnNode
>
list
=
block
.
getInstructions
();
for
(
int
i
=
0
;
i
<
list
.
size
();
i
++)
{
...
...
jadx-core/src/test/java/jadx/tests/internal/arith/TestArith2.java
浏览文件 @
3ccab60f
...
...
@@ -16,6 +16,10 @@ public class TestArith2 extends InternalJadxTest {
public
int
test1
(
int
a
)
{
return
(
a
+
2
)
*
3
;
}
public
int
test2
(
int
a
,
int
b
,
int
c
)
{
return
a
+
b
+
c
;
}
}
@Test
...
...
@@ -26,5 +30,8 @@ public class TestArith2 extends InternalJadxTest {
assertThat
(
code
,
containsString
(
"return (a + 2) * 3;"
));
assertThat
(
code
,
not
(
containsString
(
"a + 2 * 3"
)));
assertThat
(
code
,
containsString
(
"return a + b + c;"
));
assertThat
(
code
,
not
(
containsString
(
"return (a + b) + c;"
)));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录