diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-06-18 15:53:18 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-06-18 15:53:18 +0200 |
| commit | 0dd185a14149216a1ef5fa8fcf49f510e68583d2 (patch) | |
| tree | 4f06d09c1e26151e35d72147bf8398690671e827 /ice40 | |
| parent | 71d07fd0bf0352608f62a4a4e1aef3826beef0cc (diff) | |
| download | nextpnr-0dd185a14149216a1ef5fa8fcf49f510e68583d2.tar.gz nextpnr-0dd185a14149216a1ef5fa8fcf49f510e68583d2.tar.bz2 nextpnr-0dd185a14149216a1ef5fa8fcf49f510e68583d2.zip | |
Getting rid of users of old IdString API
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/arch.cc | 2 | ||||
| -rw-r--r-- | ice40/arch.h | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ice40/arch.cc b/ice40/arch.cc index aa40b80a..197ce746 100644 --- a/ice40/arch.cc +++ b/ice40/arch.cc @@ -54,7 +54,7 @@ BelType belTypeFromId(IdString id) // ----------------------------------------------------------------------- -void IdString::initialize_arch(Context *ctx) +void IdString::initialize_arch(const Context *ctx) { #define X(t) initialize_add(ctx, #t, PIN_##t); #include "portpins.inc" diff --git a/ice40/arch.h b/ice40/arch.h index 9e811ba9..b49451b9 100644 --- a/ice40/arch.h +++ b/ice40/arch.h @@ -477,6 +477,9 @@ struct Arch std::string getChipName(); + virtual IdString id(const std::string &s) const { abort(); } + virtual IdString id(const char *s) const { abort(); } + // ------------------------------------------------- BelId getBelByName(IdString name) const; @@ -484,7 +487,7 @@ struct Arch IdString getBelName(BelId bel) const { assert(bel != BelId()); - return chip_info->bel_data[bel.index].name.get(); + return id(chip_info->bel_data[bel.index].name.get()); } void bindBel(BelId bel, IdString cell) @@ -576,7 +579,7 @@ struct Arch IdString getWireName(WireId wire) const { assert(wire != WireId()); - return chip_info->wire_data[wire.index].name.get(); + return id(chip_info->wire_data[wire.index].name.get()); } void bindWire(WireId wire, IdString net) |