Add basic bytecode and disassembly support for Python 3.12

zrax · Nov 9, 2023 · 9b384ad · 9b384ad
1 parent b32f231
commit 9b384ad
Show file tree

Hide file tree

Showing 12 changed files with 456 additions and 189 deletions.
diff --git a/ASTree.cpp b/ASTree.cpp
@@ -1796,6 +1796,12 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
                 }
             }
             break;
+        case Pyc::RETURN_CONST_A:
+            {
+                PycRef<ASTObject> value = new ASTObject(code->getConst(operand));
+                curblock->append(new ASTReturn(value.cast<ASTNode>()));
+            }
+            break;
         case Pyc::ROT_TWO:
             {
                 PycRef<ASTNode> one = stack.top();
@@ -3347,7 +3353,9 @@ void decompyle(PycRef<PycCode> code, PycModule* mod, std::ostream& pyc_output)
         if (clean->nodes().back().type() == ASTNode::NODE_RETURN) {
             PycRef<ASTReturn> ret = clean->nodes().back().cast<ASTReturn>();
 
-            if (ret->value() == NULL || ret->value().type() == ASTNode::NODE_LOCALS) {
+            PycRef<ASTObject> retObj = ret->value().try_cast<ASTObject>();
+            if (ret->value() == NULL || ret->value().type() == ASTNode::NODE_LOCALS ||
+                    (retObj && retObj->object().type() == PycObject::TYPE_NONE)) {
                 clean->removeLast();  // Always an extraneous return statement
             }
         }

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,7 +29,7 @@ endif()
 set(PYTHON_VERSIONS
     10 11    13 14 15 16            # Python 1.1 and 1.2 are marshal-identical
     20 21 22 23 24 25 26 27
-    30 31 32 33 34 35 36 37 38 39 310 311
+    30 31 32 33 34 35 36 37 38 39 310 311 312
 )
 
 foreach(ver ${PYTHON_VERSIONS})