Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
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
210c8e54
Commit
210c8e54
authored
May 04, 2013
by
Skylot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust types merge, other code improvements
parent
4e284c4c
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
39 deletions
+26
-39
RegionGen.java
src/main/java/jadx/codegen/RegionGen.java
+1
-3
ArgType.java
src/main/java/jadx/dex/instructions/args/ArgType.java
+11
-23
BlockProcessingHelper.java
src/main/java/jadx/dex/visitors/BlockProcessingHelper.java
+0
-1
ModVisitor.java
src/main/java/jadx/dex/visitors/ModVisitor.java
+6
-1
RegionMaker.java
src/main/java/jadx/dex/visitors/regions/RegionMaker.java
+6
-4
RegionUtils.java
src/main/java/jadx/utils/RegionUtils.java
+1
-2
TypeMergeTest.java
src/test/java/jadx/tests/TypeMergeTest.java
+1
-5
No files found.
src/main/java/jadx/codegen/RegionGen.java
View file @
210c8e54
...
...
@@ -124,9 +124,7 @@ public class RegionGen extends InsnGen {
}
code
.
add
(
'{'
);
code
.
incIndent
();
makeRegion
(
code
,
els
);
code
.
decIndent
();
makeRegionIndent
(
code
,
els
);
code
.
startLine
(
'}'
);
}
}
...
...
src/main/java/jadx/dex/instructions/args/ArgType.java
View file @
210c8e54
...
...
@@ -187,18 +187,12 @@ public abstract class ArgType {
@Override
public
int
getArrayDimension
()
{
if
(
isArray
())
return
1
+
arrayElement
.
getArrayDimension
();
else
return
0
;
return
1
+
arrayElement
.
getArrayDimension
();
}
@Override
public
ArgType
getArrayRootElement
()
{
if
(
isArray
())
return
arrayElement
.
getArrayRootElement
();
else
return
this
;
return
arrayElement
.
getArrayRootElement
();
}
@Override
...
...
@@ -235,7 +229,6 @@ public abstract class ArgType {
@Override
public
ArgType
selectFirst
()
{
assert
possibleTypes
!=
null
;
PrimitiveType
f
=
possibleTypes
[
0
];
if
(
f
==
PrimitiveType
.
OBJECT
||
f
==
PrimitiveType
.
ARRAY
)
return
object
(
Consts
.
CLASS_OBJECT
);
...
...
@@ -280,10 +273,6 @@ public abstract class ArgType {
return
null
;
}
public
ArgType
getArrayElement
()
{
return
null
;
}
public
boolean
isArray
()
{
return
false
;
}
...
...
@@ -292,6 +281,10 @@ public abstract class ArgType {
return
0
;
}
public
ArgType
getArrayElement
()
{
return
null
;
}
public
ArgType
getArrayRootElement
()
{
return
this
;
}
...
...
@@ -363,8 +356,7 @@ public abstract class ArgType {
return
a
;
else
// different objects
return
OBJECT
;
// return null;
return
null
;
}
if
(
a
.
isArray
()
&&
b
.
isArray
())
{
...
...
@@ -526,7 +518,6 @@ public abstract class ArgType {
if
(
prev
!=
null
)
{
genericMap
.
put
(
prev
,
genList
);
}
// LOG.debug("sign: {} -> {}", gen, genericMap);
}
return
genericMap
;
}
catch
(
Throwable
e
)
{
...
...
@@ -570,7 +561,7 @@ public abstract class ArgType {
@Override
public
String
toString
()
{
return
"
UNKNOWN
"
;
return
"
ARG_TYPE
"
;
}
@Override
...
...
@@ -583,11 +574,8 @@ public abstract class ArgType {
if
(
this
==
obj
)
return
true
;
if
(
obj
==
null
)
return
false
;
if
(
hash
!=
obj
.
hashCode
())
return
false
;
if
(
getClass
()
!=
obj
.
getClass
())
{
return
false
;
}
if
(
getClass
()
!=
obj
.
getClass
())
return
false
;
// TODO: don't use toString
return
toString
().
equals
(
obj
.
toString
());
}
return
toString
().
equals
(
obj
.
toString
());
}
}
src/main/java/jadx/dex/visitors/BlockProcessingHelper.java
View file @
210c8e54
...
...
@@ -48,7 +48,6 @@ public class BlockProcessingHelper {
excArg
.
getTypedVar
().
forceSetType
(
ArgType
.
THROWABLE
);
else
excArg
.
getTypedVar
().
forceSetType
(
excHandler
.
getCatchType
().
getType
());
// excArg.getTypedVar().merge(excHandler.getCatchType().getType());
excHandler
.
setArg
(
excArg
);
block
.
getAttributes
().
add
(
handlerAttr
);
...
...
src/main/java/jadx/dex/visitors/ModVisitor.java
View file @
210c8e54
...
...
@@ -193,7 +193,12 @@ public class ModVisitor extends AbstractVisitor {
// move not removed instructions to 'finally' block
if
(
size
!=
0
)
{
// TODO: support instructions from several blocks
tryBlock
.
setFinalBlockFromInsns
(
mth
,
insns
);
// tryBlock.setFinalBlockFromInsns(mth, insns);
// TODO; because of incomplete realization don't extract final block,
// just remove unnecessary instructions
insns
.
clear
();
size
=
insns
.
size
();
}
}
...
...
src/main/java/jadx/dex/visitors/regions/RegionMaker.java
View file @
210c8e54
...
...
@@ -3,7 +3,6 @@ package jadx.dex.visitors.regions;
import
jadx.dex.attributes.AttributeFlag
;
import
jadx.dex.attributes.AttributeType
;
import
jadx.dex.attributes.AttributesList
;
import
jadx.dex.attributes.ForceReturnAttr
;
import
jadx.dex.attributes.IAttribute
;
import
jadx.dex.attributes.LoopAttr
;
import
jadx.dex.instructions.IfNode
;
...
...
@@ -210,17 +209,20 @@ public class RegionMaker {
if
(
BlockUtils
.
isPathExists
(
loopExit
,
next
))
{
// found cross
if
(
next
.
getCleanSuccessors
().
size
()
==
1
)
{
// TODO: do nothing until return is splitted
BlockNode
r
=
BlockUtils
.
getNextBlock
(
next
);
if
(
r
!=
null
&&
r
.
getAttributes
().
contains
(
AttributeFlag
.
RETURN
)
&&
r
.
getInstructions
().
size
()
>
0
&&
r
.
getInstructions
().
get
(
0
).
getType
()
==
InsnType
.
RETURN
)
{
next
.
getAttributes
().
add
(
new
ForceReturnAttr
(
r
.
getInstructions
().
get
(
0
)));
//
next.getAttributes().add(new ForceReturnAttr(r.getInstructions().get(0)));
}
else
{
next
.
getAttributes
().
add
(
AttributeFlag
.
BREAK
);
// next.getAttributes().add(AttributeFlag.BREAK);
// stack.addExit(r);
}
}
else
{
stack
.
addExit
(
next
);
}
stack
.
addExit
(
next
);
break
;
}
next
=
BlockUtils
.
getNextBlock
(
next
);
...
...
src/main/java/jadx/utils/RegionUtils.java
View file @
210c8e54
...
...
@@ -100,8 +100,7 @@ public class RegionUtils {
}
/**
* Check if region contains in container
*
* Check if {@code region} contains in {@code container}.<br>
* For simple region (not from exception handlers) search in parents
* otherwise run recursive search because exception handlers can have several parents
*/
...
...
src/test/java/jadx/tests/TypeMergeTest.java
View file @
210c8e54
...
...
@@ -39,12 +39,8 @@ public class TypeMergeTest extends TestCase {
unknown
(
PrimitiveType
.
OBJECT
));
first
(
object
(
"Lsomeobj;"
),
object
(
"Lsomeobj;"
));
merge
(
object
(
"Lsomeobj;"
),
object
(
"Lotherobj;"
),
OBJECT
);
merge
(
object
(
"Lsomeobj;"
),
object
(
"Lotherobj;"
),
null
);
first
(
object
(
"Lsomeobj;"
),
OBJECT
);
// first(object("Lsomeobj;"), object("Lsomeobj;"));
// merge(object("Lsomeobj;"), object("Lotherobj;"), null);
// merge(object("Lsomeobj;"), OBJECT, null);
}
private
void
first
(
ArgType
t1
,
ArgType
t2
)
{
...
...
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