diff options
author | David Shah <davey1576@gmail.com> | 2018-07-02 15:29:58 +0200 |
---|---|---|
committer | David Shah <davey1576@gmail.com> | 2018-07-04 14:55:24 +0200 |
commit | 4bc12f2eadc2c369f38dfa54f086b8aa2c94fd05 (patch) | |
tree | b9d3662dcb014831fd202864663cbb52a55ba476 | |
parent | 65195513eb2676d974f1cef94be5e84f42a52f0f (diff) | |
download | nextpnr-4bc12f2eadc2c369f38dfa54f086b8aa2c94fd05.tar.gz nextpnr-4bc12f2eadc2c369f38dfa54f086b8aa2c94fd05.tar.bz2 nextpnr-4bc12f2eadc2c369f38dfa54f086b8aa2c94fd05.zip |
Progress on new wrapper system
Signed-off-by: David Shah <davey1576@gmail.com>
-rw-r--r-- | common/pybindings.cc | 1 | ||||
-rw-r--r-- | common/pywrappers.h | 4 | ||||
-rw-r--r-- | ice40/pybindings.cc | 72 |
3 files changed, 45 insertions, 32 deletions
diff --git a/common/pybindings.cc b/common/pybindings.cc index e9ceca51..329bcf1e 100644 --- a/common/pybindings.cc +++ b/common/pybindings.cc @@ -123,7 +123,6 @@ BOOST_PYTHON_MODULE(MODULE_NAME) .def(self == self); arch_wrap_python(); - class_<Context, Context *, bases<Arch>, boost::noncopyable>("Context", no_init).def("checksum", &Context::checksum); } static wchar_t *program; diff --git a/common/pywrappers.h b/common/pywrappers.h index fe786a3b..5b0146ac 100644 --- a/common/pywrappers.h +++ b/common/pywrappers.h @@ -122,7 +122,9 @@ template <typename Class, typename FuncT, FuncT fn, typename rv_conv, typename a static conv_result_type wrapped_fn(class_type &cls, conv_arg1_type arg1) { - return rv_conv()(get_base(cls).ctx, get_base(cls).*fn(arg1_conv()(get_ctx(cls), arg1))); + Context *ctx = get_ctx<Class>(cls); + Class &base = get_base<Class>(cls); + return rv_conv()(ctx, (base.*fn)(arg1_conv()(ctx, arg1))); } template <typename WrapCls> static void def_wrap(WrapCls cls_, const char *name) { cls_.def(name, wrapped_fn); } diff --git a/ice40/pybindings.cc b/ice40/pybindings.cc index ea1c5547..3c86f10c 100644 --- a/ice40/pybindings.cc +++ b/ice40/pybindings.cc @@ -27,18 +27,24 @@ NEXTPNR_NAMESPACE_BEGIN namespace PythonConversion { -template <> struct string_converter<BelId> +template<> +struct string_converter<BelId> { - BelId from_str(Context *ctx, std::string name) { return ctx->getBelByName(ctx->id(name)); } + BelId from_str(Context *ctx, std::string name) + { return ctx->getBelByName(ctx->id(name)); } - std::string to_str(Context *ctx, BelId id) { return ctx->getBelName(id).str(ctx); } + std::string to_str(Context *ctx, BelId id) + { return ctx->getBelName(id).str(ctx); } }; -template <> struct string_converter<BelType> +template<> +struct string_converter<BelType> { - BelType from_str(Context *ctx, std::string name) { return ctx->belTypeFromId(ctx->id(name)); } + BelType from_str(Context *ctx, std::string name) + { return ctx->belTypeFromId(ctx->id(name)); } - std::string to_str(Context *ctx, BelType typ) { return ctx->belTypeToId(typ).str(ctx); } + std::string to_str(Context *ctx, BelType typ) + { return ctx->belTypeToId(typ).str(ctx); } }; } // namespace PythonConversion @@ -68,34 +74,40 @@ void arch_wrap_python() enum_<PortPin>("PortPin") #define X(t) .value("PIN_" #t, PIN_##t) + #include "portpins.inc" ; #undef X - auto arch_cls = class_<Arch, Arch *, bases<BaseCtx>, boost::noncopyable>("Arch", init<ArchArgs>()) - .def("getBelByName", &Arch::getBelByName) - .def("getWireByName", &Arch::getWireByName) - .def("getBelName", &Arch::getBelName) - .def("getWireName", &Arch::getWireName) - .def("getBels", &Arch::getBels) - .def("getWireBelPin", &Arch::getWireBelPin) - .def("getBelPinUphill", &Arch::getBelPinUphill) - .def("getBelPinsDownhill", &Arch::getBelPinsDownhill) - .def("getWires", &Arch::getWires) - .def("getPipByName", &Arch::getPipByName) - .def("getPipName", &Arch::getPipName) - .def("getPips", &Arch::getPips) - .def("getPipSrcWire", &Arch::getPipSrcWire) - .def("getPipDstWire", &Arch::getPipDstWire) - .def("getPipDelay", &Arch::getPipDelay) - .def("getPipsDownhill", &Arch::getPipsDownhill) - .def("getPipsUphill", &Arch::getPipsUphill) - .def("getWireAliases", &Arch::getWireAliases) - .def("estimatePosition", &Arch::estimatePosition) - .def("estimateDelay", &Arch::estimateDelay); - - /*fn_wrapper<Arch, typeof(&Arch::getBelType), &Arch::getBelType, conv_from_str<BelId>, - conv_to_str<BelType>>::def_wrap(arch_cls, "getBelType");*/ + auto arch_cls = class_<Arch, Arch *, bases<BaseCtx>, boost::noncopyable>("Arch", init<ArchArgs>()); + auto ctx_cls = class_<Context, Context *, bases<Arch>, boost::noncopyable>("Context", no_init).def("checksum", + &Context::checksum); + fn_wrapper<Context, typeof(&Context::getBelType), &Context::getBelType, conv_to_str<BelType>, + conv_from_str<BelId>>::def_wrap(ctx_cls, "getBelType"); + + /* + .def("getBelByName", &Arch::getBelByName) + .def("getWireByName", &Arch::getWireByName) + .def("getBelName", &Arch::getBelName) + .def("getWireName", &Arch::getWireName) + .def("getBels", &Arch::getBels) + .def("getWireBelPin", &Arch::getWireBelPin) + .def("getBelPinUphill", &Arch::getBelPinUphill) + .def("getBelPinsDownhill", &Arch::getBelPinsDownhill) + .def("getWires", &Arch::getWires) + .def("getPipByName", &Arch::getPipByName) + .def("getPipName", &Arch::getPipName) + .def("getPips", &Arch::getPips) + .def("getPipSrcWire", &Arch::getPipSrcWire) + .def("getPipDstWire", &Arch::getPipDstWire) + .def("getPipDelay", &Arch::getPipDelay) + .def("getPipsDownhill", &Arch::getPipsDownhill) + .def("getPipsUphill", &Arch::getPipsUphill) + .def("getWireAliases", &Arch::getWireAliases) + .def("estimatePosition", &Arch::estimatePosition) + .def("estimateDelay", &Arch::estimateDelay); + */ + WRAP_RANGE(Bel); WRAP_RANGE(BelPin); |