python: Infrastructure for generic arch Python API

Signed-off-by: David Shah <dave@ds0.me>

2 files changed, 79 insertions, 0 deletions

diff --git a/common/pybindings.cc b/common/pybindings.cc
index eee78b5e..dad8e5c7 100644
--- a/common/pybindings.cc
+++ b/common/pybindings.cc
@@ -81,6 +81,34 @@ template <> struct string_converter<PortRef &>
 
 } // namespace PythonConversion
 
+struct loc_from_tuple
+{
+    loc_from_tuple() { converter::registry::push_back(&convertible, &construct, boost::python::type_id<Loc>()); }
+
+    static void *convertible(PyObject *obj_ptr)
+    {
+        if (!PyTuple_Check(obj_ptr))
+            return 0;
+        return obj_ptr;
+    }
+
+    static void construct(PyObject *obj_ptr, converter::rvalue_from_python_stage1_data *data)
+    {
+        int val[3];
+        for (int i = 0; i < 3; i++) {
+            PyObject *pyo = PyTuple_GetItem(obj_ptr, i);
+            if (!pyo)
+                throw_error_already_set();
+            NPNR_ASSERT(PyLong_Check(pyo));
+            val[i] = int(PyLong_AsLong(pyo));
+        }
+
+        void *storage = ((converter::rvalue_from_python_storage<Loc> *)data)->storage.bytes;
+        new (storage) Loc(val[0], val[1], val[2]);
+        data->convertible = storage;
+    }
+};
+
 BOOST_PYTHON_MODULE(MODULE_NAME)
 {
     register_exception_translator<assertion_failure>(&translate_assertfail);
@@ -108,6 +136,9 @@ BOOST_PYTHON_MODULE(MODULE_NAME)
 
     class_<BaseCtx, BaseCtx *, boost::noncopyable>("BaseCtx", no_init);
 
+    auto loc_cls =
+            class_<Loc>("Loc").def_readwrite("x", &Loc::x).def_readwrite("y", &Loc::y).def_readwrite("z", &Loc::z);
+
     auto ci_cls = class_<ContextualWrapper<CellInfo &>>("CellInfo", no_init);
     readwrite_wrapper<CellInfo &, decltype(&CellInfo::name), &CellInfo::name, conv_to_str<IdString>,
                       conv_from_str<IdString>>::def_wrap(ci_cls, "name");
diff --git a/common/pywrappers.h b/common/pywrappers.h
index 427c3623..b564eb59 100644
--- a/common/pywrappers.h
+++ b/common/pywrappers.h
@@ -288,6 +288,29 @@ struct fn_wrapper_3a_v
     template <typename WrapCls> static void def_wrap(WrapCls cls_, const char *name) { cls_.def(name, wrapped_fn); }
 };
 
+// Four parameters, no return
+template <typename Class, typename FuncT, FuncT fn, typename arg1_conv, typename arg2_conv, typename arg3_conv,
+          typename arg4_conv>
+struct fn_wrapper_4a_v
+{
+    using class_type = typename WrapIfNotContext<Class>::maybe_wrapped_t;
+    using conv_arg1_type = typename arg1_conv::arg_type;
+    using conv_arg2_type = typename arg2_conv::arg_type;
+    using conv_arg3_type = typename arg3_conv::arg_type;
+    using conv_arg4_type = typename arg4_conv::arg_type;
+
+    static void wrapped_fn(class_type &cls, conv_arg1_type arg1, conv_arg2_type arg2, conv_arg3_type arg3,
+                           conv_arg4_type arg4)
+    {
+        Context *ctx = get_ctx<Class>(cls);
+        Class &base = get_base<Class>(cls);
+        return (base.*fn)(arg1_conv()(ctx, arg1), arg2_conv()(ctx, arg2), arg3_conv()(ctx, arg3),
+                          arg4_conv()(ctx, arg4));
+    }
+
+    template <typename WrapCls> static void def_wrap(WrapCls cls_, const char *name) { cls_.def(name, wrapped_fn); }
+};
+
 // Five parameters, no return
 template <typename Class, typename FuncT, FuncT fn, typename arg1_conv, typename arg2_conv, typename arg3_conv,
           typename arg4_conv, typename arg5_conv>
@@ -312,6 +335,31 @@ struct fn_wrapper_5a_v
     template <typename WrapCls> static void def_wrap(WrapCls cls_, const char *name) { cls_.def(name, wrapped_fn); }
 };
 
+// Six parameters, no return
+template <typename Class, typename FuncT, FuncT fn, typename arg1_conv, typename arg2_conv, typename arg3_conv,
+          typename arg4_conv, typename arg5_conv, typename arg6_conv>
+struct fn_wrapper_6a_v
+{
+    using class_type = typename WrapIfNotContext<Class>::maybe_wrapped_t;
+    using conv_arg1_type = typename arg1_conv::arg_type;
+    using conv_arg2_type = typename arg2_conv::arg_type;
+    using conv_arg3_type = typename arg3_conv::arg_type;
+    using conv_arg4_type = typename arg4_conv::arg_type;
+    using conv_arg5_type = typename arg5_conv::arg_type;
+    using conv_arg6_type = typename arg6_conv::arg_type;
+
+    static void wrapped_fn(class_type &cls, conv_arg1_type arg1, conv_arg2_type arg2, conv_arg3_type arg3,
+                           conv_arg4_type arg4, conv_arg5_type arg5, conv_arg6_type arg6)
+    {
+        Context *ctx = get_ctx<Class>(cls);
+        Class &base = get_base<Class>(cls);
+        return (base.*fn)(arg1_conv()(ctx, arg1), arg2_conv()(ctx, arg2), arg3_conv()(ctx, arg3),
+                          arg4_conv()(ctx, arg4), arg5_conv()(ctx, arg5), arg6_conv()(ctx, arg6));
+    }
+
+    template <typename WrapCls> static void def_wrap(WrapCls cls_, const char *name) { cls_.def(name, wrapped_fn); }
+};
+
 // Wrapped getter
 template <typename Class, typename MemT, MemT mem, typename v_conv> struct readonly_wrapper
 {