Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
J
jadx
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
jadx
Commits
4caa58f5
Commit
4caa58f5
authored
Dec 24, 2013
by
Skylot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
core: use correct argument wrap method
parent
43913d47
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
33 deletions
+3
-33
InsnArg.java
...rc/main/java/jadx/core/dex/instructions/args/InsnArg.java
+2
-2
TernaryInsn.java
...ain/java/jadx/core/dex/instructions/mods/TernaryInsn.java
+0
-30
SimplifyVisitor.java
...src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java
+1
-1
No files found.
jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java
View file @
4caa58f5
...
@@ -35,7 +35,7 @@ public abstract class InsnArg extends Typed {
...
@@ -35,7 +35,7 @@ public abstract class InsnArg extends Typed {
return
lit
(
insn
.
getLiteral
(),
type
);
return
lit
(
insn
.
getLiteral
(),
type
);
}
}
p
ublic
static
InsnWrapArg
wrap
(
InsnNode
insn
)
{
p
rivate
static
InsnWrapArg
wrap
(
InsnNode
insn
)
{
return
new
InsnWrapArg
(
insn
);
return
new
InsnWrapArg
(
insn
);
}
}
...
@@ -81,7 +81,7 @@ public abstract class InsnArg extends Typed {
...
@@ -81,7 +81,7 @@ public abstract class InsnArg extends Typed {
return
null
;
return
null
;
}
}
p
rivate
static
InsnArg
wrapArg
(
InsnNode
insn
)
{
p
ublic
static
InsnArg
wrapArg
(
InsnNode
insn
)
{
InsnArg
arg
;
InsnArg
arg
;
switch
(
insn
.
getType
())
{
switch
(
insn
.
getType
())
{
case
MOVE:
case
MOVE:
...
...
jadx-core/src/main/java/jadx/core/dex/instructions/mods/TernaryInsn.java
deleted
100644 → 0
View file @
43913d47
package
jadx
.
core
.
dex
.
instructions
.
mods
;
import
jadx.core.dex.instructions.IfNode
;
import
jadx.core.dex.instructions.IfOp
;
import
jadx.core.dex.instructions.InsnType
;
import
jadx.core.dex.instructions.args.InsnArg
;
import
jadx.core.dex.nodes.InsnNode
;
import
jadx.core.utils.InsnUtils
;
import
jadx.core.utils.Utils
;
public
class
TernaryInsn
extends
IfNode
{
public
TernaryInsn
(
IfOp
op
,
InsnNode
then
,
InsnNode
els
)
{
super
(
then
.
getOffset
(),
InsnArg
.
wrap
(
then
),
els
==
null
?
null
:
InsnArg
.
wrap
(
els
));
}
@Override
public
InsnType
getType
()
{
return
InsnType
.
TERNARY
;
}
@Override
public
String
toString
()
{
return
InsnUtils
.
formatOffset
(
offset
)
+
": TERNARY"
+
getResult
()
+
" = "
+
Utils
.
listToString
(
getArguments
());
}
}
jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java
View file @
4caa58f5
...
@@ -165,7 +165,7 @@ public class SimplifyVisitor extends AbstractVisitor {
...
@@ -165,7 +165,7 @@ public class SimplifyVisitor extends AbstractVisitor {
for
(
int
i
=
1
;
i
<
argsCount
;
i
++)
{
for
(
int
i
=
1
;
i
<
argsCount
;
i
++)
{
concat
.
addArg
(
wrap
.
getArg
(
i
));
concat
.
addArg
(
wrap
.
getArg
(
i
));
}
}
return
new
ArithNode
(
ArithOp
.
ADD
,
fArg
,
fArg
,
InsnArg
.
wrap
(
concat
));
return
new
ArithNode
(
ArithOp
.
ADD
,
fArg
,
fArg
,
InsnArg
.
wrap
Arg
(
concat
));
}
}
}
catch
(
Throwable
e
)
{
}
catch
(
Throwable
e
)
{
LOG
.
debug
(
"Can't convert field arith insn: {}, mth: {}"
,
insn
,
mth
,
e
);
LOG
.
debug
(
"Can't convert field arith insn: {}, mth: {}"
,
insn
,
mth
,
e
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment