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

Aligning some opcodes for Python 3.11, 3.12: LOAD_GLOBAL, LOAD_ATTR

Browse Source
This commit is contained in:
Alex
2024-02-27 23:12:03 +02:00
parent d361ec3e7d
commit 035f963f3d
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ASTree.cpp
View File

@@ -1480,6 +1480,18 @@ 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) {
stack.pop(); stack.pop();
if (mod->verCompare(3, 12) >= 0)
{
if (operand & 1) {
/* Changed in version 3.12:
If the low bit of namei is set, then a NULL or self is pushed to the stack
before the attribute or unbound method respectively. */
stack.push(nullptr);
}
operand >>= 1;
}
stack.push(new ASTBinary(name, new ASTName(code->getName(operand)), ASTBinary::BIN_ATTR)); stack.push(new ASTBinary(name, new ASTName(code->getName(operand)), ASTBinary::BIN_ATTR));
} }
} }
@@ -1518,19 +1530,14 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
break; break;
case Pyc::LOAD_GLOBAL_A: case Pyc::LOAD_GLOBAL_A:
if (mod->verCompare(3, 11) >= 0) { if (mod->verCompare(3, 11) >= 0) {
// Loads the global named co_names[namei>>1] onto the stack.
if (operand & 1) { if (operand & 1) {
/* Changed in version 3.11: /* Changed in version 3.11:
If the low bit of "NAMEI" (operand) is set, If the low bit of "NAMEI" (operand) is set,
then a NULL is pushed to the stack before the global variable. */ then a NULL is pushed to the stack before the global variable. */
stack.push(nullptr); stack.push(nullptr);
/*
and thats because for some reason for example 3 global functions: input, int, print.
it tries to load: 1, 3, 5
all though we have only 3 names, so thats should be: (1-1)/2 = 0, (3-1)/2 = 1, (5-1)/2 = 2
i dont know why, maybe because of the null push, but thats a FIX for now.
*/
operand = (int)((operand - 1) / 2);
} }
operand >>= 1;
} }
stack.push(new ASTName(code->getName(operand))); stack.push(new ASTName(code->getName(operand)));
break; break;