Ben Gruver
93100e57b2
Improve how the instance-of + if-eqz/if-nez type propagation works
...
We now perform the type propagation while analyzing the if-eqz/if-nez
instruction. Additionally, AnalyzedInstruction.setsRegister now has
special case logic to check for this case, so we don't incorrectly
propagate the original type past the if-eqz/if-nez
2016-04-23 14:01:36 -07:00
Ben Gruver
9802cf3428
Propagate the narrowed type for an if-nez after an instance-of
2016-04-23 11:08:21 -07:00
Alex Light
40bbf5c347
Dex version 37 support
...
Make dexlib able to read and write version 37 dex files.
Bug: 27809626
Change-Id: I3d0ca6201c7abe7763d2fb925e9ee1edbef24230
2016-04-04 11:00:02 -07:00
Ben Gruver
6417e812e1
Refactor ClassPath to take ClassProviders
...
This allows for a more general mechanism for providing defined classes
2016-02-26 21:13:29 -08:00
Ben Gruver
5b2943d89b
Check for switch offset validity in the MethodAnalyzer
2016-02-20 12:04:47 -08:00
Ben Gruver
8533ab7429
Merge branch 'master' into smalidea
2016-02-13 15:43:37 -08:00
Ben Gruver
3e265038f5
Implement support for adding new labels to a MutableMethodImplementation
2015-10-18 13:24:34 -07:00
Ben Gruver
b8e255f389
Add support for 64-bit oat files
2015-10-17 14:47:10 -07:00
Ben Gruver
e202aeede5
Pass in the Opcodes to use for SyntheticAccessorFSM
2015-10-17 13:50:26 -07:00
Ben Gruver
4c66761aea
Minor javadoc fix for AnalyzedInstruction.setPostRegisterType
2015-10-17 13:48:54 -07:00
Ben Gruver
da58cc8991
Only use the instance-of/if-eqz type info if we're getting more information
...
We should only use the type info from an instance-of/if-eqz combo if we're
going from an interface to a class, or going from a class to a subtype
of that class -- otherwise, we're actually losing information.
2015-10-17 13:18:55 -07:00
Ben Gruver
3124e94d4b
Add support for static volatile opcodes in OdexedFieldInstructionMapper
...
This fixes a regression introduced in 2.1
2015-10-16 19:07:50 -07:00
Ben Gruver
37d14becd1
Fix register propagation when overriding a register type from a predecessor
2015-10-14 21:57:23 -07:00
Ben Gruver
398630dde5
Infer the register type based on the result of an instance-of instruction
...
In oat files, it's possible that a check-cast is removed based on the
register being provably of the type being cast to, based on the result
of an instance-of check.
Supporting this in general would require more sophisticated static analysis
than is currently done. Instead, this adds a special-case specifically
for the case of an instance-of followed immediately by an if-eqz
2015-10-13 21:59:47 -07:00
Ben Gruver
ccf087b0dd
Bump up MAX_OAT_VERSION to 71
2015-10-01 22:51:10 -07:00
Ben Gruver
7844089286
Add support for alternate field ordering starting at oat version 67
2015-10-01 22:50:35 -07:00
Ben Gruver
ea3fdd7e86
Merge branch 'master' into smalidea
2015-10-01 08:34:21 -07:00
Ben Gruver
827e2db34d
Add support for normalizing virtual methods
...
This is useful, for example, when comparing the result of deodexing with
the original dex file, to remove the "false" differences caused by the
different potential ways to reference a given virtual method.
2015-09-30 20:36:12 -07:00
Ben Gruver
c8c70ac58e
Add support for calculating field offsets for art
2015-09-30 20:36:12 -07:00
Ben Gruver
64785d79a3
Add support for using an oat file as the boot class path
2015-09-30 20:36:12 -07:00
Ben Gruver
8920228819
Add oat support in DexFileFactory
2015-09-30 20:36:12 -07:00
Ben Gruver
3ff884b1c3
Add art-specific opcodes and opcode values
2015-09-29 23:41:30 -07:00
Ben Gruver
e5266afb14
Add a minimal parser for oat files
2015-09-29 23:40:52 -07:00
Alex Light
c456c55c40
Make smali respect order of implements
...
Previously smali would reorder implements directives to be
alphabetical in the dex file. In the Java 8 Language the order of
interfaces may affect the order of initializer invocation when using
default methods. Therefore we will preserve this order in
smali/baksmai.
Bug: 24338722
Change-Id: I6851b02a5402c7d4cd4b60af54052c320e48d0bf
2015-09-24 13:04:30 -07:00
Ben Gruver
0c7e7b7ffc
Add ability to list methods/fields/types when assembling with smali
...
This can be useful in analyzing why you are going over the 64k
method/field/type limit
2015-09-05 16:11:21 -07:00
Ben Gruver
4d8ec4c795
Handle invalid debug item offsets more gracefully
2015-08-26 15:55:30 -07:00
Ben Gruver
3065d6b7de
Add backwards compatible version of DexFileFactory.loadDexFile and Opcodes
...
Keep the old prototype, so we don't break existing code.
2015-06-18 17:44:30 -07:00
Ben Gruver
b960e8950b
Replace a missed usage of Iterators.emptyIterator()
2015-06-18 17:40:57 -07:00
Ben Gruver
7c97ddbb45
Remove usages of the deprecated Iterators.emptyIterator() method
2015-06-18 13:34:12 -07:00
Ben Gruver
0f1e995099
Add the generated accessorTest to source control
...
Some java compilers don't generate the synthetic accessor methods in the
way that the accessorTest is trying to test. So we build the test dex
file using a known-good compiler and check it in, ensuring the test is
always run using an appropriate dex file.
2015-05-23 11:26:35 -07:00
Ben Gruver
abd113eb3b
Ensure the stream is closed in DexFileFactory.loadDexFile
2015-04-09 21:33:33 -07:00
Ben Gruver
75bef01d10
Merge branch 'master' into smalidea
2015-03-18 21:00:32 -07:00
Ben Gruver
1aad736c20
Ensure that sparse switch items are written out in the correct order
2015-03-17 21:18:19 -07:00
Ben Gruver
0c982a02f1
Add Member and Annotatable interfaces
2015-03-16 20:52:55 -07:00
Ben Gruver
bf167c2f0e
Make sure the elements are sorted in an encoded annotation
2015-03-16 20:36:34 -07:00
Ben Gruver
b76dee7ebd
Don't assume dx is on-path. Rather, grab it from maven central
...
The version of dx in maven central seems to be fairly old, but it works
well enough for our purposes.
2015-03-16 19:54:57 -07:00
Igor Murashkin
144951a9e9
Add lambda experimental dalvik opcodes
...
* Add new -X/--experimental flag to [dis]assemble opcodes not in art yet
* Add new opcodes liberate-variable, box-lambda, unbox-lambda,
capture-variable, create-lambda, invoke-lambda
* Add support for encoding 25x instructions
* Adds LambdaTest to check new opcodes assemble/disassemble properly
TODO: invoke-lambda-range
Change-Id: I5c8bcbfa8b6cb9a13ef2017fce2d1b7fda6e11c3
2015-03-16 11:40:58 -07:00
Ben Gruver
8c1d8ddef2
Merge branch 'master' into smalidea3
2015-03-04 20:58:14 -08:00
Ben Gruver
6a56d9a9e9
Merge pull request #29 from yirkha/master
...
Fix for Dalvik VM crash on parameter annotations
2015-03-03 18:08:44 -08:00
Ben Gruver
3279a8cd4b
Simplify how the accessorTest is built and run
2015-03-01 22:30:33 -08:00
Jiri Hruska
5dde46b43d
Fix for Dalvik VM crash on parameter annotations
...
Dalvik VM before Jelly Bean MR1 (4.2) crashes if there are any
NO_OFFSET (0) values in parameter annotation list.
(https://code.google.com/p/android/issues/detail?id=35304 )
2015-02-19 02:59:41 +01:00
Ben Gruver
e6da8cd564
Massage the tries before using them for method analysis
2015-02-01 20:14:37 -08:00
Ben Gruver
e778f7b865
Make the checkPackagePrivateAccess functionality an option
...
This is only needed for 4.2.0, but not 4.2.1. Both are api 17, so we can't
tie this functionality to an api level.
2014-12-28 15:03:02 -08:00
Ben Gruver
83ec5cf9a3
Merge pull request #25 from yyjdelete/patch-1
...
checkPackagePrivateAccess only for API 17(4.2)
2014-12-28 14:49:44 -08:00
Ben Gruver
d83c439ce2
Fix some generics issues when compiling with java 8
2014-12-28 14:15:08 -08:00
Ben Gruver
aae58716e7
Fix some javadoc issues
2014-12-28 14:14:19 -08:00
Ben Gruver
d15e31526f
Expose the various fixed-size item counts in DexBackedDexFile
2014-12-28 12:25:03 -08:00
Ben Gruver
7296c9e957
Refactor VariableSizeLookaheadIterator
...
Previously, when referencing instance fields from readNextItem,
the fields wouldn't have been initialized yet on the first call to
readNextItem
2014-12-28 12:15:17 -08:00
yyjdelete
d1dbf6b14b
Use options.checkPackagePrivateAccess
2014-11-14 21:59:08 +08:00
yyjdelete
62c103d92a
checkPackagePrivateAccess only for API 17(4.2)
...
Google revert this for compatibility.
see 7284c78e14
for details.
BTW, it seems that is also disabled for late 4.2
2014-11-14 20:50:13 +08:00