Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_39073359
jadx
提交
df115251
J
jadx
项目概览
qq_39073359
/
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,发现更多精彩内容 >>
提交
df115251
编写于
1月 10, 2015
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: print original value near replaced with field value in switch
上级
02f9c25f
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
14 addition
and
9 deletion
+14
-9
jadx-core/src/main/java/jadx/core/codegen/RegionGen.java
jadx-core/src/main/java/jadx/core/codegen/RegionGen.java
+9
-5
jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
...core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
+1
-1
jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchLabels.java
...ava/jadx/tests/integration/switches/TestSwitchLabels.java
+2
-2
jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithFallThroughCase.java
...s/integration/switches/TestSwitchWithFallThroughCase.java
+1
-0
jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithFallThroughCase2.java
.../integration/switches/TestSwitchWithFallThroughCase2.java
+1
-1
未找到文件。
jadx-core/src/main/java/jadx/core/codegen/RegionGen.java
浏览文件 @
df115251
...
...
@@ -5,8 +5,6 @@ import jadx.core.dex.attributes.AType;
import
jadx.core.dex.attributes.nodes.DeclareVariablesAttr
;
import
jadx.core.dex.attributes.nodes.ForceReturnAttr
;
import
jadx.core.dex.attributes.nodes.LoopLabelAttr
;
import
jadx.core.dex.info.FieldInfo
;
import
jadx.core.dex.instructions.IndexInsnNode
;
import
jadx.core.dex.instructions.SwitchNode
;
import
jadx.core.dex.instructions.args.InsnArg
;
import
jadx.core.dex.instructions.args.NamedArg
;
...
...
@@ -17,6 +15,7 @@ import jadx.core.dex.nodes.IBlock;
import
jadx.core.dex.nodes.IContainer
;
import
jadx.core.dex.nodes.IRegion
;
import
jadx.core.dex.nodes.InsnNode
;
import
jadx.core.dex.nodes.parser.FieldValueAttr
;
import
jadx.core.dex.regions.Region
;
import
jadx.core.dex.regions.SwitchRegion
;
import
jadx.core.dex.regions.SynchronizedRegion
;
...
...
@@ -249,11 +248,16 @@ public class RegionGen extends InsnGen {
code
.
add
(
fn
.
getName
());
}
else
{
staticField
(
code
,
fn
.
getFieldInfo
());
// print original value, sometimes replace with incorrect field
FieldValueAttr
valueAttr
=
fn
.
get
(
AType
.
FIELD_VALUE
);
if
(
valueAttr
!=
null
&&
valueAttr
.
getValue
()
!=
null
)
{
code
.
add
(
" /*"
).
add
(
valueAttr
.
getValue
().
toString
()).
add
(
"*/"
);
}
}
else
if
(
k
instanceof
IndexInsnNode
)
{
staticField
(
code
,
(
FieldInfo
)
((
IndexInsnNode
)
k
).
getIndex
());
}
else
{
}
}
else
if
(
k
instanceof
Integer
)
{
code
.
add
(
TypeGen
.
literalToString
((
Integer
)
k
,
arg
.
getType
()));
}
else
{
throw
new
JadxRuntimeException
(
"Unexpected key in switch: "
+
(
k
!=
null
?
k
.
getClass
()
:
k
));
}
code
.
add
(
':'
);
}
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
浏览文件 @
df115251
...
...
@@ -90,7 +90,7 @@ public class ModVisitor extends AbstractVisitor {
for
(
int
k
=
0
;
k
<
sn
.
getCasesCount
();
k
++)
{
FieldNode
f
=
parentClass
.
getConstField
(
sn
.
getKeys
()[
k
]);
if
(
f
!=
null
)
{
sn
.
getKeys
()[
k
]
=
new
IndexInsnNode
(
InsnType
.
SGET
,
f
.
getFieldInfo
(),
0
)
;
sn
.
getKeys
()[
k
]
=
f
;
}
}
break
;
...
...
jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchLabels.java
浏览文件 @
df115251
...
...
@@ -38,11 +38,11 @@ public class TestSwitchLabels extends IntegrationTest {
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsString
(
"case CONST_ABC
:
"
));
assertThat
(
code
,
containsString
(
"case CONST_ABC"
));
assertThat
(
code
,
containsString
(
"return CONST_CDE;"
));
cls
.
addInnerClass
(
getClassNode
(
TestCls
.
Inner
.
class
));
assertThat
(
code
,
containsString
(
"case CONST_CDE_PRIVATE
:
"
));
assertThat
(
code
,
containsString
(
"case CONST_CDE_PRIVATE"
));
assertThat
(
code
,
containsString
(
".CONST_ABC;"
));
}
}
jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithFallThroughCase.java
浏览文件 @
df115251
...
...
@@ -11,6 +11,7 @@ import static org.junit.Assert.assertThat;
public
class
TestSwitchWithFallThroughCase
extends
IntegrationTest
{
@SuppressWarnings
(
"fallthrough"
)
public
static
class
TestCls
{
public
String
test
(
int
a
,
boolean
b
,
boolean
c
)
{
String
str
=
""
;
...
...
jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithFallThroughCase2.java
浏览文件 @
df115251
...
...
@@ -11,6 +11,7 @@ import static org.junit.Assert.assertThat;
public
class
TestSwitchWithFallThroughCase2
extends
IntegrationTest
{
@SuppressWarnings
(
"fallthrough"
)
public
static
class
TestCls
{
public
String
test
(
int
a
,
boolean
b
,
boolean
c
)
{
String
str
=
""
;
...
...
@@ -56,7 +57,6 @@ public class TestSwitchWithFallThroughCase2 extends IntegrationTest {
@Test
public
void
test
()
{
setOutputCFG
();
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录