Avoid code duplication.

Author: markshannon

Objects/frameobject.c

@@ -7,6 +7,7 @@
 #include "frameobject.h"
 #include "opcode.h"
 #include "structmember.h"
+#include "Python/wordcode_helpers.h"
 
 #define OFF(x) offsetof(PyFrameObject, x)
 
@@ -45,25 +46,6 @@ frame_getlineno(PyFrameObject *f, void *closure)
     return PyLong_FromLong(PyFrame_GetLineNumber(f));
 }
 
-/* Given the index of the effective opcode,
-   scan back to construct the oparg with EXTENDED_ARG */
-static unsigned int
-get_arg(const _Py_CODEUNIT *codestr, Py_ssize_t i)
-{
-    _Py_CODEUNIT word;
-    unsigned int oparg = _Py_OPARG(codestr[i]);
-    if (i >= 1 && _Py_OPCODE(word = codestr[i-1]) == EXTENDED_ARG) {
-        oparg |= _Py_OPARG(word) << 8;
-        if (i >= 2 && _Py_OPCODE(word = codestr[i-2]) == EXTENDED_ARG) {
-            oparg |= _Py_OPARG(word) << 16;
-            if (i >= 3 && _Py_OPCODE(word = codestr[i-3]) == EXTENDED_ARG) {
-                oparg |= _Py_OPARG(word) << 24;
-            }
-        }
-    }
-    return oparg;
-}
-
 #define ITER_MARKER 1
 #define EXCEPT_MARKER 2
 #define FINALLY_MARKER 3

Python/peephole.c

@@ -58,25 +58,6 @@ find_op(const _Py_CODEUNIT *codestr, Py_ssize_t i)
     return i;
 }
 
-/* Given the index of the effective opcode,
-   scan back to construct the oparg with EXTENDED_ARG */
-static unsigned int
-get_arg(const _Py_CODEUNIT *codestr, Py_ssize_t i)
-{
-    _Py_CODEUNIT word;
-    unsigned int oparg = _Py_OPARG(codestr[i]);
-    if (i >= 1 && _Py_OPCODE(word = codestr[i-1]) == EXTENDED_ARG) {
-        oparg |= _Py_OPARG(word) << 8;
-        if (i >= 2 && _Py_OPCODE(word = codestr[i-2]) == EXTENDED_ARG) {
-            oparg |= _Py_OPARG(word) << 16;
-            if (i >= 3 && _Py_OPCODE(word = codestr[i-3]) == EXTENDED_ARG) {
-                oparg |= _Py_OPARG(word) << 24;
-            }
-        }
-    }
-    return oparg;
-}
-
 /* Fill the region with NOPs. */
 static void
 fill_nops(_Py_CODEUNIT *codestr, Py_ssize_t start, Py_ssize_t end)

Python/wordcode_helpers.h

@@ -1,5 +1,5 @@
-/* This file contains code shared by the compiler and the peephole
-   optimizer.
+/* This file contains code shared by the compiler, the peephole
+   optimizer and frameobject.
  */
 
 #ifdef WORDS_BIGENDIAN
@@ -8,9 +8,15 @@
 #  define PACKOPARG(opcode, oparg) ((_Py_CODEUNIT)(((oparg) << 8) | (opcode)))
 #endif
 
+#ifdef __GNUC__
+#define MAYBE_UNUSED __attribute__ ((unused))
+#else
+#define MAYBE_UNUSED
+#endif
+
 /* Minimum number of code units necessary to encode instruction with
    EXTENDED_ARGs */
-static int
+MAYBE_UNUSED static int
 instrsize(unsigned int oparg)
 {
     return oparg <= 0xff ? 1 :
@@ -21,7 +27,7 @@ instrsize(unsigned int oparg)
 
 /* Spits out op/oparg pair using ilen bytes. codestr should be pointed at the
    desired location of the first EXTENDED_ARG */
-static void
+MAYBE_UNUSED static void
 write_op_arg(_Py_CODEUNIT *codestr, unsigned char opcode,
     unsigned int oparg, int ilen)
 {
@@ -42,3 +48,22 @@ write_op_arg(_Py_CODEUNIT *codestr, unsigned char opcode,
             Py_UNREACHABLE();
     }
 }
+
+/* Given the index of the effective opcode,
+   scan back to construct the oparg with EXTENDED_ARG */
+MAYBE_UNUSED static unsigned int
+get_arg(const _Py_CODEUNIT *codestr, Py_ssize_t i)
+{
+    _Py_CODEUNIT word;
+    unsigned int oparg = _Py_OPARG(codestr[i]);
+    if (i >= 1 && _Py_OPCODE(word = codestr[i-1]) == EXTENDED_ARG) {
+        oparg |= _Py_OPARG(word) << 8;
+        if (i >= 2 && _Py_OPCODE(word = codestr[i-2]) == EXTENDED_ARG) {
+            oparg |= _Py_OPARG(word) << 16;
+            if (i >= 3 && _Py_OPCODE(word = codestr[i-3]) == EXTENDED_ARG) {
+                oparg |= _Py_OPARG(word) << 24;
+            }
+        }
+    }
+    return oparg;
+}