477 Commits

Author SHA1 Message Date
Ben Gruver
31ad2bc100 Refactor how classpath loading works 2016-09-19 09:08:53 -07:00
Ben Gruver
4c77ad7617 Minor fixes to OatVersions.txt 2016-09-19 09:08:53 -07:00
Ben Gruver
5544281ed6 Clean up some lint in ClassPath/ClassProto 2016-09-19 09:08:53 -07:00
Ben Gruver
db9f86dfdd Make getRegisterType throw AnalysisException instead of ExceptionWithContext
This will cause MethodAnalyzer to print more information when this occurs
2016-09-19 09:08:53 -07:00
Ben Gruver
26a4f1e603 Fix an issue with instance-of type inference
We should only infer the register type after an if-eqz/nez if it has a
single predecessor that is the instance-of instruction.
2016-09-19 09:08:53 -07:00
Ben Gruver
9ec379a561 Add support for vtable generation for post-default method ART
The interfaces are iterated over in a different order when populating the
vtable
2016-09-19 09:08:53 -07:00
Ben Gruver
d13be24e27 Don't propagate a non-narrowing conversion through a move 2016-09-17 21:30:28 -07:00
Ben Gruver
fbfe388e40 The list dex command should generate an error when used on a non-zip/oat file 2016-09-17 21:30:28 -07:00
Ben Gruver
d7d995cc2d Remove the now-unused experimental opcodes flag/functionality 2016-09-17 21:30:28 -07:00
Ben Gruver
e7e58a6996 Fix reading a dex file from a zip file 2016-09-04 14:00:01 -07:00
Ben Gruver
fdfb6d10f4 Update OatVersions.txt to version 86 2016-09-04 11:47:04 -07:00
Ben Gruver
22a2807101 Implement DexFileFactory.loadAllDexFiles 2016-08-30 22:36:15 -07:00
Ben Gruver
3587c6f2a6 Refactor DexFileFactory and implement new syntax for dex entries 2016-08-30 22:36:15 -07:00
Ben Gruver
41a5b4953c Fix the dump command to work with dex files in an oat file 2016-08-30 22:16:16 -07:00
Ben Gruver
4254a2073a Use a java 6-friendly string joiner 2016-08-27 12:01:35 -07:00
Ben Gruver
3735d4778f Merge branch 'master' into v2.2_WIP 2016-08-27 12:01:22 -07:00
Ben Gruver
7079014a29 Add more error detail when interfaces can't be fully resolved 2016-08-23 11:38:40 -07:00
Narayan Kamath
99b80bbc5a Revert "Add lambda experimental dalvik opcodes"
This reverts commit 144951a9e9e6c87866245f2bdeebf0ebedaa0e38.
2016-08-17 13:15:18 +01:00
Narayan Kamath
afc1f15939 smali/dexlib: deal with invoke-polymorphic / invoke-polymorphic/range.
- Introduces two new instruction formats, 45cc and 4rcc. As the name suggests,
  these instructions are similar to 35c and 3rc, expect that they encode an
  additional constant pool reference in their 4th byte.

- Introduce two new instructions, invoke-polymorphic and
  invoke-polymorphic/range - used to implement signature polymorphism.

- Allow instructions to directly reference the proto_id section of the
  dex file. This involves the introduction of a new kind of reference
  (MethodProtoReference) and has the side effect of cleaning up a fair
  amount of special casing in ProtoPool.

- Disable support for ART version based switches (and remove LambdaTest
  which depends on it). Experimental lambda support and support for ART
  version based switches will be removed in a follow up change.

Bug: 30550796
Test: test-art
Test: ./gradlew build
2016-08-17 13:03:12 +01:00
Ben Gruver
c347e68b46 Allow invalid register references in debug items related to locals.
Art doesn't complain about this, so we shouldn't throw an error when
encountering a dex file with something like this.
2016-07-10 21:35:07 -07:00
Ben Gruver
db49ae1d03 Track register narrowing via instance-of after a move 2016-05-28 18:52:26 -07:00
Ben Gruver
e474301e60 Revamp how classpath loading works 2016-05-28 18:51:42 -07:00
Ben Gruver
f84e0f4562 Fix up some nullness and other minor issues in MethodAnalyzer/AnalyzedInstruction 2016-05-16 16:58:54 -07:00
Ben Gruver
c4948a5c49 Add initial support for N preview odexes 2016-05-16 16:58:54 -07:00
Ben Gruver
bccdc809fa Add "list field offsets" and "list vtables" commands to baksmali
This is a reimplementation of the "DumpFields" and "DumpVtables" entry
points that were previously in dexlib2
2016-05-16 16:58:54 -07:00
Ben Gruver
90cacb9d0d Implement various list commands in baksmali
This adds commands to list strings, methods, fields, types and classes
2016-05-16 16:58:54 -07:00
Ben Gruver
735746595f Implement a new command line interface for smali 2016-05-16 16:58:54 -07:00
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