From c910846c5cefe03ce60d50418389f158846f8341 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Tue, 19 Jun 2018 12:08:37 +0200 Subject: Refactor Arch/Context design hierarchy Signed-off-by: Clifford Wolf --- dummy/arch.cc | 2 +- dummy/arch.h | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'dummy') diff --git a/dummy/arch.cc b/dummy/arch.cc index 3ef6a4d3..fb54c74f 100644 --- a/dummy/arch.cc +++ b/dummy/arch.cc @@ -26,7 +26,7 @@ Arch::Arch(ArchArgs) {} std::string Arch::getChipName() { return "Dummy"; } -void IdString::initialize_arch(const Context *ctx) {} +void IdString::initialize_arch(const BaseCtx *ctx) {} // --------------------------------------------------------------- diff --git a/dummy/arch.h b/dummy/arch.h index 865536dc..02bec23a 100644 --- a/dummy/arch.h +++ b/dummy/arch.h @@ -17,13 +17,12 @@ * */ -#ifndef CHIP_H -#define CHIP_H - #ifndef NEXTPNR_H #error Include "arch.h" via "nextpnr.h" only. #endif +#ifdef NEXTPNR_ARCH_TOP + NEXTPNR_NAMESPACE_BEGIN typedef float delay_t; @@ -57,11 +56,19 @@ struct BelPin PortPin pin; }; +NEXTPNR_NAMESPACE_END + +#endif // NEXTPNR_ARCH_TOP + +#ifdef NEXTPNR_ARCH_BOTTOM + +NEXTPNR_NAMESPACE_BEGIN + struct ArchArgs { }; -struct Arch +struct Arch : BaseCtx { Arch(ArchArgs args); @@ -128,4 +135,4 @@ struct Arch NEXTPNR_NAMESPACE_END -#endif +#endif // NEXTPNR_ARCH_BOTTOM -- cgit v1.2.3