Separate out Static Python primitive type codes

Summary:
Creating a separate library to avoid upcoming dependency cycles between
StaticPython/ and Jit/.

Reviewed By: DinoV

Differential Revision: D78560463

fbshipit-source-id: 00dfb7b27c61816140a393444ff0c0a1eb3f5726

Author: alexmalyshev

StaticPython/type.c

@@ -167,14 +167,6 @@ uint64_t _PyClassLoader_Unbox(PyObject* value, int primitive_type) {
   return new_val;
 }
 
-int _PyClassLoader_GetTypeCode(PyTypeObject* type) {
-  if (type->tp_cache == NULL) {
-    return TYPED_OBJECT;
-  }
-
-  return ((_PyType_VTable*)type->tp_cache)->vt_typecode;
-}
-
 static PyObject*
 classloader_instantiate_generic(PyObject* gtd, PyObject* name, PyObject* path) {
   if (!PyType_Check(gtd)) {

StaticPython/type.h

@@ -15,8 +15,6 @@ int _PyClassLoader_PrimitiveTypeToStructMemberType(int type);
 PyObject* _PyClassLoader_Box(uint64_t value, int primitive_type);
 uint64_t _PyClassLoader_Unbox(PyObject* value, int primitive_type);
 
-int _PyClassLoader_GetTypeCode(PyTypeObject* type);
-
 static inline int _PyObject_TypeCheckOptional(
     PyObject* val,
     PyTypeObject* type,

StaticPython/type_code.c

@@ -0,0 +1,13 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+#include "cinderx/StaticPython/type_code.h"
+
+#include "cinderx/StaticPython/vtable.h"
+
+int _PyClassLoader_GetTypeCode(PyTypeObject* type) {
+  if (type->tp_cache == NULL) {
+    return TYPED_OBJECT;
+  }
+
+  return ((_PyType_VTable*)type->tp_cache)->vt_typecode;
+}

StaticPython/type_code.h

@@ -0,0 +1,54 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+#pragma once
+
+#include <Python.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define TYPED_INT_UNSIGNED 0
+#define TYPED_INT_SIGNED 1
+
+#define TYPED_INT_8BIT 0
+#define TYPED_INT_16BIT 1
+#define TYPED_INT_32BIT 2
+#define TYPED_INT_64BIT 3
+
+#define TYPED_INT8 (TYPED_INT_8BIT << 1 | TYPED_INT_SIGNED)
+#define TYPED_INT16 (TYPED_INT_16BIT << 1 | TYPED_INT_SIGNED)
+#define TYPED_INT32 (TYPED_INT_32BIT << 1 | TYPED_INT_SIGNED)
+#define TYPED_INT64 (TYPED_INT_64BIT << 1 | TYPED_INT_SIGNED)
+
+#define TYPED_UINT8 (TYPED_INT_8BIT << 1 | TYPED_INT_UNSIGNED)
+#define TYPED_UINT16 (TYPED_INT_16BIT << 1 | TYPED_INT_UNSIGNED)
+#define TYPED_UINT32 (TYPED_INT_32BIT << 1 | TYPED_INT_UNSIGNED)
+#define TYPED_UINT64 (TYPED_INT_64BIT << 1 | TYPED_INT_UNSIGNED)
+
+// Gets one of TYPED_INT_8BIT, TYPED_INT_16BIT, etc.. from TYPED_INT8,
+// TYPED_UINT8, etc... also TYPED_SIZE(TYPED_BOOL) == TYPED_INT_8BIT
+#define TYPED_SIZE(typed_int) ((typed_int >> 1) & 3)
+
+#define TYPED_OBJECT 0x08
+#define TYPED_DOUBLE 0x09
+#define TYPED_SINGLE 0x0A
+#define TYPED_CHAR 0x0B
+// must be even: TYPED_BOOL & TYPED_INT_SIGNED should be false
+#define TYPED_BOOL 0x0C
+#define TYPED_VOID 0x0D
+#define TYPED_STRING 0x0E
+#define TYPED_ERROR 0x0F
+
+#define TYPED_ARRAY 0x80
+
+#define _Py_IS_TYPED_ARRAY(x) (x & TYPED_ARRAY)
+#define _Py_IS_TYPED_ARRAY_SIGNED(x) (x & (TYPED_INT_SIGNED << 4))
+
+#define Ci_METH_TYPED 0x0400
+
+int _PyClassLoader_GetTypeCode(PyTypeObject* type);
+
+#ifdef __cplusplus
+}
+#endif

StaticPython/typed_method_def.h

@@ -4,49 +4,12 @@
 #include <Python.h>
 
 #include "cinderx/StaticPython/generic_type.h"
+#include "cinderx/StaticPython/type_code.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define TYPED_INT_UNSIGNED 0
-#define TYPED_INT_SIGNED 1
-
-#define TYPED_INT_8BIT 0
-#define TYPED_INT_16BIT 1
-#define TYPED_INT_32BIT 2
-#define TYPED_INT_64BIT 3
-
-#define TYPED_INT8 (TYPED_INT_8BIT << 1 | TYPED_INT_SIGNED)
-#define TYPED_INT16 (TYPED_INT_16BIT << 1 | TYPED_INT_SIGNED)
-#define TYPED_INT32 (TYPED_INT_32BIT << 1 | TYPED_INT_SIGNED)
-#define TYPED_INT64 (TYPED_INT_64BIT << 1 | TYPED_INT_SIGNED)
-
-#define TYPED_UINT8 (TYPED_INT_8BIT << 1 | TYPED_INT_UNSIGNED)
-#define TYPED_UINT16 (TYPED_INT_16BIT << 1 | TYPED_INT_UNSIGNED)
-#define TYPED_UINT32 (TYPED_INT_32BIT << 1 | TYPED_INT_UNSIGNED)
-#define TYPED_UINT64 (TYPED_INT_64BIT << 1 | TYPED_INT_UNSIGNED)
-
-// Gets one of TYPED_INT_8BIT, TYPED_INT_16BIT, etc.. from TYPED_INT8,
-// TYPED_UINT8, etc... also TYPED_SIZE(TYPED_BOOL) == TYPED_INT_8BIT
-#define TYPED_SIZE(typed_int) ((typed_int >> 1) & 3)
-
-#define TYPED_OBJECT 0x08
-#define TYPED_DOUBLE 0x09
-#define TYPED_SINGLE 0x0A
-#define TYPED_CHAR 0x0B
-// must be even: TYPED_BOOL & TYPED_INT_SIGNED should be false
-#define TYPED_BOOL 0x0C
-#define TYPED_VOID 0x0D
-#define TYPED_STRING 0x0E
-#define TYPED_ERROR 0x0F
-
-#define TYPED_ARRAY 0x80
-
-#define _Py_IS_TYPED_ARRAY(x) (x & TYPED_ARRAY)
-#define _Py_IS_TYPED_ARRAY_SIGNED(x) (x & (TYPED_INT_SIGNED << 4))
-
-#define Ci_METH_TYPED 0x0400
-
 /* Flag marks this as optional */
 #define Ci_Py_SIG_OPTIONAL 0x01
 /* Flag marks this a type param, high bits are type index */