rocky
28d0ec7a2a
Merge branch 'master' into python-2.4
2018-03-02 08:06:53 -05:00
rocky
8d503682b3
Use get_inst and self.insts more..
...
needed more in 3.6 to handle EXTENDED_ARGS before JUMP_xxx
2018-03-02 07:15:23 -05:00
rocky
a1532bbfea
Merge branch 'master' into python-2.4
2018-02-27 10:40:40 -05:00
rocky
c43c9a19aa
Move to GPL3 license
2018-02-27 06:40:36 -05:00
rocky
b584a0f6b0
More EXTENDED_ARGS woes on 3.6+
2018-02-25 22:42:18 -05:00
rocky
2f6a85d538
Merge branch 'master' into extended_args
2018-02-25 19:19:32 -05:00
rocky
8c0f256b78
Sync python2 and python3 scanner/injest code more
2018-02-25 09:42:04 -05:00
rocky
75755c8cfc
Merge branch 'master' into python-2.4
2018-01-31 16:46:04 -05:00
rocky
c433d2d9a7
Fix extended_arg breakage from last commit
2018-01-29 21:43:15 -05:00
rocky
a8fe985ed3
Add a scanner next_offset() routine
...
Remove extended_arg_val() as that is now in xdis
2018-01-29 21:36:19 -05:00
rocky
7c9437f0a9
Merge branch 'master' into python-2.4
2018-01-18 01:27:52 -05:00
rocky
ebb9f1a53f
Python 2.6 compatibility
2018-01-18 01:25:38 -05:00
rocky
96ddef3920
Handle 3.5.2..3.5.2 magic...
...
And handle magic better overal by improved xdis use
2018-01-18 01:15:19 -05:00
rocky
9041dead7f
Merge branch 'master' into python-2.4
2018-01-07 21:36:19 -05:00
rocky
15057bed1d
Fix bugs in scanner.last_instr()...
...
And ave instruction stream self.insts like we do in Python 3 so we
can start simplifying code.
2017-12-15 20:34:34 -05:00
rocky
27b217a4ed
Merge branch 'master' into python-2.4
2017-12-09 04:53:21 -05:00
rocky
b6413b6e6e
Skirt around control-flow problems...
...
Tag some of the weaknesses if we can't address them now
2017-12-07 08:55:45 -05:00
rocky
c0e553dbb5
Merge branch 'master' into python-2.4
2017-11-13 10:11:00 -05:00
rocky
6746e5167d
Add Python 3.6.3 scanner lookup
2017-11-04 11:13:55 -04:00
rocky
5df09540b5
Python 3.6-inspired instruction size cleanup
...
Revise and generalize for Python 3.6+ instructions vs < 3.6 instuctions.
Used more of the generalized methods in xdis and remove some (but not
all) of the magic numbers.
This is a lot of changes, but not all of the refactoring needed. Much
crap still remains. Also, there are still bugs in handling 3.6 bytecodes.
2017-10-29 11:46:28 -04:00
rocky
c796d6a799
Merge commit '1d7a3c6444eab5a02d899f789f2a57cfdcbc5a84' into python-2.4
2017-10-10 22:50:28 -04:00
rocky
0654aed6c8
Get ready for release 2.12.0
2017-09-25 20:08:50 -04:00
rocky
7b38d2f1f8
Adjust for xdis opcode JUMP_OPS. release 2.12.0
2017-09-25 20:01:31 -04:00
rocky
7844456e1e
Skeletal support for Python 3.7
...
Largely failing though.
2017-08-31 10:12:09 -04:00
rocky
ce5066bddb
Merge branch 'master' into python-2.4
2017-08-15 11:12:20 -04:00
rocky
d1e02afb4b
Misc cleanups...
...
remove code now in xdis
require at least xdis 3.5.4
PyPy tolerance in validate testing
2017-08-15 09:41:39 -04:00
rocky
93f18e2449
Allow version to be string...
...
in get_python_parser and get_scanner
2017-08-13 09:23:27 -04:00
rocky
f4ceb6304d
Allow 3-part version string lookups, e.g 2.7.1
...
We allow a float here, but if passed a string like
'2.7'. or '2.7.13', accept that in looking up
either a scanner or a parser.
2017-08-13 09:17:07 -04:00
rocky
4c9cd5657e
Merge branch 'master' into python-2.4
2017-08-09 21:45:50 -04:00
rocky
27ab6fe2f5
Use xdis 3.5.0's opcode sets
2017-07-08 20:41:46 -04:00
rocky
6888553773
Merge branch 'master' into python-2.4
2017-06-25 18:56:31 -04:00
rocky
af3d46b35c
Use xdis' instruction offset calculation fns..
...
next_offset, op_size, has_argument
2017-06-24 06:43:04 -04:00
rocky
d4dab54c7b
Merge branch 'master' into python-2.4
2017-05-30 02:18:57 -04:00
rocky
f8a40c1949
Reduce spurious "continue" statements
2017-05-07 13:15:26 -04:00
rocky
f7a910ec66
Merge branch 'master' into python-2.4
2017-03-01 05:55:26 -05:00
rocky
160ec0d9cc
COME_FROM for 3.x POP_EXCEPT, DRY with op_name() ...
...
Start adding COME_FROMs for POP_EXCEPT in preparation for
getting tryelse blocks correct.
Simpler opname access functions:
- self.op_name(op) is self.opc.opname[op]
- self.op_name_from_offset(offset) is self.opc.opname[self.code[offset]]
verify.py: not all offsets are ints
2017-03-01 05:50:31 -05:00
rocky
fab4ebb768
Merge changes ...
...
* str() in Python 2.4 doesn't detect unicode.
* index() doesn't work on tuples
* ifelse change
2017-01-11 19:34:28 -05:00
rocky
89429339fa
Merge branch 'master' into python-2.4
2017-01-11 19:25:44 -05:00
rocky
3f40c16587
Fix 3.5, 3.6 while true if/break bug
2017-01-08 15:54:49 -05:00
rocky
e2fb7ca3d2
Python 2.6/2.7 tolerance in Python 2.4 branch
2016-12-17 06:51:47 -05:00
rocky
b3bda76582
Merge branch 'master' into python-2.4
2016-12-16 22:56:07 -05:00
rocky
7755563b65
Some Python 3.6 bytecode->wordcode fixes
2016-12-15 02:54:25 -05:00
rocky
1a8a0df107
Merge branch 'master' into python-2.4
2016-12-04 13:40:06 -05:00
rocky
d22931cb49
Get ready for release 2.9.7
...
Some of the many lint things. Linting is kind of stupid though.
2016-12-04 09:36:30 -05:00
rocky
a9349b8f3d
Making it run on Python 2.4 and 2.5
2016-11-23 07:53:51 -05:00
rocky
7daec3352c
Start to attack Python 3.1 def() -> xx construct
...
Start to localize make_function routines by Python version
2016-10-26 08:20:19 -04:00
rocky
d6f7ef4e17
DRY op_size
...
Move from scanner{2,3}.py to scanner.py
2016-10-21 07:40:35 -04:00
rocky
8b240a80e7
Get ready for release 2.9.0 ...
...
- Use xdis 3.0.0 protocol load_module. Needs bump in requirements.txt
and _pkg_info_.py
- Start Python 1.5 decompiling - another round of work is needed to remove
bugs
- small cleanups
2016-10-10 09:33:49 -04:00
rocky
056f600da1
Start Python 2.1 bytecode decompile
2016-10-07 22:42:30 -04:00
rocky
c7788e4545
disassemble -> ingest where appropriate
...
As part of tokenization for (de)parsing, we need to do something like a
disassembly, but is is really a little different.
Disassembly, strictly speaking, is done by the xdis module now.
What "ingestion" does is massage the instruction tokens to a form that is
more amenable for parsing.
In sum, ingestion is different than disassembly, although disassembly is
generally the first part of ingestion.
2016-09-04 11:43:02 -04:00
