Lil-Ran/Pyarmor-Static-Unpack-1shot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

LOAD_ATTR operand changes in 3.12

Browse Source
This commit is contained in:
Nenad Čaklović
2024-01-05 21:32:53 +01:00
parent 2da061fc98
commit 5f225caf52
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ASTree.cpp
View File

@@ -1473,8 +1473,11 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
{ {
PycRef<ASTNode> name = stack.top(); PycRef<ASTNode> name = stack.top();
if (name.type() != ASTNode::NODE_IMPORT) { if (name.type() != ASTNode::NODE_IMPORT) {
auto arg = operand;
if (mod->verCompare(3, 12) >= 0 && (arg & 1))
arg >>= 1;
stack.pop(); stack.pop();
stack.push(new ASTBinary(name, new ASTName(code->getName(operand)), ASTBinary::BIN_ATTR)); stack.push(new ASTBinary(name, new ASTName(code->getName(arg)), ASTBinary::BIN_ATTR));
} }
} }
break; break;

5
bytecode.cpp
View File

@@ -390,7 +390,10 @@ void bc_disasm(std::ostream& pyc_output, PycRef<PycCode> code, PycModule* mod,
case Pyc::LOAD_METHOD_A: case Pyc::LOAD_METHOD_A:
case Pyc::LOAD_FROM_DICT_OR_GLOBALS_A: case Pyc::LOAD_FROM_DICT_OR_GLOBALS_A:
try { try {
formatted_print(pyc_output, "%d: %s", operand, code->getName(operand)->value()); auto arg = operand;
if (opcode == Pyc::LOAD_ATTR_A && mod->verCompare(3, 12) >= 0 && (arg & 1))
arg >>= 1;
formatted_print(pyc_output, "%d: %s", operand, code->getName(arg)->value());
} catch (const std::out_of_range &) { } catch (const std::out_of_range &) {
formatted_print(pyc_output, "%d <INVALID>", operand); formatted_print(pyc_output, "%d <INVALID>", operand);
} }