Adam
92b053548a
Fix handling invokevirtual on static methods
2016-02-27 13:37:41 -05:00
Adam
fb4ee1ac9b
Store return stack pop with stack context instead of what I was trying to do before
2016-02-27 12:58:44 -05:00
Adam
5fea3a9c31
Map multiple field comparison ifs, this maps all of my test rl fields
2016-02-27 12:33:13 -05:00
Adam
19f2807c86
Mapping packet handlers works some. Tried to add inlining of results of static methods. Doesnt work well because it inf loops so its disabled usually. I think instead I can track this separately on the stack context and fix resolve() to deal with it.
2016-02-27 11:38:44 -05:00
Adam
83f338a2e9
Dont know if this is right, but the pkt handlers at least can be picked up now.
2016-02-14 18:33:51 -05:00
Adam
3294e1add0
This took awhile to find.
2016-02-14 15:21:05 -05:00
Adam
d9fc79bba5
Test to see how many of the RL fields are mapped. Most but not all.
2016-02-14 00:10:00 -05:00
Adam
4d81829128
Beginning of rename deob
2016-02-13 23:38:58 -05:00
Adam
8f6efa7717
Remove old graph stuff, all tests pass
2016-02-13 22:51:11 -05:00
Adam
c1bd2d199e
Fix tests
2016-02-13 22:28:40 -05:00
Adam
770e1f6b2f
resolve multidimensional arrays
2016-02-13 20:54:44 -05:00
Adam
d833b53646
map value of putfields
2016-02-13 19:00:18 -05:00
Adam
71e0a6d996
Require frames to be crashed too to not map, adds +100
2016-02-13 18:48:43 -05:00
Adam
bcc74c6256
Map field of invoked object too
2016-02-13 18:02:20 -05:00
Adam
66e9960596
this wont work because exception handlers arent run so it wont see all returns
2016-02-13 17:07:01 -05:00
Adam
8efd637a87
Attempt to map non static methods using PME too
2016-02-12 15:34:52 -05:00
Adam
466da0bcb3
Map invoke arguments
2016-02-12 15:11:15 -05:00
Adam
1272d7b263
Compare method signatures when comparing invokes
2016-02-12 15:00:41 -05:00
Adam
bf03c60731
Map fields from ifs
2016-02-12 14:56:32 -05:00
Adam
cdc949abe0
pop stack more, I dont know if this is right, but maps a couple more fields
2016-02-12 13:30:01 -05:00
Adam
d4b148f72a
Including mapper map stuff in
2016-02-12 12:03:49 -05:00
Adam
4021e3d02f
Interesting work using pme to detect method equality
2016-02-11 22:54:18 -05:00
Adam
602afc964c
Make isSame sanity check more in set/put field and invokes
2016-02-10 20:33:45 -05:00
Adam
2bfbe1f239
This can map some but not nearly enough. Main problem seems to be the order of the packet handlers is scrambled, as well as their ids.
...
Maybe try detecting/treating the packet handlers as separate "functions" and compare them by seeing if PME can run over both?
Maybe try hardening PME mapper to fail more easily (eg setfield of field of two different types, or invoke with wrong signatures?), and then try and brute force methods in general.
Can also map methods with unique signatures that are non static method<->method.
client clinit?
2016-02-09 19:45:39 -05:00
Adam
0662e74369
I dont know why this runs forever.
2016-02-07 21:03:20 -05:00
Adam
c4bf4f65df
Actually I think I can just stop the frame if it crashes. This runs forever for some reason.
2016-02-07 14:27:19 -05:00
Adam
6906c81455
Mapping of static methods when stepping out in pme
2016-02-07 11:32:18 -05:00
Adam
9b2bda10cb
This file was important
2016-02-06 16:10:15 -05:00
Adam
74100b152d
Track array stores too, seems to run?
2016-02-06 13:28:41 -05:00
Adam
2854abfb08
init field order fix
2016-02-05 20:22:13 -05:00
Adam
e9103882b4
Also ignore javax. Now on init order ob.
2016-02-05 18:39:54 -05:00
Adam
dd0a96436e
ifnonnull vs ifnull
2016-02-05 16:00:51 -05:00
Adam
e2afbd3b98
Working on all tests again, hitting more ifconds not lining up
2016-02-05 15:54:33 -05:00
Adam
54b83ebda5
Forget trying to keep a 1<->1 of the frames
...
I guess this makes it a little more robust but is less complex.
The previous test function actually had code changes it seems and
so I moved it to a simplier function which seems to pass ok..
2016-02-05 14:57:38 -05:00
Adam
ac9282da76
I think i see why.
2016-02-03 21:25:58 -05:00
Adam
4aa8b23dfd
well this gets further
2016-02-01 20:14:57 -05:00
Adam
949ce54fb9
I think i see why.
2016-02-01 16:59:41 -05:00
Adam
3faa876ff7
this is all wrong
2016-01-31 22:18:57 -05:00
Adam
9d3ba7e1cf
XXX WIP TOTALLYWRONG. pmes are stopping prematurely because returnTo is not being kept across frame dups. if I enable it, i get assert fails on frame.other.
...
This also always steps into invokestatics, for when two are invoked but not really the same function.
2016-01-31 20:49:54 -05:00
Adam
8e73f37eba
boolean ifeq vs ificmpne. I want to unwrap these smaller ifs into larger ones to simplify code.
2016-01-30 16:29:22 -05:00
Adam
cbe45eddfe
Keep real type of stack contexts, which I think I need later. Exec test passes, not sure of other implications of this.
2016-01-30 15:56:36 -05:00
Adam
2a3b9158ea
ifcmpge vs ifcmplt
2016-01-30 14:06:23 -05:00
Adam
2b4c47fb25
ifacmpeq vs ifnonnull, ifeq vs ificmpne
2016-01-30 13:56:58 -05:00
Adam
234e42a319
Fix previous commit
2016-01-30 13:52:35 -05:00
Adam
f96f9b6c02
ificmpne to ificmpeq
2016-01-30 11:31:52 -05:00
Adam
d24411e63f
Make test files configurable
2016-01-30 11:14:02 -05:00
Adam
c8d29e3be4
Should be looking up all methods in invokevirtual, not just based off of the pool method and up. With test=true this fails on the constructor inlined constant value obfuscation.
2016-01-29 21:52:39 -05:00
Adam
f50c6523c0
hm
2016-01-29 21:24:07 -05:00
Adam
39ac3f1d68
ifnull
2016-01-29 20:38:24 -05:00
Adam
def680fb9c
iflt
2016-01-29 20:31:22 -05:00
Adam
fac66bfe52
Test all deep
2016-01-25 16:32:33 -05:00
Adam
91ff039691
I dont know if this is right but test all passes again
2016-01-25 16:27:53 -05:00
Adam
6da0b66b2f
Merge branch 'master+rename5' into HEAD
2016-01-25 16:22:03 -05:00
Adam
e5e101214c
ahhhhhhhhhhhhhhhhhhh
2016-01-25 16:13:21 -05:00
Adam
b816944029
hm this is horrible
2016-01-25 14:43:55 -05:00
Adam
951a6699c8
711 vs 742 but not the same
2016-01-25 13:44:08 -05:00
Adam
a0a2054187
ifacmpeq vs ifacmpne, fix ordering methods on initial mappings
2016-01-25 12:00:12 -05:00
Adam
1bbb2f2250
ifle <-> ifgt, work on all mapping test
2016-01-25 11:41:44 -05:00
Adam
a56e2b2783
Experimenting with using parallel executor for all mapping
2016-01-24 13:22:10 -05:00
Adam
d328551750
Trying to see if I can run pme on client init. Failing between unequal number of java string invokes
2016-01-17 20:29:23 -05:00
Adam
c632beac50
another test
2016-01-17 17:00:43 -05:00
Adam
a82a9ba4b9
I guess when I rebuilt the test jar the order of the classes changed, 1->100 not 1->2, which made the class inheritance order inconsistent
2016-01-17 11:32:14 -05:00
Adam
67d8bfed47
I don't know why this is failing
2016-01-14 21:02:07 -05:00
Adam
90d5f5ead0
Add to test
2016-01-13 18:16:39 -05:00
Adam
35ca054da8
mappable test seems to not work well, I think because of static methods
2016-01-13 18:02:36 -05:00
Adam
3b4ea9ce0d
More tests
2016-01-13 14:58:15 -05:00
Adam
28abf2f343
mapOtherBranch stuff, seems to run
2016-01-13 12:34:05 -05:00
Adam
99c51051fe
Began thinking about this branch thing
2016-01-13 10:31:33 -05:00
Adam
47b30983cb
Add to test
2016-01-11 12:23:03 -05:00
Adam
f81edec171
Don't have findMethodFromClass add methods twice, happens if finding first from a parent class
2016-01-11 12:18:44 -05:00
Adam
44372c8696
Another method
2016-01-11 08:44:49 -05:00
Adam
f418d95b84
Add another method
2016-01-10 19:00:37 -05:00
Adam
6dc905a347
thats weird, map static test passes on vmethod3054 vs vmethod2973
2016-01-08 16:25:29 -05:00
Adam
02a4041306
Need to split aeq from ieq
2016-01-03 20:33:57 -05:00
Adam
eef43dd913
Actually this
2016-01-03 19:58:46 -05:00
Adam
261e195ea5
Add isSame(). I guess I changed the methods being tested too.
2016-01-03 18:38:37 -05:00
Adam
d029c128e3
Allow parallel mapping executor to step through static methods if it encounters an invokestatic that doesn't match the other executor. Maybe works. Hitting an ifnull vs if check fail in my test.
2016-01-01 19:01:40 -05:00
Adam
6bb02614ca
Skip ctors and class initializers, and exception frames for now in parallel executor. Found a case of ifeq with one side null vs ifnull, so, need to write some if logic.
2015-12-31 18:49:48 -05:00
Adam
c5941c5f6a
Fix tests
2015-12-31 13:20:46 -05:00
Adam
a495c5c905
Solved methods 860, solved fields 856, unsolved methods 253, unsolved fields 1439 - I guess because i changed how graph building works
2015-12-13 17:57:25 -05:00
Adam
5e8681adfd
parallel mapping executor
2015-12-13 16:14:28 -05:00
Adam
5ca2e373f5
Test seems promising
2015-12-13 12:39:48 -05:00
Adam
69600fbf4e
Split up if/if0s for mapping stuff, maybe
2015-12-13 00:38:14 -05:00
Adam
a0a0d1e645
Remove old frame stuff
2015-12-12 19:33:58 -05:00
Adam
3ce0b0a7b9
Add graphbuilder to statically build graph
2015-12-12 15:19:55 -05:00
Adam
540c1ac5af
Some fixes.
2015-12-12 12:30:12 -05:00
Adam
24aecb8828
Seeing a weird discrepency with edgecount here
2015-12-06 18:35:03 -05:00
Adam
534623316e
Solved methods 942, solved fields 1295, unsolved methods 171, unsolved fields 1000
2015-12-06 17:53:49 -05:00
Adam
034a5d53aa
Solved methods 942, solved fields 1271, unsolved methods 171, unsolved fields 1024
2015-12-06 15:42:03 -05:00
Adam
12ca546701
Start tracking values places if possible. Interesting changes to iinc where vctx now has no stack contextt (as it shouldn't?). Not sure what else that will break.
2015-12-05 23:43:16 -05:00
Adam
9b2b5fdecf
hn
2015-12-05 18:42:16 -05:00
Adam
b9b2ef70f2
more or less promising
2015-12-04 23:30:45 -05:00
Adam
5cbd36a25c
Solved methods 940, solved fields 1084, unsolved methods 173, unsolved fields 1211. also included jars i am using
2015-11-29 20:49:03 -05:00
Adam
a2581e62c1
total crap
2015-11-28 23:27:34 -05:00
Adam
1f778cfd67
Add export test to check all exports are met from RL
2015-11-26 22:17:49 -06:00
Adam
b2e91c72d0
A lot of fields still can't be mapped. I am not able to map all fields
...
exported from RL at all.
Might try and get more specific stuff from fields like:
Other fields used in expressions
Assigning values to fields from LVT (parameters)?
Passed to methods, and at what index
2015-11-26 21:58:31 -06:00
Adam
c55c2f7399
Solved methods 952, solved fields 1028, unsolved methods 106, unsolved fields 1267
2015-11-26 11:07:35 -06:00
Adam
e1d207c637
849
2015-11-25 19:31:03 -06:00
Adam
4af665e58f
576 methods
2015-11-25 18:55:45 -06:00
Adam
f540d76b47
Idr this. Some fields have different accessors (at least public) between versions and is messing with this.
2015-11-24 22:20:12 -06:00