mirror of
https://github.com/zrax/pycdc.git
synced 2026-06-23 11:34:07 +00:00
Add pycdas support for Python 2.7
This commit is contained in:
Michael Hansen
parent
6f67603858
commit
b45c30cc59
4 changed files with 234 additions and 154 deletions
83
bytecode.cpp
83
bytecode.cpp
|
|
@ -99,6 +99,57 @@ const char* Py2k::OpcodeNames[256] = {
|
|||
"<248>", "<249>", "<250>", "<251>", "<252>", "<253>", "<254>", "<255>",
|
||||
};
|
||||
|
||||
const char* Py2k::OpcodeNames27[256] = {
|
||||
"STOP_CODE", "POP_TOP", "ROT_TWO", "ROT_THREE", "DUP_TOP", "ROT_FOUR",
|
||||
"<6>", "<7>", "<8>", "NOP",
|
||||
"UNARY_POSITIVE", "UNARY_NEGATIVE", "UNARY_NOT", "UNARY_CONVERT",
|
||||
"<14>", "UNARY_INVERT", "<16>", "<17>", "<18>",
|
||||
"BINARY_POWER", "BINARY_MULTIPLY", "BINARY_DIVIDE", "BINARY_MODULO",
|
||||
"BINARY_ADD", "BINARY_SUBTRACT", "BINARY_SUBSCR", "BINARY_FLOOR_DIVIDE",
|
||||
"BINARY_TRUE_DIVIDE", "INPLACE_FLOOR_DIVIDE", "INPLACE_TRUE_DIVIDE",
|
||||
"SLICE+0", "SLICE+1", "SLICE+2", "SLICE+3",
|
||||
"<34>", "<35>", "<36>", "<37>", "<38>", "<39>",
|
||||
"STORE_SLICE+0", "STORE_SLICE+1", "STORE_SLICE+2", "STORE_SLICE+3",
|
||||
"<44>", "<45>", "<46>", "<47>", "<48>", "<49>",
|
||||
"DELETE_SLICE+0", "DELETE_SLICE+1", "DELETE_SLICE+2", "DELETE_SLICE+3",
|
||||
"STORE_MAP", "INPLACE_ADD", "INPLACE_SUBTRACT", "INPLACE_MULTIPLY",
|
||||
"INPLACE_DIVIDE", "INPLACE_MODULO",
|
||||
"STORE_SUBSCR", "DELETE_SUBSCR", "BINARY_LSHIFT", "BINARY_RSHIFT",
|
||||
"BINARY_AND", "BINARY_XOR", "BINARY_OR", "INPLACE_POWER", "GET_ITER", "<69>",
|
||||
"PRINT_EXPR", "PRINT_ITEM", "PRINT_NEWLINE", "PRINT_ITEM_TO",
|
||||
"PRINT_NEWLINE_TO", "INPLACE_LSHIFT", "INPLACE_RSHIFT", "INPLACE_AND",
|
||||
"INPLACE_XOR", "INPLACE_OR",
|
||||
"BREAK_LOOP", "WITH_CLEANUP", "LOAD_LOCALS", "RETURN_VALUE",
|
||||
"IMPORT_STAR", "EXEC_STMT", "YIELD_VALUE", "POP_BLOCK", "END_FINALLY",
|
||||
"BUILD_CLASS",
|
||||
"STORE_NAME", "DELETE_NAME", "UNPACK_SEQUENCE", "FOR_ITER", "LIST_APPEND",
|
||||
"STORE_ATTR", "DELETE_ATTR", "STORE_GLOBAL", "DELETE_GLOBAL", "DUP_TOPX",
|
||||
"LOAD_CONST", "LOAD_NAME", "BUILD_TUPLE", "BUILD_LIST", "BUILD_SET",
|
||||
"BUILD_MAP", "LOAD_ATTR", "COMPARE_OP", "IMPORT_NAME", "IMPORT_FROM",
|
||||
"JUMP_FORWARD", "JUMP_IF_FALSE_OR_POP", "JUMP_IF_TRUE_OR_POP",
|
||||
"JUMP_ABSOLUTE", "POP_JUMP_IF_FALSE", "POP_JUMP_IF_TRUE",
|
||||
"LOAD_GLOBAL", "<117>", "<118>", "CONTINUE_LOOP",
|
||||
"SETUP_LOOP", "SETUP_EXCEPT", "SETUP_FINALLY", "<123>",
|
||||
"LOAD_FAST", "STORE_FAST", "DELETE_FAST", "SET_LINENO", "<128>", "<129>",
|
||||
"RAISE_VARARGS", "CALL_FUNCTION", "MAKE_FUNCTION", "BUILD_SLICE",
|
||||
"MAKE_CLOSURE", "LOAD_CLOSURE", "LOAD_DEREF", "STORE_DEREF", "<138>", "<139>",
|
||||
"CALL_FUNCTION_VAR", "CALL_FUNCTION_KW", "CALL_FUNCTION_VAR_KW", "SETUP_WITH",
|
||||
"<144>", "EXTENDED_ARG", "SET_ADD", "MAP_ADD", "<148>", "<149>", "<150>", "<151>",
|
||||
"<152>", "<153>", "<154>", "<155>", "<156>", "<157>", "<158>", "<159>",
|
||||
"<160>", "<161>", "<162>", "<163>", "<164>", "<165>", "<166>", "<167>",
|
||||
"<168>", "<169>", "<170>", "<171>", "<172>", "<173>", "<174>", "<175>",
|
||||
"<176>", "<177>", "<178>", "<179>", "<180>", "<181>", "<182>", "<183>",
|
||||
"<184>", "<185>", "<186>", "<187>", "<188>", "<189>", "<190>", "<191>",
|
||||
"<192>", "<193>", "<194>", "<195>", "<196>", "<197>", "<198>", "<199>",
|
||||
"<200>", "<201>", "<202>", "<203>", "<204>", "<205>", "<206>", "<207>",
|
||||
"<208>", "<209>", "<210>", "<211>", "<212>", "<213>", "<214>", "<215>",
|
||||
"<216>", "<217>", "<218>", "<219>", "<220>", "<221>", "<222>", "<223>",
|
||||
"<224>", "<225>", "<226>", "<227>", "<228>", "<229>", "<230>", "<231>",
|
||||
"<232>", "<233>", "<234>", "<235>", "<236>", "<237>", "<238>", "<239>",
|
||||
"<240>", "<241>", "<242>", "<243>", "<244>", "<245>", "<246>", "<247>",
|
||||
"<248>", "<249>", "<250>", "<251>", "<252>", "<253>", "<254>", "<255>",
|
||||
};
|
||||
|
||||
const char* Py3k::OpcodeNames[256] = {
|
||||
"STOP_CODE", "POP_TOP", "ROT_TWO", "ROT_THREE", "DUP_TOP", "ROT_FOUR",
|
||||
"<6>", "<7>", "<8>", "NOP",
|
||||
|
|
@ -181,14 +232,23 @@ bool Py2k::IsConstArg(int opcode)
|
|||
return (opcode == Py2k::LOAD_CONST);
|
||||
}
|
||||
|
||||
bool Py2k::IsNameArg(int opcode)
|
||||
bool Py2k::IsNameArg(int opcode, int minorVer)
|
||||
{
|
||||
return (opcode == Py2k::DELETE_ATTR) || (opcode == Py2k::DELETE_GLOBAL) ||
|
||||
(opcode == Py2k::DELETE_NAME) || (opcode == Py2k::IMPORT_FROM) ||
|
||||
(opcode == Py2k::IMPORT_NAME) || (opcode == Py2k::LOAD_ATTR) ||
|
||||
(opcode == Py2k::LOAD_GLOBAL) || (opcode == Py2k::LOAD_NAME) ||
|
||||
(opcode == Py2k::STORE_ATTR) || (opcode == Py2k::STORE_GLOBAL) ||
|
||||
(opcode == Py2k::STORE_NAME);
|
||||
if (minorVer >= 7) {
|
||||
return (opcode == Py2k::DELETE_ATTR) || (opcode == Py2k::DELETE_GLOBAL) ||
|
||||
(opcode == Py2k::DELETE_NAME) || (opcode == Py2k::IMPORT_FROM_27) ||
|
||||
(opcode == Py2k::IMPORT_NAME_27) || (opcode == Py2k::LOAD_ATTR_27) ||
|
||||
(opcode == Py2k::LOAD_GLOBAL) || (opcode == Py2k::LOAD_NAME) ||
|
||||
(opcode == Py2k::STORE_ATTR) || (opcode == Py2k::STORE_GLOBAL) ||
|
||||
(opcode == Py2k::STORE_NAME);
|
||||
} else {
|
||||
return (opcode == Py2k::DELETE_ATTR) || (opcode == Py2k::DELETE_GLOBAL) ||
|
||||
(opcode == Py2k::DELETE_NAME) || (opcode == Py2k::IMPORT_FROM) ||
|
||||
(opcode == Py2k::IMPORT_NAME) || (opcode == Py2k::LOAD_ATTR) ||
|
||||
(opcode == Py2k::LOAD_GLOBAL) || (opcode == Py2k::LOAD_NAME) ||
|
||||
(opcode == Py2k::STORE_ATTR) || (opcode == Py2k::STORE_GLOBAL) ||
|
||||
(opcode == Py2k::STORE_NAME);
|
||||
}
|
||||
}
|
||||
|
||||
bool Py2k::IsVarNameArg(int opcode)
|
||||
|
|
@ -365,7 +425,8 @@ void bc_next(PycBuffer& source, PycModule* mod, int& opcode, int& operand, int&
|
|||
bool haveExtArg = false;
|
||||
pos += 1;
|
||||
|
||||
if ((mod->majorVer() == 2 && opcode == Py2k::EXTENDED_ARG) ||
|
||||
if ((mod->majorVer() == 2 && ((mod->minorVer() < 7 && opcode == Py2k::EXTENDED_ARG) ||
|
||||
(mod->minorVer() >= 7 && opcode == Py2k::EXTENDED_ARG_27))) ||
|
||||
(mod->majorVer() == 3 && opcode == Py3k::EXTENDED_ARG)) {
|
||||
operand = source.get16() << 16;
|
||||
opcode = source.getByte();
|
||||
|
|
@ -400,8 +461,10 @@ void bc_disasm(PycRef<PycCode> code, PycModule* mod, int indent)
|
|||
|
||||
if (mod->majorVer() == 1) {
|
||||
printf("%-24s", Py1k::OpcodeNames[opcode]);
|
||||
} else if (mod->majorVer() == 2) {
|
||||
} else if (mod->majorVer() == 2 && mod->minorVer() < 7) {
|
||||
printf("%-24s", Py2k::OpcodeNames[opcode]);
|
||||
} else if (mod->majorVer() == 2 && mod->minorVer() >= 7) {
|
||||
printf("%-24s", Py2k::OpcodeNames27[opcode]);
|
||||
} else if (mod->majorVer() == 3) {
|
||||
printf("%-24s", Py3k::OpcodeNames[opcode]);
|
||||
}
|
||||
|
|
@ -413,7 +476,7 @@ void bc_disasm(PycRef<PycCode> code, PycModule* mod, int indent)
|
|||
print_const(code->getConst(operand), mod);
|
||||
} else if ((mod->majorVer() == 1 && Py1k::IsNameArg(opcode)) ||
|
||||
(mod->majorVer() == 1 && mod->minorVer() < 3 && Py1k::IsVarNameArg(opcode)) ||
|
||||
(mod->majorVer() == 2 && Py2k::IsNameArg(opcode)) ||
|
||||
(mod->majorVer() == 2 && Py2k::IsNameArg(opcode, mod->minorVer())) ||
|
||||
(mod->majorVer() == 3 && Py3k::IsNameArg(opcode))) {
|
||||
printf("%d: %s", operand, code->getName(operand)->value());
|
||||
} else if ((mod->majorVer() == 1 && Py1k::IsVarNameArg(opcode)) ||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue