Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
极致猎手
jadx
提交
141398ae
J
jadx
项目概览
极致猎手
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jadx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
141398ae
编写于
1月 26, 2015
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: replace 'move' instruction instead argument inline
上级
07cef6fd
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
93 addition
and
6 deletion
+93
-6
jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java
...rc/main/java/jadx/core/dex/instructions/args/InsnArg.java
+1
-2
jadx-core/src/main/java/jadx/core/dex/visitors/CodeShrinker.java
...re/src/main/java/jadx/core/dex/visitors/CodeShrinker.java
+30
-4
jadx-core/src/test/java/jadx/tests/smali/TestInlineVarArg.java
...core/src/test/java/jadx/tests/smali/TestInlineVarArg.java
+21
-0
jadx-core/src/test/smali/TestInlineVarArg.smali
jadx-core/src/test/smali/TestInlineVarArg.smali
+41
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java
浏览文件 @
141398ae
...
...
@@ -77,7 +77,7 @@ public abstract class InsnArg extends Typed {
return
parentInsn
;
}
public
void
setParentInsn
(
InsnNode
parentInsn
)
{
public
void
setParentInsn
(
@Nullable
InsnNode
parentInsn
)
{
this
.
parentInsn
=
parentInsn
;
}
...
...
@@ -88,7 +88,6 @@ public abstract class InsnArg extends Typed {
}
if
(
parent
==
insn
)
{
LOG
.
debug
(
"Can't wrap instruction info itself: {}"
,
insn
);
Thread
.
dumpStack
();
return
null
;
}
int
i
=
getArgIndex
(
parent
,
this
);
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/CodeShrinker.java
浏览文件 @
141398ae
...
...
@@ -23,6 +23,8 @@ import java.util.List;
import
java.util.ListIterator
;
import
java.util.Set
;
import
org.jetbrains.annotations.Nullable
;
public
class
CodeShrinker
extends
AbstractVisitor
{
@Override
...
...
@@ -227,15 +229,16 @@ public class CodeShrinker extends AbstractVisitor {
if
(
assignBlock
!=
null
&&
assignInsn
!=
arg
.
getParentInsn
()
&&
canMoveBetweenBlocks
(
assignInsn
,
assignBlock
,
block
,
argsInfo
.
getInsn
()))
{
arg
.
wrapInstruction
(
assignInsn
);
InsnList
.
remove
(
assignBlock
,
assignInsn
);
if
(
inline
(
arg
,
assignInsn
,
assignBlock
,
mth
))
{
InsnList
.
remove
(
assignBlock
,
assignInsn
);
}
}
}
}
}
if
(!
wrapList
.
isEmpty
())
{
for
(
WrapInfo
wrapInfo
:
wrapList
)
{
wrapInfo
.
getArg
().
wrapInstruction
(
wrapInfo
.
getInsn
()
);
inline
(
wrapInfo
.
getArg
(),
wrapInfo
.
getInsn
(),
block
,
mth
);
}
for
(
WrapInfo
wrapInfo
:
wrapList
)
{
insnList
.
remove
(
wrapInfo
.
getInsn
());
...
...
@@ -243,6 +246,29 @@ public class CodeShrinker extends AbstractVisitor {
}
}
private
static
boolean
inline
(
RegisterArg
arg
,
InsnNode
insn
,
@Nullable
BlockNode
block
,
MethodNode
mth
)
{
InsnNode
parentInsn
=
arg
.
getParentInsn
();
// replace move instruction if needed
if
(
parentInsn
!=
null
&&
parentInsn
.
getType
()
==
InsnType
.
MOVE
)
{
if
(
block
==
null
)
{
block
=
BlockUtils
.
getBlockByInsn
(
mth
,
parentInsn
);
}
if
(
block
!=
null
)
{
int
index
=
InsnList
.
getIndex
(
block
.
getInstructions
(),
parentInsn
);
if
(
index
!=
-
1
)
{
insn
.
setResult
(
parentInsn
.
getResult
());
insn
.
copyAttributesFrom
(
parentInsn
);
insn
.
setOffset
(
parentInsn
.
getOffset
());
block
.
getInstructions
().
set
(
index
,
insn
);
return
true
;
}
}
}
// simple case
return
arg
.
wrapInstruction
(
insn
)
!=
null
;
}
private
static
boolean
canMoveBetweenBlocks
(
InsnNode
assignInsn
,
BlockNode
assignBlock
,
BlockNode
useBlock
,
InsnNode
useInsn
)
{
if
(!
BlockUtils
.
isPathExists
(
assignBlock
,
useBlock
))
{
...
...
@@ -300,7 +326,7 @@ public class CodeShrinker extends AbstractVisitor {
for
(
RegisterArg
rarg
:
list
)
{
InsnNode
ai
=
rarg
.
getAssignInsn
();
if
(
ai
!=
assignInsn
&&
ai
!=
null
&&
ai
!=
rarg
.
getParentInsn
())
{
rarg
.
wrapInstruction
(
ai
);
inline
(
rarg
,
ai
,
null
,
mth
);
}
}
// remove method args
...
...
jadx-core/src/test/java/jadx/tests/smali/TestInlineVarArg.java
0 → 100644
浏览文件 @
141398ae
package
jadx.tests.smali
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.SmaliTest
;
import
org.junit.Test
;
import
static
jadx
.
tests
.
api
.
utils
.
JadxMatchers
.
containsOne
;
import
static
org
.
junit
.
Assert
.
assertThat
;
public
class
TestInlineVarArg
extends
SmaliTest
{
@Test
public
void
test
()
{
noDebugInfo
();
ClassNode
cls
=
getClassNodeFromSmali
(
"TestInlineVarArg"
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsOne
(
"f(\"a\", \"b\", \"c\");"
));
}
}
jadx-core/src/test/smali/TestInlineVarArg.smali
0 → 100644
浏览文件 @
141398ae
.class public LTestInlineVarArg;
.super Ljava/lang/Object;
.method public static varargs f([Ljava/lang/String;)V
.registers 1
return-void
.end method
.method public test()V
.registers 5
const/4 v2, 0x3
new-array v1, v2, [Ljava/lang/String;
move-object v0, v1
const/4 v2, 0x0
const-string v3, "a"
aput-object v3, v0, v2
const/4 v2, 0x1
const-string v3, "b"
aput-object v3, v0, v2
const/4 v2, 0x2
const-string v3, "c"
aput-object v3, v0, v2
move-object v1, v0
invoke-static {v1}, LTestInlineVarArg;->f([Ljava/lang/String;)V
return-void
.end method
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录