1 files changed, 11 insertions, 13 deletions

diff --git a/ice40/main.cc b/ice40/main.cc
index fdfe1f25..e77bdd34 100644
--- a/ice40/main.cc
+++ b/ice40/main.cc
@@ -51,8 +51,7 @@ void svg_dump_decal(const Context *ctx, const DecalXY &decal)
     const float scale = 10.0, offset = 10.0;
     const std::string style = "stroke=\"black\" stroke-width=\"0.1\" fill=\"none\"";
 
-    auto &&proxy = ctx->rproxy();
-    for (auto &el : proxy.getDecalGraphics(decal.decal)) {
+    for (auto &el : ctx->getDecalGraphics(decal.decal)) {
         if (el.type == GraphicElement::G_BOX) {
             std::cout << "<rect x=\"" << (offset + scale * (decal.x + el.x1)) << "\" y=\""
                       << (offset + scale * (decal.y + el.y1)) << "\" height=\"" << (scale * (el.y2 - el.y1))
@@ -304,32 +303,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));
                 }
             }