Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ql04210214
jadx
提交
6951d0e6
J
jadx
项目概览
ql04210214
/
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,发现更多精彩内容 >>
提交
6951d0e6
编写于
11月 03, 2014
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: use NotNull and Nullable annotations
上级
73dd55ea
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
32 addition
and
39 deletion
+32
-39
jadx-core/build.gradle
jadx-core/build.gradle
+1
-0
jadx-core/src/main/java/jadx/core/dex/instructions/args/RegisterArg.java
...ain/java/jadx/core/dex/instructions/args/RegisterArg.java
+6
-12
jadx-core/src/main/java/jadx/core/dex/instructions/args/SSAVar.java
...src/main/java/jadx/core/dex/instructions/args/SSAVar.java
+14
-11
jadx-core/src/main/java/jadx/core/dex/visitors/regions/TernaryMod.java
.../main/java/jadx/core/dex/visitors/regions/TernaryMod.java
+2
-3
jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeInference.java
...a/jadx/core/dex/visitors/typeinference/TypeInference.java
+9
-13
未找到文件。
jadx-core/build.gradle
浏览文件 @
6951d0e6
...
...
@@ -5,6 +5,7 @@ dependencies {
compile
files
(
'lib/dx-1.8.jar'
)
compile
'org.ow2.asm:asm:5.0.3'
compile
'com.intellij:annotations:12.0'
testCompile
'org.smali:smali:2.0.3'
}
...
...
jadx-core/src/main/java/jadx/core/dex/instructions/args/RegisterArg.java
浏览文件 @
6951d0e6
...
...
@@ -19,7 +19,8 @@ public class RegisterArg extends InsnArg implements Named {
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
RegisterArg
.
class
);
protected
final
int
regNum
;
protected
SSAVar
sVar
;
// not null after SSATransform pass
private
SSAVar
sVar
;
public
RegisterArg
(
int
rn
)
{
this
.
regNum
=
rn
;
...
...
@@ -139,11 +140,7 @@ public class RegisterArg extends InsnArg implements Named {
if
(
sVar
==
null
)
{
return
null
;
}
RegisterArg
assign
=
sVar
.
getAssign
();
if
(
assign
!=
null
)
{
return
assign
.
getParentInsn
();
}
return
null
;
return
sVar
.
getAssign
().
getParentInsn
();
}
public
InsnNode
getPhiAssignInsn
()
{
...
...
@@ -151,12 +148,9 @@ public class RegisterArg extends InsnArg implements Named {
if
(
usePhi
!=
null
)
{
return
usePhi
;
}
RegisterArg
assign
=
sVar
.
getAssign
();
if
(
assign
!=
null
)
{
InsnNode
parent
=
assign
.
getParentInsn
();
if
(
parent
!=
null
&&
parent
.
getType
()
==
InsnType
.
PHI
)
{
return
parent
;
}
InsnNode
parent
=
sVar
.
getAssign
().
getParentInsn
();
if
(
parent
!=
null
&&
parent
.
getType
()
==
InsnType
.
PHI
)
{
return
parent
;
}
return
null
;
}
...
...
jadx-core/src/main/java/jadx/core/dex/instructions/args/SSAVar.java
浏览文件 @
6951d0e6
...
...
@@ -5,6 +5,9 @@ import jadx.core.dex.instructions.PhiInsn;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.Nullable
;
public
class
SSAVar
{
private
final
int
regNum
;
...
...
@@ -14,21 +17,21 @@ public class SSAVar {
private
int
startUseAddr
;
private
int
endUseAddr
;
@NotNull
private
RegisterArg
assign
;
private
final
List
<
RegisterArg
>
useList
=
new
ArrayList
<
RegisterArg
>(
2
);
@Nullable
private
PhiInsn
usedInPhi
;
private
ArgType
type
;
private
boolean
typeImmutable
;
public
SSAVar
(
int
regNum
,
int
v
,
RegisterArg
assign
)
{
public
SSAVar
(
int
regNum
,
int
v
,
@NotNull
RegisterArg
assign
)
{
this
.
regNum
=
regNum
;
this
.
version
=
v
;
this
.
assign
=
assign
;
if
(
assign
!=
null
)
{
assign
.
setSVar
(
this
);
}
assign
.
setSVar
(
this
);
startUseAddr
=
-
1
;
endUseAddr
=
-
1
;
}
...
...
@@ -51,7 +54,7 @@ public class SSAVar {
int
start
=
Integer
.
MAX_VALUE
;
int
end
=
Integer
.
MIN_VALUE
;
if
(
assign
!=
null
&&
assign
.
getParentInsn
()
!=
null
)
{
if
(
assign
.
getParentInsn
()
!=
null
)
{
int
insnAddr
=
assign
.
getParentInsn
().
getOffset
();
if
(
insnAddr
>=
0
)
{
start
=
Math
.
min
(
insnAddr
,
start
);
...
...
@@ -81,11 +84,12 @@ public class SSAVar {
return
version
;
}
@NotNull
public
RegisterArg
getAssign
()
{
return
assign
;
}
public
void
setAssign
(
RegisterArg
assign
)
{
public
void
setAssign
(
@NotNull
RegisterArg
assign
)
{
this
.
assign
=
assign
;
}
...
...
@@ -114,10 +118,11 @@ public class SSAVar {
}
}
public
void
setUsedInPhi
(
PhiInsn
usedInPhi
)
{
public
void
setUsedInPhi
(
@Nullable
PhiInsn
usedInPhi
)
{
this
.
usedInPhi
=
usedInPhi
;
}
@Nullable
public
PhiInsn
getUsedInPhi
()
{
return
usedInPhi
;
}
...
...
@@ -127,7 +132,7 @@ public class SSAVar {
}
public
int
getVariableUseCount
()
{
if
(
!
isUsedInPhi
()
)
{
if
(
usedInPhi
==
null
)
{
return
useList
.
size
();
}
return
useList
.
size
()
+
usedInPhi
.
getResult
().
getSVar
().
getUseCount
();
...
...
@@ -142,9 +147,7 @@ public class SSAVar {
acceptedType
=
type
;
this
.
type
=
acceptedType
;
}
if
(
assign
!=
null
)
{
assign
.
type
=
acceptedType
;
}
assign
.
type
=
acceptedType
;
for
(
int
i
=
0
,
useListSize
=
useList
.
size
();
i
<
useListSize
;
i
++)
{
useList
.
get
(
i
).
type
=
acceptedType
;
}
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/regions/TernaryMod.java
浏览文件 @
6951d0e6
...
...
@@ -60,8 +60,8 @@ public class TernaryMod {
}
if
(
t
.
getResult
()
!=
null
&&
e
.
getResult
()
!=
null
)
{
if
(!
t
.
getResult
().
equalRegisterAndType
(
e
.
getResult
())
||
!
t
.
getResult
().
getSVar
().
isUsedInPhi
(
))
{
PhiInsn
phi
=
t
.
getResult
().
getSVar
().
getUsedInPhi
();
if
(
phi
==
null
||
!
t
.
getResult
().
equalRegisterAndType
(
e
.
getResult
()
))
{
return
false
;
}
if
(!
ifRegion
.
getParent
().
replaceSubBlock
(
ifRegion
,
header
))
{
...
...
@@ -71,7 +71,6 @@ public class TernaryMod {
InsnList
.
remove
(
eb
,
e
);
RegisterArg
resArg
;
PhiInsn
phi
=
t
.
getResult
().
getSVar
().
getUsedInPhi
();
if
(
phi
.
getArgsCount
()
==
2
)
{
resArg
=
phi
.
getResult
();
}
else
{
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeInference.java
浏览文件 @
6951d0e6
...
...
@@ -28,15 +28,14 @@ public class TypeInference extends AbstractVisitor {
// search variable name
String
name
=
processVarName
(
var
);
if
(
name
!=
null
)
{
var
.
setName
(
name
);
}
var
.
setName
(
name
);
}
// fix type for vars used only in Phi nodes
for
(
SSAVar
sVar
:
mth
.
getSVars
())
{
if
(
sVar
.
isUsedInPhi
())
{
processPhiNode
(
sVar
.
getUsedInPhi
());
PhiInsn
phi
=
sVar
.
getUsedInPhi
();
if
(
phi
!=
null
)
{
processPhiNode
(
phi
);
}
}
}
...
...
@@ -44,10 +43,10 @@ public class TypeInference extends AbstractVisitor {
private
static
ArgType
processType
(
SSAVar
var
)
{
RegisterArg
assign
=
var
.
getAssign
();
List
<
RegisterArg
>
useList
=
var
.
getUseList
();
if
(
assign
!=
null
&&
(
useList
.
isEmpty
()
||
var
.
isTypeImmutable
()
))
{
if
(
useList
.
isEmpty
()
||
var
.
isTypeImmutable
(
))
{
return
assign
.
getType
();
}
ArgType
type
=
assign
!=
null
?
assign
.
getType
()
:
ArgType
.
UNKNOWN
;
ArgType
type
=
assign
.
getType
()
;
for
(
RegisterArg
arg
:
useList
)
{
ArgType
useType
=
arg
.
getType
();
ArgType
newType
=
ArgType
.
merge
(
type
,
useType
);
...
...
@@ -77,19 +76,16 @@ public class TypeInference extends AbstractVisitor {
}
private
static
String
processVarName
(
SSAVar
var
)
{
String
name
=
null
;
if
(
var
.
getAssign
()
!=
null
)
{
name
=
var
.
getAssign
().
getName
();
}
String
name
=
var
.
getAssign
().
getName
();
if
(
name
!=
null
)
{
return
name
;
}
for
(
RegisterArg
arg
:
var
.
getUseList
())
{
String
vName
=
arg
.
getName
();
if
(
vName
!=
null
)
{
name
=
vName
;
return
vName
;
}
}
return
n
ame
;
return
n
ull
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录