gh-98831: rewrite COPY and SWAP in the instruction definition DSL (#1…

…01620)
python · Feb 6, 2023 · 3875276 · 3875276
1 parent 949c58f
commit 3875276
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -3098,11 +3098,9 @@ dummy_func(
             PUSH(result);
         }
 
-        // stack effect: ( -- __0)
-        inst(COPY) {
-            assert(oparg != 0);
-            PyObject *peek = PEEK(oparg);
-            PUSH(Py_NewRef(peek));
+        inst(COPY, (bottom, unused[oparg-1] -- bottom, unused[oparg-1], top)) {
+            assert(oparg > 0);
+            top = Py_NewRef(bottom);
         }
 
         inst(BINARY_OP, (unused/1, lhs, rhs -- res)) {
@@ -3126,12 +3124,9 @@ dummy_func(
             ERROR_IF(res == NULL, error);
         }
 
-        // stack effect: ( -- )
-        inst(SWAP) {
-            assert(oparg != 0);
-            PyObject *top = TOP();
-            SET_TOP(PEEK(oparg));
-            PEEK(oparg) = top;
+        inst(SWAP, (bottom, unused[oparg-2], top --
+                    top, unused[oparg-2], bottom)) {
+            assert(oparg >= 2);
         }
 
         inst(EXTENDED_ARG, (--)) {

diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
@@ -333,11 +333,11 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
         case FORMAT_VALUE:
             return -1;
         case COPY:
-            return -1;
+            return (oparg-1) + 1;
         case BINARY_OP:
             return 2;
         case SWAP:
-            return -1;
+            return (oparg-2) + 2;
         case EXTENDED_ARG:
             return 0;
         case CACHE:
@@ -679,11 +679,11 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
         case FORMAT_VALUE:
             return -1;
         case COPY:
-            return -1;
+            return (oparg-1) + 2;
         case BINARY_OP:
             return 1;
         case SWAP:
-            return -1;
+            return (oparg-2) + 2;
         case EXTENDED_ARG:
             return 0;
         case CACHE: