Adam
|
be1b8f1e98
|
various fixes to graph building. I think there is a problem with how the execution runs, where it is not exploring all paths, because I have v13 class133.method2817 -> v14 class133 method2828 and there is no edge on the rhs for method4060->method4081. I think it is from two branches jumping to a place which jumps to the same place after, with invoke instructions on both sides.
|
2015-11-11 14:49:12 -05:00 |
|
Adam
|
4ae0c954cd
|
Add integrity checks to methodinliner
|
2015-11-11 10:47:28 -05:00 |
|
Adam
|
be1d5ed010
|
Instruction clone wasnt creating new jump lists...
|
2015-11-10 20:39:17 -05:00 |
|
Adam
|
782fa9f70a
|
switch instructions can jump multiple times to the same place
|
2015-11-10 10:27:05 -05:00 |
|
Adam
|
3edf7e2f4c
|
Trying to run the better inliner so the graph matches up. Maybe instead figure out a way to passively ignored the static func calls. Regardless this assert fails due to a corrupted jump graph.
|
2015-11-09 21:18:21 -05:00 |
|
Adam
|
60d4cd94fd
|
This does 326 methods.
|
2015-11-09 19:58:15 -05:00 |
|
Adam
|
e1ce955f6e
|
doesn't work. graph stuff doesnt like ids of 0. and i need to reuse ids sometimes for some instructions, oops.
|
2015-11-08 21:02:36 -05:00 |
|
Adam
|
6ce5564e9f
|
Move stuff to functions
|
2015-11-07 22:40:51 -05:00 |
|
Adam
|
cb639749e1
|
Little cleanup of old stuff I was trying
|
2015-11-07 22:27:15 -05:00 |
|
Adam
|
25cb9b5f8b
|
This looks promising
|
2015-11-07 21:55:03 -05:00 |
|
Adam
|
ae82aad250
|
Make method inliner copy instead of move ins. I don't think the way it inlined exceptions before was correct. I had to make it not inline funcs with exception handlers
|
2015-11-06 17:49:24 -05:00 |
|
Adam
|
84fa11c8c8
|
I think i need exprs
|
2015-11-06 10:33:52 -05:00 |
|
Adam
|
8df59fb261
|
Fix test, fail in dup2_x1
|
2015-11-02 17:56:25 -05:00 |
|
Adam
|
483bdbc165
|
Add failing test, I think this should be passing
|
2015-11-01 19:07:13 -05:00 |
|
Adam
|
5e652a8799
|
Tests pass again. I see some cases of longs math not simplifying tho
|
2015-11-01 18:26:28 -05:00 |
|
Adam
|
695f7de686
|
Various Long work. this is making the int tests fail though
|
2015-11-01 17:47:49 -05:00 |
|
Adam
|
113363cd67
|
more work
|
2015-10-30 22:36:29 -04:00 |
|
Adam
|
8e68963f65
|
long work
|
2015-10-30 20:28:10 -04:00 |
|
Adam
|
1f716bf10d
|
Small fix found by test, not sure if it breaks the larger picture
|
2015-10-25 20:08:57 -04:00 |
|
Adam
|
018a3619a8
|
Call constructor so executor picks it up
|
2015-10-25 19:28:27 -04:00 |
|
Adam
|
85a4587143
|
Comment cleanup
|
2015-10-25 19:28:12 -04:00 |
|
Adam
|
9cf9c31f2d
|
This doesn't pass if this field isn't static
|
2015-10-25 19:20:17 -04:00 |
|
Adam
|
e81e46c68c
|
First modarith test
|
2015-10-25 19:11:25 -04:00 |
|
Adam
|
8e39328eca
|
Cleanup to prepare for tests
|
2015-10-25 14:19:48 -04:00 |
|
Adam
|
d7026aed78
|
recomment
|
2015-10-25 14:11:01 -04:00 |
|
Adam
|
e03d638c2e
|
I guess this is right?
|
2015-10-25 13:16:27 -04:00 |
|
Adam
|
5094943453
|
This works. Except for final fields, which I can evaluate later.
|
2015-10-23 15:46:03 -04:00 |
|
Adam
|
f21cbba8b5
|
Fix test
|
2015-10-23 12:27:44 -04:00 |
|
Adam
|
d4f40eaf03
|
Trying to fine tune stuff, found a *1 not removed which is messing with some stuff, added test
|
2015-10-23 12:04:23 -04:00 |
|
Adam
|
85c49413dd
|
guess more
|
2015-10-23 11:00:47 -04:00 |
|
Adam
|
bfb3a373c9
|
idk what im using, use multiplication expr to determine if another field is in the mix
|
2015-10-22 21:50:51 -04:00 |
|
Adam
|
9f17dec605
|
idr
|
2015-10-22 17:51:11 -04:00 |
|
Adam
|
5f6b01f4a0
|
1/0 works once again, maybe.
|
2015-10-22 11:01:43 -04:00 |
|
Adam
|
2f5f9861ef
|
one/zero? obs arent handling stuff right, add test. now im setting null on instructions some places they fail
|
2015-10-22 09:53:56 -04:00 |
|
Adam
|
bd2e62c22f
|
Ran it a few times, is reobbing some stuff, seems not worse than the old stuff?
|
2015-10-21 21:37:31 -04:00 |
|
Adam
|
d59a1fa88f
|
isBig isnta lways right
|
2015-10-21 17:36:28 -04:00 |
|
Adam
|
6b41999fb5
|
Random thinking
|
2015-10-20 16:50:12 -04:00 |
|
Adam
|
c2e1da7125
|
Java 8. This finally settles down by leaves many fields still obfuscated.
|
2015-10-19 21:14:21 -04:00 |
|
Adam
|
19cd153e37
|
Oh this was important
|
2015-10-19 15:24:43 -04:00 |
|
Adam
|
6c038e7fa6
|
Make generic load/store instructions. Unused params was replacing ins which requires a reexecution, but it wasn't
|
2015-10-19 15:23:01 -04:00 |
|
Adam
|
98143941b3
|
Unused params is causing problems after being run a few times :(
|
2015-10-18 22:03:46 -04:00 |
|
Adam
|
75364815aa
|
Unused params is not working
|
2015-10-18 20:34:20 -04:00 |
|
Adam
|
9678bff181
|
Update gitignore
|
2015-10-18 18:44:54 -04:00 |
|
Adam
|
d6f9509e5a
|
Rename lookup2 -> lookup
|
2015-10-18 18:44:43 -04:00 |
|
Adam
|
95c4c441d0
|
Rewrite rename unique to work much different. Seems to run ok.
|
2015-10-18 18:41:04 -04:00 |
|
Adam
|
f43a926e61
|
Not sure if this is right, but two different ins ctxs were popping this, but the same instruction, so I made it compare instructions
|
2015-10-17 23:16:13 -04:00 |
|
Adam
|
46955ddcbc
|
move named/whirlpool out of member fields
|
2015-10-17 20:43:31 -04:00 |
|
Adam
|
4938226071
|
crc/whirlpool for archives
|
2015-10-17 20:35:37 -04:00 |
|
Adam
|
eee5f72d4e
|
Add disabled test to dump cache
|
2015-10-17 20:19:37 -04:00 |
|
Adam
|
0c022eef3e
|
Check crc/whirlpool of archives
|
2015-10-17 20:19:19 -04:00 |
|
Adam
|
9b5a7981aa
|
So there are archives not in the index, not sure what to do with it
|
2015-10-17 16:28:52 -04:00 |
|
Adam
|
5e28fe9768
|
Use apache compression commons for compressing gzip
|
2015-10-17 16:07:41 -04:00 |
|
Adam
|
9125e65e60
|
After some digging, it looks like this is bzip1 and not bzip2
|
2015-10-17 15:28:07 -04:00 |
|
Adam
|
52e631b74e
|
gzip compressoin test
|
2015-10-17 14:23:54 -04:00 |
|
Adam
|
723a48c903
|
cleanup crc generator
|
2015-10-17 14:17:20 -04:00 |
|
Adam
|
b21022d207
|
Merge gzip comp/decomp into one file
|
2015-10-17 14:13:34 -04:00 |
|
Adam
|
7c7de16025
|
refactor move utils
|
2015-10-17 14:12:04 -04:00 |
|
Adam
|
c36ff0c5bd
|
cleanup
|
2015-10-17 11:49:01 -04:00 |
|
Adam
|
a16bf14e08
|
datafile can handle all of the compression
|
2015-10-17 11:47:26 -04:00 |
|
Adam
|
62f3fb1671
|
More cleanup
|
2015-10-16 20:45:54 -04:00 |
|
Adam
|
d4c19592e1
|
The cleanup begins
|
2015-10-16 20:03:39 -04:00 |
|
Adam
|
2cc48ae9b0
|
Test multiple indexes/archives
|
2015-10-16 19:44:42 -04:00 |
|
Adam
|
7e580f0f0b
|
Set file name hashes
|
2015-10-16 19:39:32 -04:00 |
|
Adam
|
c42617490d
|
Test more files
|
2015-10-16 19:27:30 -04:00 |
|
Adam
|
302f0bcfe1
|
Wow I wasn't even close
|
2015-10-16 19:26:43 -04:00 |
|
Adam
|
ad63c9d423
|
multi store test, doesnt work
|
2015-10-16 18:44:43 -04:00 |
|
Adam
|
298d623bbf
|
Add equals methods on objects, use for storetest
|
2015-10-16 12:52:38 -04:00 |
|
Adam
|
bd5d57e94c
|
Try with resource in storetest
|
2015-10-16 12:42:59 -04:00 |
|
Adam
|
4752eb160c
|
store test of one file works
|
2015-10-16 12:40:51 -04:00 |
|
Adam
|
0bcc7842ec
|
Very untested saving, but the bulk of the code is there
|
2015-10-15 16:00:42 -04:00 |
|
Adam
|
567d8b80ca
|
This actually does work if you don't try to load encrypted archives. Begin work to allow saving/loading in memory for tests. woo.
|
2015-10-14 19:03:32 -04:00 |
|
Adam
|
c2ee0cdf67
|
Well this doesnt work at all
|
2015-10-14 17:33:06 -04:00 |
|
Adam
|
649bec406d
|
File loading. No clue if this is right.
|
2015-10-14 14:09:31 -04:00 |
|
Adam
|
df2db1c84c
|
Put Indexes in store, and indexfile in index
|
2015-10-14 10:02:09 -04:00 |
|
Adam
|
634d5ec325
|
Untested save archive
|
2015-10-13 21:47:38 -04:00 |
|
Adam
|
e2f90f2c95
|
Rest of index loading? untested
|
2015-10-13 21:21:53 -04:00 |
|
Adam
|
92faf3fa48
|
Backup save of archive loading
|
2015-10-13 17:04:18 -04:00 |
|
Adam
|
a557663044
|
datafile id should have been a parameter
|
2015-10-13 10:04:57 -04:00 |
|
Adam
|
2e118bb391
|
Init of store loading, what is datafile id
|
2015-10-13 09:59:37 -04:00 |
|
Adam
|
4f1f75c88f
|
Cleanup/bugfixes
|
2015-10-13 09:50:50 -04:00 |
|
Adam
|
142e432403
|
Use TemporaryFolder for tests
|
2015-10-13 09:37:23 -04:00 |
|
Adam
|
ec9f22fa33
|
Closeable
|
2015-10-12 21:20:46 -04:00 |
|
Adam
|
50a30553b9
|
Add basic store object
|
2015-10-12 21:16:03 -04:00 |
|
Adam
|
57a55d43e1
|
Add basic index file reader/writer and basic test
|
2015-10-12 21:08:46 -04:00 |
|
Adam
|
ee265a6342
|
A little cleanup
|
2015-10-12 20:46:01 -04:00 |
|
Adam
|
07af5cef90
|
Begin work on DataFile
|
2015-10-12 20:34:53 -04:00 |
|
Adam
|
c9a0c7bc55
|
Comment out failing test I will address later
|
2015-10-12 17:42:13 -04:00 |
|
Adam
|
5b48ccef29
|
Merge branch 'master+arith'
Conflicts:
src/main/java/net/runelite/deob/deobfuscators/MethodInliner.java
|
2015-10-12 17:41:06 -04:00 |
|
Adam
|
99985d7d6f
|
class172/field2976 passed to invoke is not simplified
|
2015-10-11 19:38:36 -04:00 |
|
Adam
|
a0cb4c96d6
|
loop multi stuff
|
2015-10-10 22:05:36 -04:00 |
|
Adam
|
76206edeff
|
More guessing stuff. Need an isobfuscated() func.
|
2015-10-10 22:05:25 -04:00 |
|
Adam
|
734f15fa4a
|
More tests/fixes I dont know if this is right
|
2015-10-10 21:15:07 -04:00 |
|
Adam
|
27f2edbea6
|
Limited support for getting around iload/istore, Add test too. Seems to work?
|
2015-10-10 16:21:22 -04:00 |
|
Adam
|
db089ab628
|
Small fixups i guess
|
2015-10-10 15:21:45 -04:00 |
|
Adam
|
bd427975ae
|
Cleanup some of the old encr stuff
|
2015-10-10 10:35:20 -04:00 |
|
Adam
|
fd973a0a95
|
Check per pop if its multiple places or not
|
2015-10-09 14:14:14 -04:00 |
|
Adam
|
0bc49e1ec6
|
Fix fieldmover build? Not sure if this is correct. This mul test doesn't cover what I was trying to fix, field721 = (-1 != var5 && 1 != var5?(class139.field2363 * 1381104939 + 1 * field721 * 1) / 2:1381104939 * class139.field2363) * 1807370871 * 981643079;
|
2015-10-08 21:00:45 -04:00 |
|
Adam
|
9b4f4242eb
|
hey this passes the test but doesnt compile. allow tracking more than one pops for stackctx.
|
2015-10-08 17:30:00 -04:00 |
|
Adam
|
f4c004b7ad
|
Add more to test, this fails
|
2015-10-07 17:20:02 -04:00 |
|
Adam
|
86bddfed9b
|
This fixes the test, although there are simply multiplication expressions not being simplified now in the same expr
|
2015-10-07 15:23:54 -04:00 |
|