Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Quincy379
jadx
提交
058e4c9f
J
jadx
项目概览
Quincy379
/
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,发现更多精彩内容 >>
提交
058e4c9f
编写于
4月 04, 2019
作者:
A
Ahmed Ashour
提交者:
skylot
4月 04, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: remove redundant wrapping for same arith operations (PR #559)
上级
9d257cd1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
42 addition
and
8 deletion
+42
-8
jadx-core/src/main/java/jadx/core/dex/instructions/ArithOp.java
...ore/src/main/java/jadx/core/dex/instructions/ArithOp.java
+6
-0
jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java
...rc/main/java/jadx/core/dex/instructions/args/InsnArg.java
+8
-0
jadx-core/src/test/java/jadx/tests/integration/arith/TestArith2.java
...rc/test/java/jadx/tests/integration/arith/TestArith2.java
+28
-8
未找到文件。
jadx-core/src/main/java/jadx/core/dex/instructions/ArithOp.java
浏览文件 @
058e4c9f
...
...
@@ -25,4 +25,10 @@ public enum ArithOp {
return
this
.
symbol
;
}
public
boolean
noWrapWith
(
ArithOp
other
)
{
return
(
this
==
ADD
&&
other
==
ADD
)
||
(
this
==
MUL
&&
other
==
MUL
)
||
(
this
==
AND
&&
other
==
AND
)
||
(
this
==
OR
&&
other
==
OR
);
}
}
jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java
浏览文件 @
058e4c9f
...
...
@@ -9,6 +9,8 @@ import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
import
jadx.core.dex.attributes.AFlag
;
import
jadx.core.dex.instructions.ArithNode
;
import
jadx.core.dex.instructions.InsnType
;
import
jadx.core.dex.nodes.InsnNode
;
import
jadx.core.utils.InsnUtils
;
...
...
@@ -111,6 +113,12 @@ public abstract class InsnArg extends Typed {
insn
.
add
(
AFlag
.
WRAPPED
);
InsnArg
arg
=
wrapArg
(
insn
);
parent
.
setArg
(
i
,
arg
);
if
(
insn
.
getType
()
==
InsnType
.
ARITH
&&
parent
.
getType
()
==
InsnType
.
ARITH
&&
((
ArithNode
)
insn
).
getOp
().
noWrapWith
(((
ArithNode
)
parent
).
getOp
()))
{
insn
.
add
(
AFlag
.
DONT_WRAP
);
}
return
arg
;
}
...
...
jadx-core/src/test/java/jadx/tests/integration/arith/TestArith2.java
浏览文件 @
058e4c9f
...
...
@@ -6,7 +6,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
import
org.junit.jupiter.api.Test
;
import
jadx.NotYetImplemented
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.IntegrationTest
;
...
...
@@ -21,6 +20,22 @@ public class TestArith2 extends IntegrationTest {
public
int
test2
(
int
a
,
int
b
,
int
c
)
{
return
a
+
b
+
c
;
}
public
boolean
test3
(
boolean
a
,
boolean
b
,
boolean
c
)
{
return
a
|
b
|
c
;
}
public
boolean
test4
(
boolean
a
,
boolean
b
,
boolean
c
)
{
return
a
&
b
&
c
;
}
public
int
substract
(
int
a
,
int
b
,
int
c
)
{
return
a
-
(
b
-
c
);
}
public
int
divide
(
int
a
,
int
b
,
int
c
)
{
return
a
/
(
b
/
c
);
}
}
@Test
...
...
@@ -30,15 +45,20 @@ public class TestArith2 extends IntegrationTest {
assertThat
(
code
,
containsString
(
"return (a + 2) * 3;"
));
assertThat
(
code
,
not
(
containsString
(
"a + 2 * 3"
)));
}
@Test
@NotYetImplemented
public
void
test2
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsString
(
"return a + b + c;"
));
assertThat
(
code
,
not
(
containsString
(
"return (a + b) + c;"
)));
assertThat
(
code
,
containsString
(
"return a | b | c;"
));
assertThat
(
code
,
not
(
containsString
(
"return (a | b) | c;"
)));
assertThat
(
code
,
containsString
(
"return a & b & c;"
));
assertThat
(
code
,
not
(
containsString
(
"return (a & b) & c;"
)));
assertThat
(
code
,
containsString
(
"return a - (b - c);"
));
assertThat
(
code
,
not
(
containsString
(
"return a - b - c;"
)));
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录