diff options
| author | Eddie Hung <eddie.hung+gitlab@gmail.com> | 2018-07-17 14:19:43 +0000 |
|---|---|---|
| committer | Eddie Hung <eddie.hung+gitlab@gmail.com> | 2018-07-17 14:19:43 +0000 |
| commit | dabc057da94207c1dfbb8d9679c639ff697bea14 (patch) | |
| tree | d8d70b16f021d48fa053949d909fa206ce36927b /ecp5/arch.cc | |
| parent | 0bae7f5606b15591a23fb63da1c5ff6f93b40747 (diff) | |
| parent | f62f04e376f83d650ab1067cdf0f058151828b8a (diff) | |
| download | nextpnr-dabc057da94207c1dfbb8d9679c639ff697bea14.tar.gz nextpnr-dabc057da94207c1dfbb8d9679c639ff697bea14.tar.bz2 nextpnr-dabc057da94207c1dfbb8d9679c639ff697bea14.zip | |
Merge branch 'master' into 'master'
Master
See merge request eddiehung/nextpnr!2
Diffstat (limited to 'ecp5/arch.cc')
| -rw-r--r-- | ecp5/arch.cc | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc index 51f4db84..0ffede3b 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -94,7 +94,7 @@ static const ChipInfoPOD *get_chip_info(const RelPtr<ChipInfoPOD> *ptr) { return void load_chipdb(); #endif -#define LFE5U_45F_ONLY +//#define LFE5U_45F_ONLY Arch::Arch(ArchArgs args) : args(args) { @@ -118,6 +118,14 @@ Arch::Arch(ArchArgs args) : args(args) log_error("Unsupported ECP5 chip type.\n"); } #endif + + id_trellis_slice = id("TRELLIS_SLICE"); + id_clk = id("CLK"); + id_lsr = id("LSR"); + id_clkmux = id("CLKMUX"); + id_lsrmux = id("LSRMUX"); + id_srmode = id("SRMODE"); + id_mode = id("MODE"); } // ----------------------------------------------------------------------- @@ -181,7 +189,10 @@ BelRange Arch::getBelsAtSameTile(BelId bel) const br.b.cursor_tile = bel.location.y * chip_info->width + bel.location.x; br.e.cursor_tile = bel.location.y * chip_info->width + bel.location.x; br.b.cursor_index = 0; - br.e.cursor_index = locInfo(bel)->num_bels; + br.e.cursor_index = locInfo(bel)->num_bels - 1; + br.b.chip = chip_info; + br.e.chip = chip_info; + ++br.e; return br; } @@ -315,12 +326,6 @@ DecalXY Arch::getGroupDecal(GroupId pip) const { return {}; }; // ----------------------------------------------------------------------- -bool Arch::isValidBelForCell(CellInfo *cell, BelId bel) const { return true; } - -bool Arch::isBelLocationValid(BelId bel) const { return true; } - -// ----------------------------------------------------------------------- - bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, delay_t &delay) const { return false; |