Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2301_76393173
jadx
提交
0d509f94
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,发现更多精彩内容 >>
提交
0d509f94
编写于
3月 26, 2015
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: fix various processing issues
上级
e4fbbcf2
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
21 addition
and
8 deletion
+21
-8
jadx-core/src/main/java/jadx/core/dex/nodes/BlockNode.java
jadx-core/src/main/java/jadx/core/dex/nodes/BlockNode.java
+2
-1
jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java
jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java
+4
-2
jadx-core/src/main/java/jadx/core/dex/visitors/ConstInlineVisitor.java
.../main/java/jadx/core/dex/visitors/ConstInlineVisitor.java
+6
-2
jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java
...main/java/jadx/core/dex/visitors/regions/RegionMaker.java
+5
-1
jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/PostTypeInference.java
...dx/core/dex/visitors/typeinference/PostTypeInference.java
+3
-1
jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
+1
-1
未找到文件。
jadx-core/src/main/java/jadx/core/dex/nodes/BlockNode.java
浏览文件 @
0d509f94
...
...
@@ -5,6 +5,7 @@ import jadx.core.dex.attributes.AType;
import
jadx.core.dex.attributes.AttrNode
;
import
jadx.core.dex.attributes.nodes.IgnoreEdgeAttr
;
import
jadx.core.dex.attributes.nodes.LoopInfo
;
import
jadx.core.utils.EmptyBitSet
;
import
jadx.core.utils.InsnUtils
;
import
java.util.ArrayList
;
...
...
@@ -24,7 +25,7 @@ public class BlockNode extends AttrNode implements IBlock {
private
List
<
BlockNode
>
cleanSuccessors
;
// all dominators
private
BitSet
doms
;
private
BitSet
doms
=
EmptyBitSet
.
EMPTY
;
// dominance frontier
private
BitSet
domFrontier
;
// immediate dominator
...
...
jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java
浏览文件 @
0d509f94
...
...
@@ -126,9 +126,11 @@ public class MethodNode extends LineAttrNode implements ILoadable {
list
.
add
(
resultArg
);
}
insnNode
.
getRegisterArgs
(
list
);
for
(
int
i
=
0
,
listSize
=
list
.
size
();
i
<
listSize
;
i
++)
{
int
argsCount
=
list
.
size
();
for
(
int
i
=
0
;
i
<
argsCount
;
i
++)
{
if
(
list
.
get
(
i
).
getRegNum
()
>=
regsCount
)
{
throw
new
JadxRuntimeException
(
"Incorrect register number in instruction: "
+
insnNode
);
throw
new
JadxRuntimeException
(
"Incorrect register number in instruction: "
+
insnNode
+
", expected to be less than "
+
regsCount
);
}
}
}
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/ConstInlineVisitor.java
浏览文件 @
0d509f94
...
...
@@ -106,13 +106,17 @@ public class ConstInlineVisitor extends AbstractVisitor {
continue
;
}
LiteralArg
litArg
;
ArgType
argType
=
arg
.
getType
();
if
(
argType
.
isObject
()
&&
literal
!=
0
)
{
argType
=
ArgType
.
NARROW_NUMBERS
;
}
if
(
use
.
size
()
==
1
||
arg
.
isTypeImmutable
())
{
// arg used only in one place
litArg
=
InsnArg
.
lit
(
literal
,
arg
.
getType
()
);
litArg
=
InsnArg
.
lit
(
literal
,
arg
Type
);
}
else
if
(
useInsn
.
getType
()
==
InsnType
.
MOVE
&&
!
useInsn
.
getResult
().
getType
().
isTypeKnown
())
{
// save type for 'move' instructions (hard to find type in chains of 'move')
litArg
=
InsnArg
.
lit
(
literal
,
arg
.
getType
()
);
litArg
=
InsnArg
.
lit
(
literal
,
arg
Type
);
}
else
{
// in most cases type not equal arg.getType()
// just set unknown type and run type fixer
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java
浏览文件 @
0d509f94
...
...
@@ -912,7 +912,11 @@ public class RegionMaker {
handler
.
setHandlerRegion
(
makeRegion
(
start
,
stack
));
ExcHandlerAttr
excHandlerAttr
=
start
.
get
(
AType
.
EXC_HANDLER
);
handler
.
getHandlerRegion
().
addAttr
(
excHandlerAttr
);
if
(
excHandlerAttr
==
null
)
{
LOG
.
warn
(
"Missing exception handler attribute for start block"
);
}
else
{
handler
.
getHandlerRegion
().
addAttr
(
excHandlerAttr
);
}
}
static
boolean
isEqualPaths
(
BlockNode
b1
,
BlockNode
b2
)
{
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/PostTypeInference.java
浏览文件 @
0d509f94
...
...
@@ -88,8 +88,10 @@ public class PostTypeInference {
case
CHECK_CAST:
{
ArgType
castType
=
(
ArgType
)
((
IndexInsnNode
)
insn
).
getIndex
();
RegisterArg
result
=
insn
.
getResult
();
ArgType
resultType
=
result
.
getType
();
// don't override generic types of same base class
boolean
skip
=
castType
.
isObject
()
&&
castType
.
getObject
().
equals
(
result
.
getType
().
getObject
());
boolean
skip
=
castType
.
isObject
()
&&
resultType
.
isObject
()
&&
castType
.
getObject
().
equals
(
resultType
.
getObject
());
if
(!
skip
)
{
// workaround for compiler bug (see TestDuplicateCast)
result
.
getSVar
().
setType
(
castType
);
...
...
jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
浏览文件 @
0d509f94
...
...
@@ -18,7 +18,7 @@ public class JadxSettings extends JadxCLIArgs {
private
static
final
Font
DEFAULT_FONT
=
new
JLabel
().
getFont
();
static
final
Set
<
String
>
SKIP_FIELDS
=
new
HashSet
<
String
>(
Arrays
.
asList
(
"files"
,
"input"
,
"outputDir"
,
"printHelp"
"files"
,
"input"
,
"outputDir"
,
"
verbose"
,
"
printHelp"
));
private
String
lastOpenFilePath
=
USER_HOME
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录