diff options
author | Sergiusz Bazanski <q3k@q3k.org> | 2018-07-14 18:50:15 +0100 |
---|---|---|
committer | Sergiusz Bazanski <q3k@q3k.org> | 2018-07-14 18:50:15 +0100 |
commit | 22330402018a212efd4ef2e337e34af2e79eb875 (patch) | |
tree | c9602093138de0424dfe9ffbe37e645ee4a56c48 /ice40/main.cc | |
parent | 339198b394b7f2cdd3bafb2c8c819c1561813f65 (diff) | |
download | nextpnr-22330402018a212efd4ef2e337e34af2e79eb875.tar.gz nextpnr-22330402018a212efd4ef2e337e34af2e79eb875.tar.bz2 nextpnr-22330402018a212efd4ef2e337e34af2e79eb875.zip |
Revert "Remove legacy access to state via Arch"
This reverts commit 18b4b316782035daa259d65d26ea733ca4d16bea.
Diffstat (limited to 'ice40/main.cc')
-rw-r--r-- | ice40/main.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/ice40/main.cc b/ice40/main.cc index fdfe1f25..d38c786c 100644 --- a/ice40/main.cc +++ b/ice40/main.cc @@ -304,32 +304,31 @@ int main(int argc, char *argv[]) } if (vm.count("tmfuzz")) { - auto &&proxy = ctx->rproxy(); std::vector<WireId> src_wires, dst_wires; /*for (auto w : ctx->getWires()) src_wires.push_back(w);*/ for (auto b : ctx->getBels()) { if (ctx->getBelType(b) == TYPE_ICESTORM_LC) { - src_wires.push_back(proxy.getWireBelPin(b, PIN_O)); + src_wires.push_back(ctx->getWireBelPin(b, PIN_O)); } if (ctx->getBelType(b) == TYPE_SB_IO) { - src_wires.push_back(proxy.getWireBelPin(b, PIN_D_IN_0)); + src_wires.push_back(ctx->getWireBelPin(b, PIN_D_IN_0)); } } for (auto b : ctx->getBels()) { if (ctx->getBelType(b) == TYPE_ICESTORM_LC) { - dst_wires.push_back(proxy.getWireBelPin(b, PIN_I0)); - dst_wires.push_back(proxy.getWireBelPin(b, PIN_I1)); - dst_wires.push_back(proxy.getWireBelPin(b, PIN_I2)); - dst_wires.push_back(proxy.getWireBelPin(b, PIN_I3)); - dst_wires.push_back(proxy.getWireBelPin(b, PIN_CEN)); - dst_wires.push_back(proxy.getWireBelPin(b, PIN_CIN)); + dst_wires.push_back(ctx->getWireBelPin(b, PIN_I0)); + dst_wires.push_back(ctx->getWireBelPin(b, PIN_I1)); + dst_wires.push_back(ctx->getWireBelPin(b, PIN_I2)); + dst_wires.push_back(ctx->getWireBelPin(b, PIN_I3)); + dst_wires.push_back(ctx->getWireBelPin(b, PIN_CEN)); + dst_wires.push_back(ctx->getWireBelPin(b, PIN_CIN)); } if (ctx->getBelType(b) == TYPE_SB_IO) { - dst_wires.push_back(proxy.getWireBelPin(b, PIN_D_OUT_0)); - dst_wires.push_back(proxy.getWireBelPin(b, PIN_OUTPUT_ENABLE)); + dst_wires.push_back(ctx->getWireBelPin(b, PIN_D_OUT_0)); + dst_wires.push_back(ctx->getWireBelPin(b, PIN_OUTPUT_ENABLE)); } } |