clang-format for design and chip codebase

Signed-off-by: Clifford Wolf <clifford@clifford.at>

6 files changed, 926 insertions, 922 deletions

diff --git a/common/design.cc b/common/design.cc
index 7ba6a9b1..6ab122df 100644
--- a/common/design.cc
+++ b/common/design.cc
@@ -18,4 +18,3 @@
  */
 
 #include "design.h"
-
diff --git a/common/design.h b/common/design.h
index 314c2fd7..f4c24f15 100644
--- a/common/design.h
+++ b/common/design.h
@@ -20,50 +20,52 @@
 #ifndef DESIGN_H
 #define DESIGN_H
 
-#include <stdint.h>
 #include <assert.h>
-#include <vector>
+#include <stdint.h>
 #include <string>
-#include <unordered_set>
 #include <unordered_map>
+#include <unordered_set>
+#include <vector>
 
 // replace with proper IdString later
 typedef std::string IdString;
 
 // replace with haslib later
-template<typename T> using pool = std::unordered_set<T>;
-template<typename T, typename U> using dict = std::unordered_map<T, U>;
+template <typename T> using pool = std::unordered_set<T>;
+template <typename T, typename U> using dict = std::unordered_map<T, U>;
 using std::vector;
 
 struct GraphicElement
 {
-	// This will control colour, and there should be separate
-	// visibility controls in some cases also
-	enum {
-		// Wires entirely inside tiles, e.g. between switchbox and bels
-		G_LOCAL_WIRES,
-		// Standard inter-tile routing
-		G_GENERAL_WIRES,
-		// Special inter-tile wires, e.g. carry chains
-		G_DEDICATED_WIRES,
-		G_BEL_OUTLINE,
-		G_SWITCHBOX_OUTLINE,
-		G_TILE_OUTLINE,
-		G_BEL_PINS,
-		G_SWITCHBOX_PINS,
-		G_BEL_MISC,
-		G_TILE_MISC,
-	} style;
-
-	enum {
-		G_LINE,
-		G_BOX,
-		G_CIRCLE,
-		G_LABEL
-	} type;
-
-	float x1, y1, x2, y2, z;
-	std::string text;
+    // This will control colour, and there should be separate
+    // visibility controls in some cases also
+    enum
+    {
+        // Wires entirely inside tiles, e.g. between switchbox and bels
+        G_LOCAL_WIRES,
+        // Standard inter-tile routing
+        G_GENERAL_WIRES,
+        // Special inter-tile wires, e.g. carry chains
+        G_DEDICATED_WIRES,
+        G_BEL_OUTLINE,
+        G_SWITCHBOX_OUTLINE,
+        G_TILE_OUTLINE,
+        G_BEL_PINS,
+        G_SWITCHBOX_PINS,
+        G_BEL_MISC,
+        G_TILE_MISC,
+    } style;
+
+    enum
+    {
+        G_LINE,
+        G_BOX,
+        G_CIRCLE,
+        G_LABEL
+    } type;
+
+    float x1, y1, x2, y2, z;
+    std::string text;
 };
 
 #include "chip.h"
@@ -72,56 +74,57 @@ struct CellInfo;
 
 struct PortRef
 {
-	CellInfo *cell;
-	IdString port;
+    CellInfo *cell;
+    IdString port;
 };
 
 struct NetInfo
 {
-	IdString			name;
-	PortRef				driver;
-	vector<PortRef>			users;
-	dict<IdString, std::string>	attrs;
+    IdString name;
+    PortRef driver;
+    vector<PortRef> users;
+    dict<IdString, std::string> attrs;
 
-	// wire -> (uphill_wire, delay)
-	dict<WireId, std::pair<WireId, DelayInfo>>	wires;
+    // wire -> (uphill_wire, delay)
+    dict<WireId, std::pair<WireId, DelayInfo>> wires;
 };
 
 enum PortType
 {
-	PORT_IN = 0,
-	PORT_OUT = 1,
-	PORT_INOUT = 2
+    PORT_IN = 0,
+    PORT_OUT = 1,
+    PORT_INOUT = 2
 };
 
 struct PortInfo
 {
-	IdString name;
-	NetInfo *net;
-	PortType type;
+    IdString name;
+    NetInfo *net;
+    PortType type;
 };
 
 struct CellInfo
 {
-	IdString			name, type;
-	dict<IdString, PortInfo>	ports;
-	dict<IdString, std::string>	attrs, params;
+    IdString name, type;
+    dict<IdString, PortInfo> ports;
+    dict<IdString, std::string> attrs, params;
 
-	BelId bel;
-	// cell_port -> bel_pin
-	dict<IdString, IdString>	pins;
+    BelId bel;
+    // cell_port -> bel_pin
+    dict<IdString, IdString> pins;
 };
 
 struct Design
 {
-	struct Chip chip;
+    struct Chip chip;
 
-	Design(ChipArgs args) : chip(args) {
-		// ...
-	}
+    Design(ChipArgs args) : chip(args)
+    {
+        // ...
+    }
 
-	dict<IdString, NetInfo*>	nets;
-	dict<IdString, CellInfo*>	cells;
+    dict<IdString, NetInfo *> nets;
+    dict<IdString, CellInfo *> cells;
 };
 
 #endif
diff --git a/dummy/chip.cc b/dummy/chip.cc
index 51a6a840..642984ca 100644
--- a/dummy/chip.cc
+++ b/dummy/chip.cc
@@ -19,6 +19,4 @@
 
 #include "chip.h"
 
-Chip::Chip(ChipArgs)
-{
-}
+Chip::Chip(ChipArgs) {}
diff --git a/dummy/chip.h b/dummy/chip.h
index 054e822b..8c66fb96 100644
--- a/dummy/chip.h
+++ b/dummy/chip.h
@@ -24,10 +24,10 @@
 
 struct DelayInfo
 {
-	float delay = 0;
+    float delay = 0;
 
-	float raiseDelay() { return delay; }
-	float fallDelay() { return delay; }
+    float raiseDelay() { return delay; }
+    float fallDelay() { return delay; }
 };
 
 typedef IdString BelType;
@@ -45,8 +45,8 @@ typedef IdString PipId;
 
 struct BelPin
 {
-	BelId bel;
-	PortPin pin;
+    BelId bel;
+    PortPin pin;
 };
 
 struct ChipArgs
@@ -55,48 +55,48 @@ struct ChipArgs
 
 struct Chip
 {
-	Chip(ChipArgs args);
-
-	BelId getBelByName(IdString name) const;
-
-	IdString getBelName(BelId bel) const;
-	void bindBel(BelId bel, IdString cell);
-	void unbindBel(BelId bel);
-	bool checkBelAvail(BelId bel) const;
-	const vector<BelId> &getBels() const;
-	const vector<BelId> &getBelsByType(BelType type) const;
-	BelType getBelType(BelId bel) const;
-	WireId getWireBelPin(BelId bel, PortPin pin) const;
-	BelPin getBelPinUphill(WireId wire) const;
-	const vector<BelPin> &getBelPinsDownhill(WireId wire) const;
-
-	WireId getWireByName(IdString name) const;
-	IdString getWireName(WireId wire) const;
-	void bindWire(WireId bel, IdString net);
-	void unbindWire(WireId bel);
-	bool checkWireAvail(WireId bel) const;
-	const vector<WireId> &getWires() const;
-
-	PipId getPipByName(IdString name) const;
-	IdString getPipName(PipId pip) const;
-	void bindPip(PipId bel, IdString net);
-	void unbindPip(PipId bel);
-	bool checkPipAvail(PipId bel) const;
-	const vector<PipId> &getPips() const;
-	WireId getPipSrcWire(PipId pip) const;
-	WireId getPipDstWire(PipId pip) const;
-	DelayInfo getPipDelay(PipId pip) const;
-	const vector<PipId> &getPipsDownhill(WireId wire) const;
-	const vector<PipId> &getPipsUphill(WireId wire) const;
-	const vector<PipId> &getWireAliases(WireId wire) const;
-
-	void getBelPosition(BelId bel, float &x, float &y) const;
-	void getWirePosition(WireId wire, float &x, float &y) const;
-	void getPipPosition(PipId pip, float &x, float &y) const;
-	vector<GraphicElement> getBelGraphics(BelId bel) const;
-	vector<GraphicElement> getWireGraphics(WireId wire) const;
-	vector<GraphicElement> getPipGraphics(PipId pip) const;
-	vector<GraphicElement> getFrameGraphics() const;
+    Chip(ChipArgs args);
+
+    BelId getBelByName(IdString name) const;
+
+    IdString getBelName(BelId bel) const;
+    void bindBel(BelId bel, IdString cell);
+    void unbindBel(BelId bel);
+    bool checkBelAvail(BelId bel) const;
+    const vector<BelId> &getBels() const;
+    const vector<BelId> &getBelsByType(BelType type) const;
+    BelType getBelType(BelId bel) const;
+    WireId getWireBelPin(BelId bel, PortPin pin) const;
+    BelPin getBelPinUphill(WireId wire) const;
+    const vector<BelPin> &getBelPinsDownhill(WireId wire) const;
+
+    WireId getWireByName(IdString name) const;
+    IdString getWireName(WireId wire) const;
+    void bindWire(WireId bel, IdString net);
+    void unbindWire(WireId bel);
+    bool checkWireAvail(WireId bel) const;
+    const vector<WireId> &getWires() const;
+
+    PipId getPipByName(IdString name) const;
+    IdString getPipName(PipId pip) const;
+    void bindPip(PipId bel, IdString net);
+    void unbindPip(PipId bel);
+    bool checkPipAvail(PipId bel) const;
+    const vector<PipId> &getPips() const;
+    WireId getPipSrcWire(PipId pip) const;
+    WireId getPipDstWire(PipId pip) const;
+    DelayInfo getPipDelay(PipId pip) const;
+    const vector<PipId> &getPipsDownhill(WireId wire) const;
+    const vector<PipId> &getPipsUphill(WireId wire) const;
+    const vector<PipId> &getWireAliases(WireId wire) const;
+
+    void getBelPosition(BelId bel, float &x, float &y) const;
+    void getWirePosition(WireId wire, float &x, float &y) const;
+    void getPipPosition(PipId pip, float &x, float &y) const;
+    vector<GraphicElement> getBelGraphics(BelId bel) const;
+    vector<GraphicElement> getWireGraphics(WireId wire) const;
+    vector<GraphicElement> getPipGraphics(PipId pip) const;
+    vector<GraphicElement> getFrameGraphics() const;
 };
 
 #endif
diff --git a/ice40/chip.cc b/ice40/chip.cc
index d3388bc9..4ba7697d 100644
--- a/ice40/chip.cc
+++ b/ice40/chip.cc
@@ -23,254 +23,258 @@
 
 IdString belTypeToId(BelType type)
 {
-	if (type == TYPE_ICESTORM_LC)
-		return "ICESTORM_LC";
-	if (type == TYPE_ICESTORM_RAM)
-		return "ICESTORM_RAM";
-	if (type == TYPE_SB_IO)
-		return "SB_IO";
-	return IdString();
+    if (type == TYPE_ICESTORM_LC)
+        return "ICESTORM_LC";
+    if (type == TYPE_ICESTORM_RAM)
+        return "ICESTORM_RAM";
+    if (type == TYPE_SB_IO)
+        return "SB_IO";
+    return IdString();
 }
 
 BelType belTypeFromId(IdString id)
 {
-	if (id == "ICESTORM_LC")
-		return TYPE_ICESTORM_LC;
-	if (id == "ICESTORM_RAM")
-		return TYPE_ICESTORM_RAM;
-	if (id == "SB_IO")
-		return TYPE_SB_IO;
-	return TYPE_NIL;
+    if (id == "ICESTORM_LC")
+        return TYPE_ICESTORM_LC;
+    if (id == "ICESTORM_RAM")
+        return TYPE_ICESTORM_RAM;
+    if (id == "SB_IO")
+        return TYPE_SB_IO;
+    return TYPE_NIL;
 }
 
 // -----------------------------------------------------------------------
 
 IdString PortPinToId(PortPin type)
 {
-#define X(t) if (type == PIN_##t) return #t;
-
-	X(IN_0)
-	X(IN_1)
-	X(IN_2)
-	X(IN_3)
-	X(O)
-	X(LO)
-	X(CIN)
-	X(COUT)
-	X(CEN)
-	X(CLK)
-	X(SR)
-
-	X(MASK_0)
-	X(MASK_1)
-	X(MASK_2)
-	X(MASK_3)
-	X(MASK_4)
-	X(MASK_5)
-	X(MASK_6)
-	X(MASK_7)
-	X(MASK_8)
-	X(MASK_9)
-	X(MASK_10)
-	X(MASK_11)
-	X(MASK_12)
-	X(MASK_13)
-	X(MASK_14)
-	X(MASK_15)
-
-	X(RDATA_0)
-	X(RDATA_1)
-	X(RDATA_2)
-	X(RDATA_3)
-	X(RDATA_4)
-	X(RDATA_5)
-	X(RDATA_6)
-	X(RDATA_7)
-	X(RDATA_8)
-	X(RDATA_9)
-	X(RDATA_10)
-	X(RDATA_11)
-	X(RDATA_12)
-	X(RDATA_13)
-	X(RDATA_14)
-	X(RDATA_15)
-
-	X(WDATA_0)
-	X(WDATA_1)
-	X(WDATA_2)
-	X(WDATA_3)
-	X(WDATA_4)
-	X(WDATA_5)
-	X(WDATA_6)
-	X(WDATA_7)
-	X(WDATA_8)
-	X(WDATA_9)
-	X(WDATA_10)
-	X(WDATA_11)
-	X(WDATA_12)
-	X(WDATA_13)
-	X(WDATA_14)
-	X(WDATA_15)
-
-	X(WADDR_0)
-	X(WADDR_1)
-	X(WADDR_2)
-	X(WADDR_3)
-	X(WADDR_4)
-	X(WADDR_5)
-	X(WADDR_6)
-	X(WADDR_7)
-	X(WADDR_8)
-	X(WADDR_9)
-	X(WADDR_10)
-
-	X(RADDR_0)
-	X(RADDR_1)
-	X(RADDR_2)
-	X(RADDR_3)
-	X(RADDR_4)
-	X(RADDR_5)
-	X(RADDR_6)
-	X(RADDR_7)
-	X(RADDR_8)
-	X(RADDR_9)
-	X(RADDR_10)
-
-	X(WCLK)
-	X(WCLKE)
-	X(WE)
-
-	X(RCLK)
-	X(RCLKE)
-	X(RE)
-
-	X(PACKAGE_PIN)
-	X(LATCH_INPUT_VALUE)
-	X(CLOCK_ENABLE)
-	X(INPUT_CLK)
-	X(OUTPUT_CLK)
-	X(OUTPUT_ENABLE)
-	X(D_OUT_0)
-	X(D_OUT_1)
-	X(D_IN_0)
-	X(D_IN_1)
+#define X(t)                                                                   \
+    if (type == PIN_##t)                                                       \
+        return #t;
+
+    X(IN_0)
+    X(IN_1)
+    X(IN_2)
+    X(IN_3)
+    X(O)
+    X(LO)
+    X(CIN)
+    X(COUT)
+    X(CEN)
+    X(CLK)
+    X(SR)
+
+    X(MASK_0)
+    X(MASK_1)
+    X(MASK_2)
+    X(MASK_3)
+    X(MASK_4)
+    X(MASK_5)
+    X(MASK_6)
+    X(MASK_7)
+    X(MASK_8)
+    X(MASK_9)
+    X(MASK_10)
+    X(MASK_11)
+    X(MASK_12)
+    X(MASK_13)
+    X(MASK_14)
+    X(MASK_15)
+
+    X(RDATA_0)
+    X(RDATA_1)
+    X(RDATA_2)
+    X(RDATA_3)
+    X(RDATA_4)
+    X(RDATA_5)
+    X(RDATA_6)
+    X(RDATA_7)
+    X(RDATA_8)
+    X(RDATA_9)
+    X(RDATA_10)
+    X(RDATA_11)
+    X(RDATA_12)
+    X(RDATA_13)
+    X(RDATA_14)
+    X(RDATA_15)
+
+    X(WDATA_0)
+    X(WDATA_1)
+    X(WDATA_2)
+    X(WDATA_3)
+    X(WDATA_4)
+    X(WDATA_5)
+    X(WDATA_6)
+    X(WDATA_7)
+    X(WDATA_8)
+    X(WDATA_9)
+    X(WDATA_10)
+    X(WDATA_11)
+    X(WDATA_12)
+    X(WDATA_13)
+    X(WDATA_14)
+    X(WDATA_15)
+
+    X(WADDR_0)
+    X(WADDR_1)
+    X(WADDR_2)
+    X(WADDR_3)
+    X(WADDR_4)
+    X(WADDR_5)
+    X(WADDR_6)
+    X(WADDR_7)
+    X(WADDR_8)
+    X(WADDR_9)
+    X(WADDR_10)
+
+    X(RADDR_0)
+    X(RADDR_1)
+    X(RADDR_2)
+    X(RADDR_3)
+    X(RADDR_4)
+    X(RADDR_5)
+    X(RADDR_6)
+    X(RADDR_7)
+    X(RADDR_8)
+    X(RADDR_9)
+    X(RADDR_10)
+
+    X(WCLK)
+    X(WCLKE)
+    X(WE)
+
+    X(RCLK)
+    X(RCLKE)
+    X(RE)
+
+    X(PACKAGE_PIN)
+    X(LATCH_INPUT_VALUE)
+    X(CLOCK_ENABLE)
+    X(INPUT_CLK)
+    X(OUTPUT_CLK)
+    X(OUTPUT_ENABLE)
+    X(D_OUT_0)
+    X(D_OUT_1)
+    X(D_IN_0)
+    X(D_IN_1)
 
 #undef X
-	return IdString();
+    return IdString();
 }
 
 PortPin PortPinFromId(IdString id)
 {
-#define X(t) if (id == #t) return PIN_##t;
-
-	X(IN_0)
-	X(IN_1)
-	X(IN_2)
-	X(IN_3)
-	X(O)
-	X(LO)
-	X(CIN)
-	X(COUT)
-	X(CEN)
-	X(CLK)
-	X(SR)
-
-	X(MASK_0)
-	X(MASK_1)
-	X(MASK_2)
-	X(MASK_3)
-	X(MASK_4)
-	X(MASK_5)
-	X(MASK_6)
-	X(MASK_7)
-	X(MASK_8)
-	X(MASK_9)
-	X(MASK_10)
-	X(MASK_11)
-	X(MASK_12)
-	X(MASK_13)
-	X(MASK_14)
-	X(MASK_15)
-
-	X(RDATA_0)
-	X(RDATA_1)
-	X(RDATA_2)
-	X(RDATA_3)
-	X(RDATA_4)
-	X(RDATA_5)
-	X(RDATA_6)
-	X(RDATA_7)
-	X(RDATA_8)
-	X(RDATA_9)
-	X(RDATA_10)
-	X(RDATA_11)
-	X(RDATA_12)
-	X(RDATA_13)
-	X(RDATA_14)
-	X(RDATA_15)
-
-	X(WDATA_0)
-	X(WDATA_1)
-	X(WDATA_2)
-	X(WDATA_3)
-	X(WDATA_4)
-	X(WDATA_5)
-	X(WDATA_6)
-	X(WDATA_7)
-	X(WDATA_8)
-	X(WDATA_9)
-	X(WDATA_10)
-	X(WDATA_11)
-	X(WDATA_12)
-	X(WDATA_13)
-	X(WDATA_14)
-	X(WDATA_15)
-
-	X(WADDR_0)
-	X(WADDR_1)
-	X(WADDR_2)
-	X(WADDR_3)
-	X(WADDR_4)
-	X(WADDR_5)
-	X(WADDR_6)
-	X(WADDR_7)
-	X(WADDR_8)
-	X(WADDR_9)
-	X(WADDR_10)
-
-	X(RADDR_0)
-	X(RADDR_1)
-	X(RADDR_2)
-	X(RADDR_3)
-	X(RADDR_4)
-	X(RADDR_5)
-	X(RADDR_6)
-	X(RADDR_7)
-	X(RADDR_8)
-	X(RADDR_9)
-	X(RADDR_10)
-
-	X(WCLK)
-	X(WCLKE)
-	X(WE)
-
-	X(RCLK)
-	X(RCLKE)
-	X(RE)
-
-	X(PACKAGE_PIN)
-	X(LATCH_INPUT_VALUE)
-	X(CLOCK_ENABLE)
-	X(INPUT_CLK)
-	X(OUTPUT_CLK)
-	X(OUTPUT_ENABLE)
-	X(D_OUT_0)
-	X(D_OUT_1)
-	X(D_IN_0)
-	X(D_IN_1)
+#define X(t)                                                                   \
+    if (id == #t)                                                              \
+        return PIN_##t;
+
+    X(IN_0)
+    X(IN_1)
+    X(IN_2)
+    X(IN_3)
+    X(O)
+    X(LO)
+    X(CIN)
+    X(COUT)
+    X(CEN)
+    X(CLK)
+    X(SR)
+
+    X(MASK_0)
+    X(MASK_1)
+    X(MASK_2)
+    X(MASK_3)
+    X(MASK_4)
+    X(MASK_5)
+    X(MASK_6)
+    X(MASK_7)
+    X(MASK_8)
+    X(MASK_9)
+    X(MASK_10)
+    X(MASK_11)
+    X(MASK_12)
+    X(MASK_13)
+    X(MASK_14)
+    X(MASK_15)
+
+    X(RDATA_0)
+    X(RDATA_1)
+    X(RDATA_2)
+    X(RDATA_3)
+    X(RDATA_4)
+    X(RDATA_5)
+    X(RDATA_6)
+    X(RDATA_7)
+    X(RDATA_8)
+    X(RDATA_9)
+    X(RDATA_10)
+    X(RDATA_11)
+    X(RDATA_12)
+    X(RDATA_13)
+    X(RDATA_14)
+    X(RDATA_15)
+
+    X(WDATA_0)
+    X(WDATA_1)
+    X(WDATA_2)
+    X(WDATA_3)
+    X(WDATA_4)
+    X(WDATA_5)
+    X(WDATA_6)
+    X(WDATA_7)
+    X(WDATA_8)
+    X(WDATA_9)
+    X(WDATA_10)
+    X(WDATA_11)
+    X(WDATA_12)
+    X(WDATA_13)
+    X(WDATA_14)
+    X(WDATA_15)
+
+    X(WADDR_0)
+    X(WADDR_1)
+    X(WADDR_2)
+    X(WADDR_3)
+    X(WADDR_4)
+    X(WADDR_5)
+    X(WADDR_6)
+    X(WADDR_7)
+    X(WADDR_8)
+    X(WADDR_9)
+    X(WADDR_10)
+
+    X(RADDR_0)
+    X(RADDR_1)
+    X(RADDR_2)
+    X(RADDR_3)
+    X(RADDR_4)
+    X(RADDR_5)
+    X(RADDR_6)
+    X(RADDR_7)
+    X(RADDR_8)
+    X(RADDR_9)
+    X(RADDR_10)
+
+    X(WCLK)
+    X(WCLKE)
+    X(WE)
+
+    X(RCLK)
+    X(RCLKE)
+    X(RE)
+
+    X(PACKAGE_PIN)
+    X(LATCH_INPUT_VALUE)
+    X(CLOCK_ENABLE)
+    X(INPUT_CLK)
+    X(OUTPUT_CLK)
+    X(OUTPUT_ENABLE)
+    X(D_OUT_0)
+    X(D_OUT_1)
+    X(D_IN_0)
+    X(D_IN_1)
 
 #undef X
-	return PIN_NIL;
+    return PIN_NIL;
 }
 
 // -----------------------------------------------------------------------
@@ -278,212 +282,211 @@ PortPin PortPinFromId(IdString id)
 Chip::Chip(ChipArgs args)
 {
 #ifdef ICE40_HX1K_ONLY
-	if (args.type == ChipArgs::HX1K) {
-		chip_info = chip_info_1k;
-		return;
-	}
+    if (args.type == ChipArgs::HX1K) {
+        chip_info = chip_info_1k;
+        return;
+    }
 #else
-	if (args.type == ChipArgs::LP384) {
-		chip_info = chip_info_384;
-		return;
-	} else if (args.type == ChipArgs::LP1K || args.type == ChipArgs::HX1K) {
-		chip_info = chip_info_1k;
-		return;
-	} else if (args.type == ChipArgs::UP5K) {
-		chip_info = chip_info_5k;
-		return;
-	} else if (args.type == ChipArgs::LP8K || args.type == ChipArgs::HX8K) {
-		chip_info = chip_info_8k;
-		return;
-	} else {
-		fprintf(stderr, "Unsupported chip type\n");
-		exit(EXIT_FAILURE);
-	}
+    if (args.type == ChipArgs::LP384) {
+        chip_info = chip_info_384;
+        return;
+    } else if (args.type == ChipArgs::LP1K || args.type == ChipArgs::HX1K) {
+        chip_info = chip_info_1k;
+        return;
+    } else if (args.type == ChipArgs::UP5K) {
+        chip_info = chip_info_5k;
+        return;
+    } else if (args.type == ChipArgs::LP8K || args.type == ChipArgs::HX8K) {
+        chip_info = chip_info_8k;
+        return;
+    } else {
+        fprintf(stderr, "Unsupported chip type\n");
+        exit(EXIT_FAILURE);
+    }
 #endif
 
-	abort();
+    abort();
 }
 
 // -----------------------------------------------------------------------
 
 BelId Chip::getBelByName(IdString name) const
 {
-	BelId ret;
+    BelId ret;
 
-	if (bel_by_name.empty()) {
-		for (int i = 0; i < chip_info.num_bels; i++)
-			bel_by_name[chip_info.bel_data[i].name] = i;
-	}
+    if (bel_by_name.empty()) {
+        for (int i = 0; i < chip_info.num_bels; i++)
+            bel_by_name[chip_info.bel_data[i].name] = i;
+    }
 
-	auto it = bel_by_name.find(name);
-	if (it != bel_by_name.end())
-		ret.index = it->second;
+    auto it = bel_by_name.find(name);
+    if (it != bel_by_name.end())
+        ret.index = it->second;
 
-	return ret;
+    return ret;
 }
 
 WireId Chip::getWireBelPin(BelId bel, PortPin pin) const
 {
-	// FIXME
-	return WireId();
+    // FIXME
+    return WireId();
 }
 
 // -----------------------------------------------------------------------
 
 WireId Chip::getWireByName(IdString name) const
 {
-	WireId ret;
+    WireId ret;
 
-	if (wire_by_name.empty()) {
-		for (int i = 0; i < chip_info.num_wires; i++)
-			wire_by_name[chip_info.wire_data[i].name] = i;
-	}
+    if (wire_by_name.empty()) {
+        for (int i = 0; i < chip_info.num_wires; i++)
+            wire_by_name[chip_info.wire_data[i].name] = i;
+    }
 
-	auto it = wire_by_name.find(name);
-	if (it != wire_by_name.end())
-		ret.index = it->second;
+    auto it = wire_by_name.find(name);
+    if (it != wire_by_name.end())
+        ret.index = it->second;
 
-	return ret;
+    return ret;
 }
 
 // -----------------------------------------------------------------------
 
 PipId Chip::getPipByName(IdString name) const
 {
-	PipId ret;
+    PipId ret;
 
-	if (pip_by_name.empty()) {
-		for (int i = 0; i < chip_info.num_pips; i++) {
-			PipId pip;
-			pip.index = i;
-			pip_by_name[getPipName(pip)] = i;
-		}
-	}
+    if (pip_by_name.empty()) {
+        for (int i = 0; i < chip_info.num_pips; i++) {
+            PipId pip;
+            pip.index = i;
+            pip_by_name[getPipName(pip)] = i;
+        }
+    }
 
-	auto it = pip_by_name.find(name);
-	if (it != pip_by_name.end())
-		ret.index = it->second;
+    auto it = pip_by_name.find(name);
+    if (it != pip_by_name.end())
+        ret.index = it->second;
 
-	return ret;
+    return ret;
 }
 
 // -----------------------------------------------------------------------
 
 void Chip::getBelPosition(BelId bel, float &x, float &y) const
 {
-	assert(!bel.nil());
-	x = chip_info.bel_data[bel.index].x;
-	y = chip_info.bel_data[bel.index].y;
+    assert(!bel.nil());
+    x = chip_info.bel_data[bel.index].x;
+    y = chip_info.bel_data[bel.index].y;
 }
 
 void Chip::getWirePosition(WireId wire, float &x, float &y) const
 {
-	assert(!wire.nil());
-	x = chip_info.wire_data[wire.index].x;
-	y = chip_info.wire_data[wire.index].y;
+    assert(!wire.nil());
+    x = chip_info.wire_data[wire.index].x;
+    y = chip_info.wire_data[wire.index].y;
 }
 
 void Chip::getPipPosition(PipId pip, float &x, float &y) const
 {
-	assert(!pip.nil());
-	x = chip_info.pip_data[pip.index].x;
-	y = chip_info.pip_data[pip.index].y;
+    assert(!pip.nil());
+    x = chip_info.pip_data[pip.index].x;
+    y = chip_info.pip_data[pip.index].y;
 }
 
 vector<GraphicElement> Chip::getBelGraphics(BelId bel) const
 {
-	vector<GraphicElement> ret;
-
-	auto bel_type = getBelType(bel);
-
-	if (bel_type == TYPE_ICESTORM_LC) {
-		GraphicElement el;
-		el.type = GraphicElement::G_BOX;
-		el.x1 = chip_info.bel_data[bel.index].x + 0.1;
-		el.x2 = chip_info.bel_data[bel.index].x + 0.9;
-		el.y1 = chip_info.bel_data[bel.index].y + 0.10 + (chip_info.bel_data[bel.index].z) * (0.8/8);
-		el.y2 = chip_info.bel_data[bel.index].y + 0.18 + (chip_info.bel_data[bel.index].z) * (0.8/8);
-		el.z = 0;
-		ret.push_back(el);
-	}
-
-	if (bel_type == TYPE_SB_IO) {
-		if (chip_info.bel_data[bel.index].x == 0 || chip_info.bel_data[bel.index].x == chip_info.width-1)
-		{
-			GraphicElement el;
-			el.type = GraphicElement::G_BOX;
-			el.x1 = chip_info.bel_data[bel.index].x + 0.1;
-			el.x2 = chip_info.bel_data[bel.index].x + 0.9;
-			if (chip_info.bel_data[bel.index].z == 0) {
-				el.y1 = chip_info.bel_data[bel.index].y + 0.10;
-				el.y2 = chip_info.bel_data[bel.index].y + 0.45;
-			} else {
-				el.y1 = chip_info.bel_data[bel.index].y + 0.55;
-				el.y2 = chip_info.bel_data[bel.index].y + 0.90;
-			}
-			el.z = 0;
-			ret.push_back(el);
-		}
-		else
-		{
-			GraphicElement el;
-			el.type = GraphicElement::G_BOX;
-			if (chip_info.bel_data[bel.index].z == 0) {
-				el.x1 = chip_info.bel_data[bel.index].x + 0.10;
-				el.x2 = chip_info.bel_data[bel.index].x + 0.45;
-			} else {
-				el.x1 = chip_info.bel_data[bel.index].x + 0.55;
-				el.x2 = chip_info.bel_data[bel.index].x + 0.90;
-			}
-			el.y1 = chip_info.bel_data[bel.index].y + 0.1;
-			el.y2 = chip_info.bel_data[bel.index].y + 0.9;
-			el.z = 0;
-			ret.push_back(el);
-		}
-	}
-
-	if (bel_type == TYPE_ICESTORM_RAM) {
-		GraphicElement el;
-		el.type = GraphicElement::G_BOX;
-		el.x1 = chip_info.bel_data[bel.index].x + 0.1;
-		el.x2 = chip_info.bel_data[bel.index].x + 0.9;
-		el.y1 = chip_info.bel_data[bel.index].y + 0.1;
-		el.y2 = chip_info.bel_data[bel.index].y + 1.9;
-		el.z = 0;
-		ret.push_back(el);
-	}
-
-	return ret;
+    vector<GraphicElement> ret;
+
+    auto bel_type = getBelType(bel);
+
+    if (bel_type == TYPE_ICESTORM_LC) {
+        GraphicElement el;
+        el.type = GraphicElement::G_BOX;
+        el.x1 = chip_info.bel_data[bel.index].x + 0.1;
+        el.x2 = chip_info.bel_data[bel.index].x + 0.9;
+        el.y1 = chip_info.bel_data[bel.index].y + 0.10 +
+                (chip_info.bel_data[bel.index].z) * (0.8 / 8);
+        el.y2 = chip_info.bel_data[bel.index].y + 0.18 +
+                (chip_info.bel_data[bel.index].z) * (0.8 / 8);
+        el.z = 0;
+        ret.push_back(el);
+    }
+
+    if (bel_type == TYPE_SB_IO) {
+        if (chip_info.bel_data[bel.index].x == 0 ||
+            chip_info.bel_data[bel.index].x == chip_info.width - 1) {
+            GraphicElement el;
+            el.type = GraphicElement::G_BOX;
+            el.x1 = chip_info.bel_data[bel.index].x + 0.1;
+            el.x2 = chip_info.bel_data[bel.index].x + 0.9;
+            if (chip_info.bel_data[bel.index].z == 0) {
+                el.y1 = chip_info.bel_data[bel.index].y + 0.10;
+                el.y2 = chip_info.bel_data[bel.index].y + 0.45;
+            } else {
+                el.y1 = chip_info.bel_data[bel.index].y + 0.55;
+                el.y2 = chip_info.bel_data[bel.index].y + 0.90;
+            }
+            el.z = 0;
+            ret.push_back(el);
+        } else {
+            GraphicElement el;
+            el.type = GraphicElement::G_BOX;
+            if (chip_info.bel_data[bel.index].z == 0) {
+                el.x1 = chip_info.bel_data[bel.index].x + 0.10;
+                el.x2 = chip_info.bel_data[bel.index].x + 0.45;
+            } else {
+                el.x1 = chip_info.bel_data[bel.index].x + 0.55;
+                el.x2 = chip_info.bel_data[bel.index].x + 0.90;
+            }
+            el.y1 = chip_info.bel_data[bel.index].y + 0.1;
+            el.y2 = chip_info.bel_data[bel.index].y + 0.9;
+            el.z = 0;
+            ret.push_back(el);
+        }
+    }
+
+    if (bel_type == TYPE_ICESTORM_RAM) {
+        GraphicElement el;
+        el.type = GraphicElement::G_BOX;
+        el.x1 = chip_info.bel_data[bel.index].x + 0.1;
+        el.x2 = chip_info.bel_data[bel.index].x + 0.9;
+        el.y1 = chip_info.bel_data[bel.index].y + 0.1;
+        el.y2 = chip_info.bel_data[bel.index].y + 1.9;
+        el.z = 0;
+        ret.push_back(el);
+    }
+
+    return ret;
 }
 
 vector<GraphicElement> Chip::getWireGraphics(WireId wire) const
 {
-	vector<GraphicElement> ret;
-	// FIXME
-	return ret;
+    vector<GraphicElement> ret;
+    // FIXME
+    return ret;
 }
 
 vector<GraphicElement> Chip::getPipGraphics(PipId pip) const
 {
-	vector<GraphicElement> ret;
-	// FIXME
-	return ret;
+    vector<GraphicElement> ret;
+    // FIXME
+    return ret;
 }
 
 vector<GraphicElement> Chip::getFrameGraphics() const
 {
-	vector<GraphicElement> ret;
-
-	for (int x = 0; x <= chip_info.width; x++)
-	for (int y = 0; y <= chip_info.height; y++)
-	{
-		GraphicElement el;
-		el.type = GraphicElement::G_LINE;
-		el.x1 = x - 0.05, el.x2 = x + 0.05, el.y1 = y, el.y2 = y, el.z = 0;
-		ret.push_back(el);
-		el.x1 = x, el.x2 = x, el.y1 = y - 0.05, el.y2 = y + 0.05, el.z = 0;
-		ret.push_back(el);
-	}
-
-	return ret;
+    vector<GraphicElement> ret;
+
+    for (int x = 0; x <= chip_info.width; x++)
+        for (int y = 0; y <= chip_info.height; y++) {
+            GraphicElement el;
+            el.type = GraphicElement::G_LINE;
+            el.x1 = x - 0.05, el.x2 = x + 0.05, el.y1 = y, el.y2 = y, el.z = 0;
+            ret.push_back(el);
+            el.x1 = x, el.x2 = x, el.y1 = y - 0.05, el.y2 = y + 0.05, el.z = 0;
+            ret.push_back(el);
+        }
+
+    return ret;
 }
diff --git a/ice40/chip.h b/ice40/chip.h
index 2f0a1284..695eea48 100644
--- a/ice40/chip.h
+++ b/ice40/chip.h
@@ -24,20 +24,20 @@
 
 struct DelayInfo
 {
-	float delay = 0;
+    float delay = 0;
 
-	float raiseDelay() { return delay; }
-	float fallDelay() { return delay; }
+    float raiseDelay() { return delay; }
+    float fallDelay() { return delay; }
 };
 
 // -----------------------------------------------------------------------
 
 enum BelType
 {
-	TYPE_NIL,
-	TYPE_ICESTORM_LC,
-	TYPE_ICESTORM_RAM,
-	TYPE_SB_IO
+    TYPE_NIL,
+    TYPE_ICESTORM_LC,
+    TYPE_ICESTORM_RAM,
+    TYPE_SB_IO
 };
 
 IdString belTypeToId(BelType type);
@@ -45,113 +45,113 @@ BelType belTypeFromId(IdString id);
 
 enum PortPin
 {
-	PIN_NIL,
-
-	PIN_IN_0,
-	PIN_IN_1,
-	PIN_IN_2,
-	PIN_IN_3,
-	PIN_O,
-	PIN_LO,
-	PIN_CIN,
-	PIN_COUT,
-	PIN_CEN,
-	PIN_CLK,
-	PIN_SR,
-
-	PIN_MASK_0,
-	PIN_MASK_1,
-	PIN_MASK_2,
-	PIN_MASK_3,
-	PIN_MASK_4,
-	PIN_MASK_5,
-	PIN_MASK_6,
-	PIN_MASK_7,
-	PIN_MASK_8,
-	PIN_MASK_9,
-	PIN_MASK_10,
-	PIN_MASK_11,
-	PIN_MASK_12,
-	PIN_MASK_13,
-	PIN_MASK_14,
-	PIN_MASK_15,
-
-	PIN_RDATA_0,
-	PIN_RDATA_1,
-	PIN_RDATA_2,
-	PIN_RDATA_3,
-	PIN_RDATA_4,
-	PIN_RDATA_5,
-	PIN_RDATA_6,
-	PIN_RDATA_7,
-	PIN_RDATA_8,
-	PIN_RDATA_9,
-	PIN_RDATA_10,
-	PIN_RDATA_11,
-	PIN_RDATA_12,
-	PIN_RDATA_13,
-	PIN_RDATA_14,
-	PIN_RDATA_15,
-
-	PIN_WDATA_0,
-	PIN_WDATA_1,
-	PIN_WDATA_2,
-	PIN_WDATA_3,
-	PIN_WDATA_4,
-	PIN_WDATA_5,
-	PIN_WDATA_6,
-	PIN_WDATA_7,
-	PIN_WDATA_8,
-	PIN_WDATA_9,
-	PIN_WDATA_10,
-	PIN_WDATA_11,
-	PIN_WDATA_12,
-	PIN_WDATA_13,
-	PIN_WDATA_14,
-	PIN_WDATA_15,
-
-	PIN_WADDR_0,
-	PIN_WADDR_1,
-	PIN_WADDR_2,
-	PIN_WADDR_3,
-	PIN_WADDR_4,
-	PIN_WADDR_5,
-	PIN_WADDR_6,
-	PIN_WADDR_7,
-	PIN_WADDR_8,
-	PIN_WADDR_9,
-	PIN_WADDR_10,
-
-	PIN_RADDR_0,
-	PIN_RADDR_1,
-	PIN_RADDR_2,
-	PIN_RADDR_3,
-	PIN_RADDR_4,
-	PIN_RADDR_5,
-	PIN_RADDR_6,
-	PIN_RADDR_7,
-	PIN_RADDR_8,
-	PIN_RADDR_9,
-	PIN_RADDR_10,
-
-	PIN_WCLK,
-	PIN_WCLKE,
-	PIN_WE,
-
-	PIN_RCLK,
-	PIN_RCLKE,
-	PIN_RE,
-
-	PIN_PACKAGE_PIN,
-	PIN_LATCH_INPUT_VALUE,
-	PIN_CLOCK_ENABLE,
-	PIN_INPUT_CLK,
-	PIN_OUTPUT_CLK,
-	PIN_OUTPUT_ENABLE,
-	PIN_D_OUT_0,
-	PIN_D_OUT_1,
-	PIN_D_IN_0,
-	PIN_D_IN_1
+    PIN_NIL,
+
+    PIN_IN_0,
+    PIN_IN_1,
+    PIN_IN_2,
+    PIN_IN_3,
+    PIN_O,
+    PIN_LO,
+    PIN_CIN,
+    PIN_COUT,
+    PIN_CEN,
+    PIN_CLK,
+    PIN_SR,
+
+    PIN_MASK_0,
+    PIN_MASK_1,
+    PIN_MASK_2,
+    PIN_MASK_3,
+    PIN_MASK_4,
+    PIN_MASK_5,
+    PIN_MASK_6,
+    PIN_MASK_7,
+    PIN_MASK_8,
+    PIN_MASK_9,
+    PIN_MASK_10,
+    PIN_MASK_11,
+    PIN_MASK_12,
+    PIN_MASK_13,
+    PIN_MASK_14,
+    PIN_MASK_15,
+
+    PIN_RDATA_0,
+    PIN_RDATA_1,
+    PIN_RDATA_2,
+    PIN_RDATA_3,
+    PIN_RDATA_4,
+    PIN_RDATA_5,
+    PIN_RDATA_6,
+    PIN_RDATA_7,
+    PIN_RDATA_8,
+    PIN_RDATA_9,
+    PIN_RDATA_10,
+    PIN_RDATA_11,
+    PIN_RDATA_12,
+    PIN_RDATA_13,
+    PIN_RDATA_14,
+    PIN_RDATA_15,
+
+    PIN_WDATA_0,
+    PIN_WDATA_1,
+    PIN_WDATA_2,
+    PIN_WDATA_3,
+    PIN_WDATA_4,
+    PIN_WDATA_5,
+    PIN_WDATA_6,
+    PIN_WDATA_7,
+    PIN_WDATA_8,
+    PIN_WDATA_9,
+    PIN_WDATA_10,
+    PIN_WDATA_11,
+    PIN_WDATA_12,
+    PIN_WDATA_13,
+    PIN_WDATA_14,
+    PIN_WDATA_15,
+
+    PIN_WADDR_0,
+    PIN_WADDR_1,
+    PIN_WADDR_2,
+    PIN_WADDR_3,
+    PIN_WADDR_4,
+    PIN_WADDR_5,
+    PIN_WADDR_6,
+    PIN_WADDR_7,
+    PIN_WADDR_8,
+    PIN_WADDR_9,
+    PIN_WADDR_10,
+
+    PIN_RADDR_0,
+    PIN_RADDR_1,
+    PIN_RADDR_2,
+    PIN_RADDR_3,
+    PIN_RADDR_4,
+    PIN_RADDR_5,
+    PIN_RADDR_6,
+    PIN_RADDR_7,
+    PIN_RADDR_8,
+    PIN_RADDR_9,
+    PIN_RADDR_10,
+
+    PIN_WCLK,
+    PIN_WCLKE,
+    PIN_WE,
+
+    PIN_RCLK,
+    PIN_RCLKE,
+    PIN_RE,
+
+    PIN_PACKAGE_PIN,
+    PIN_LATCH_INPUT_VALUE,
+    PIN_CLOCK_ENABLE,
+    PIN_INPUT_CLK,
+    PIN_OUTPUT_CLK,
+    PIN_OUTPUT_ENABLE,
+    PIN_D_OUT_0,
+    PIN_D_OUT_1,
+    PIN_D_IN_0,
+    PIN_D_IN_1
 };
 
 IdString PortPinToId(PortPin type);
@@ -159,47 +159,46 @@ PortPin PortPinFromId(IdString id);
 
 // -----------------------------------------------------------------------
 
-
 struct BelInfoPOD
 {
-	const char *name;
-	BelType type;
-	int8_t x, y, z;
+    const char *name;
+    BelType type;
+    int8_t x, y, z;
 };
 
 struct BelPortPOD
 {
-	int32_t bel_index;
-	PortPin port;
+    int32_t bel_index;
+    PortPin port;
 };
 
 struct PipInfoPOD
 {
-	int32_t src, dst;
-	float delay;
-	int8_t x, y;
+    int32_t src, dst;
+    float delay;
+    int8_t x, y;
 };
 
 struct WireInfoPOD
 {
-	const char *name;
-	int num_uphill, num_downhill;
-	int *pips_uphill, *pips_downhill;
+    const char *name;
+    int num_uphill, num_downhill;
+    int *pips_uphill, *pips_downhill;
 
-	int num_bels_downhill;
-	BelPortPOD bel_uphill;
-	BelPortPOD *bels_downhill;
+    int num_bels_downhill;
+    BelPortPOD bel_uphill;
+    BelPortPOD *bels_downhill;
 
-	float x, y;
+    float x, y;
 };
 
 struct ChipInfoPOD
 {
-	int width, height;
-	int num_bels, num_wires, num_pips;
-	BelInfoPOD *bel_data;
-	WireInfoPOD *wire_data;
-	PipInfoPOD *pip_data;
+    int width, height;
+    int num_bels, num_wires, num_pips;
+    BelInfoPOD *bel_data;
+    WireInfoPOD *wire_data;
+    PipInfoPOD *pip_data;
 };
 
 extern ChipInfoPOD chip_info_384;
@@ -211,248 +210,256 @@ extern ChipInfoPOD chip_info_8k;
 
 struct BelId
 {
-	int32_t index = -1;
+    int32_t index = -1;
 
-	bool nil() const {
-		return index < 0;
-	}
+    bool nil() const { return index < 0; }
 
-	bool operator==(const BelId &other) const { return index == other.index; }
-	bool operator!=(const BelId &other) const { return index != other.index; }
+    bool operator==(const BelId &other) const { return index == other.index; }
+    bool operator!=(const BelId &other) const { return index != other.index; }
 };
 
 struct WireId
 {
-	int32_t index = -1;
+    int32_t index = -1;
 
-	bool nil() const {
-		return index < 0;
-	}
+    bool nil() const { return index < 0; }
 
-	bool operator==(const WireId &other) const { return index == other.index; }
-	bool operator!=(const WireId &other) const { return index != other.index; }
+    bool operator==(const WireId &other) const { return index == other.index; }
+    bool operator!=(const WireId &other) const { return index != other.index; }
 };
 
 struct PipId
 {
-	int32_t index = -1;
+    int32_t index = -1;
 
-	bool nil() const {
-		return index < 0;
-	}
+    bool nil() const { return index < 0; }
 
-	bool operator==(const PipId &other) const { return index == other.index; }
-	bool operator!=(const PipId &other) const { return index != other.index; }
+    bool operator==(const PipId &other) const { return index == other.index; }
+    bool operator!=(const PipId &other) const { return index != other.index; }
 };
 
 struct BelPin
 {
-	BelId bel;
-	PortPin pin;
+    BelId bel;
+    PortPin pin;
 };
 
-namespace std
+namespace std {
+template <> struct hash<BelId>
 {
-	template<> struct hash<BelId>
-        {
-		std::size_t operator()(const BelId &bel) const noexcept
-		{
-			return bel.index;
-		}
-	};
+    std::size_t operator()(const BelId &bel) const noexcept
+    {
+        return bel.index;
+    }
+};
 
-	template<> struct hash<WireId>
-        {
-		std::size_t operator()(const WireId &wire) const noexcept
-		{
-			return wire.index;
-		}
-	};
+template <> struct hash<WireId>
+{
+    std::size_t operator()(const WireId &wire) const noexcept
+    {
+        return wire.index;
+    }
+};
 
-	template<> struct hash<PipId>
-        {
-		std::size_t operator()(const PipId &wire) const noexcept
-		{
-			return wire.index;
-		}
-	};
+template <> struct hash<PipId>
+{
+    std::size_t operator()(const PipId &wire) const noexcept
+    {
+        return wire.index;
+    }
+};
 }
 
 // -----------------------------------------------------------------------
 
 struct BelIterator
 {
-	int cursor;
-
-	void operator++() { cursor++; }
-	bool operator!=(const BelIterator &other) const { return cursor != other.cursor; }
-
-	BelId operator*() const {
-		BelId ret;
-		ret.index = cursor;
-		return ret;
-	}
+    int cursor;
+
+    void operator++() { cursor++; }
+    bool operator!=(const BelIterator &other) const
+    {
+        return cursor != other.cursor;
+    }
+
+    BelId operator*() const
+    {
+        BelId ret;
+        ret.index = cursor;
+        return ret;
+    }
 };
 
 struct BelRange
 {
-	BelIterator b, e;
-	BelIterator begin() const { return b; }
-	BelIterator end() const { return e; }
+    BelIterator b, e;
+    BelIterator begin() const { return b; }
+    BelIterator end() const { return e; }
 };
 
 // -----------------------------------------------------------------------
 
 struct BelPinIterator
 {
-	BelPortPOD *ptr = nullptr;
-
-	void operator++() { ptr++; }
-	bool operator!=(const BelPinIterator &other) const { return ptr != other.ptr; }
-
-	BelPin operator*() const {
-		BelPin ret;
-		ret.bel.index = ptr->bel_index;
-		ret.pin = ptr->port;
-		return ret;
-	}
+    BelPortPOD *ptr = nullptr;
+
+    void operator++() { ptr++; }
+    bool operator!=(const BelPinIterator &other) const
+    {
+        return ptr != other.ptr;
+    }
+
+    BelPin operator*() const
+    {
+        BelPin ret;
+        ret.bel.index = ptr->bel_index;
+        ret.pin = ptr->port;
+        return ret;
+    }
 };
 
 struct BelPinRange
 {
-	BelPinIterator b, e;
-	BelPinIterator begin() const { return b; }
-	BelPinIterator end() const { return e; }
+    BelPinIterator b, e;
+    BelPinIterator begin() const { return b; }
+    BelPinIterator end() const { return e; }
 };
 
 // -----------------------------------------------------------------------
 
 struct WireIterator
 {
-	int cursor = -1;
-
-	void operator++() { cursor++; }
-	bool operator!=(const WireIterator &other) const { return cursor != other.cursor; }
-
-	WireId operator*() const {
-		WireId ret;
-		ret.index = cursor;
-		return ret;
-	}
+    int cursor = -1;
+
+    void operator++() { cursor++; }
+    bool operator!=(const WireIterator &other) const
+    {
+        return cursor != other.cursor;
+    }
+
+    WireId operator*() const
+    {
+        WireId ret;
+        ret.index = cursor;
+        return ret;
+    }
 };
 
 struct WireRange
 {
-	WireIterator b, e;
-	WireIterator begin() const { return b; }
-	WireIterator end() const { return e; }
+    WireIterator b, e;
+    WireIterator begin() const { return b; }
+    WireIterator end() const { return e; }
 };
 
 // -----------------------------------------------------------------------
 
 struct AllPipIterator
 {
-	int cursor = -1;
-
-	void operator++() { cursor++; }
-	bool operator!=(const AllPipIterator &other) const { return cursor != other.cursor; }
-
-	PipId operator*() const {
-		PipId ret;
-		ret.index = cursor;
-		return ret;
-	}
+    int cursor = -1;
+
+    void operator++() { cursor++; }
+    bool operator!=(const AllPipIterator &other) const
+    {
+        return cursor != other.cursor;
+    }
+
+    PipId operator*() const
+    {
+        PipId ret;
+        ret.index = cursor;
+        return ret;
+    }
 };
 
 struct AllPipRange
 {
-	AllPipIterator b, e;
-	AllPipIterator begin() const { return b; }
-	AllPipIterator end() const { return e; }
+    AllPipIterator b, e;
+    AllPipIterator begin() const { return b; }
+    AllPipIterator end() const { return e; }
 };
 
 // -----------------------------------------------------------------------
 
 struct PipIterator
 {
-	int *cursor = nullptr;
-
-	void operator++() { cursor++; }
-	bool operator!=(const PipIterator &other) const { return cursor != other.cursor; }
-
-	PipId operator*() const {
-		PipId ret;
-		ret.index = *cursor;
-		return ret;
-	}
+    int *cursor = nullptr;
+
+    void operator++() { cursor++; }
+    bool operator!=(const PipIterator &other) const
+    {
+        return cursor != other.cursor;
+    }
+
+    PipId operator*() const
+    {
+        PipId ret;
+        ret.index = *cursor;
+        return ret;
+    }
 };
 
 struct PipRange
 {
-	PipIterator b, e;
-	PipIterator begin() const { return b; }
-	PipIterator end() const { return e; }
+    PipIterator b, e;
+    PipIterator begin() const { return b; }
+    PipIterator end() const { return e; }
 };
 
 // -----------------------------------------------------------------------
 
 struct ChipArgs
 {
-	enum {
-		NONE,
-		LP384,
-		LP1K,
-		LP8K,
-		HX1K,
-		HX8K,
-		UP5K
-	} type = NONE;
+    enum
+    {
+        NONE,
+        LP384,
+        LP1K,
+        LP8K,
+        HX1K,
+        HX8K,
+        UP5K
+    } type = NONE;
 };
 
 struct Chip
 {
-	ChipInfoPOD chip_info;
+    ChipInfoPOD chip_info;
 
-	mutable dict<IdString, int> bel_by_name;
-	mutable dict<IdString, int> wire_by_name;
-	mutable dict<IdString, int> pip_by_name;
+    mutable dict<IdString, int> bel_by_name;
+    mutable dict<IdString, int> wire_by_name;
+    mutable dict<IdString, int> pip_by_name;
 
-	Chip(ChipArgs args);
+    Chip(ChipArgs args);
 
-	// -------------------------------------------------
+    // -------------------------------------------------
 
-	BelId getBelByName(IdString name) const;
+    BelId getBelByName(IdString name) const;
 
-	IdString getBelName(BelId bel) const
-	{
-		assert(!bel.nil());
-		return chip_info.bel_data[bel.index].name;
-	}
+    IdString getBelName(BelId bel) const
+    {
+        assert(!bel.nil());
+        return chip_info.bel_data[bel.index].name;
+    }
 
-	void bindBel(BelId bel, IdString cell)
-	{
-	}
+    void bindBel(BelId bel, IdString cell) {}
 
-	void unbindBel(BelId bel)
-	{
-	}
+    void unbindBel(BelId bel) {}
 
-	bool checkBelAvail(BelId bel) const
-	{
-	}
+    bool checkBelAvail(BelId bel) const {}
 
-	BelRange getBels() const
-	{
-		BelRange range;
-		range.b.cursor = 0;
-		range.e.cursor = chip_info.num_bels;
-		return range;
-	}
+    BelRange getBels() const
+    {
+        BelRange range;
+        range.b.cursor = 0;
+        range.e.cursor = chip_info.num_bels;
+        return range;
+    }
 
-	BelRange getBelsByType(BelType type) const
-	{
-		BelRange range;
-		// FIXME
+    BelRange getBelsByType(BelType type) const
+    {
+        BelRange range;
+// FIXME
 #if 0
 		if (type == "TYPE_A") {
 			range.b.cursor = bels_type_a_begin;
@@ -460,161 +467,155 @@ struct Chip
 		}
 		...
 #endif
-		return range;
-	}
-
-	BelType getBelType(BelId bel) const
-	{
-		assert(!bel.nil());
-		return chip_info.bel_data[bel.index].type;
-	}
-
-	WireId getWireBelPin(BelId bel, PortPin pin) const;
-
-	BelPin getBelPinUphill(WireId wire) const
-	{
-		BelPin ret;
-		assert(!wire.nil());
-
-		if (chip_info.wire_data[wire.index].bel_uphill.bel_index >= 0) {
-			ret.bel.index = chip_info.wire_data[wire.index].bel_uphill.bel_index;
-			ret.pin = chip_info.wire_data[wire.index].bel_uphill.port;
-		}
-
-		return ret;
-	}
-
-	BelPinRange getBelPinsDownhill(WireId wire) const
-	{
-		BelPinRange range;
-		assert(!wire.nil());
-		range.b.ptr = chip_info.wire_data[wire.index].bels_downhill;
-		range.e.ptr = range.b.ptr + chip_info.wire_data[wire.index].num_bels_downhill;
-		return range;
-	}
-
-	// -------------------------------------------------
-
-	WireId getWireByName(IdString name) const;
-
-	IdString getWireName(WireId wire) const
-	{
-		assert(!wire.nil());
-		return chip_info.wire_data[wire.index].name;
-	}
-
-	void bindWire(WireId bel, IdString net)
-	{
-	}
-
-	void unbindWire(WireId bel)
-	{
-	}
-
-	bool checkWireAvail(WireId bel) const
-	{
-	}
-
-	WireRange getWires() const
-	{
-		WireRange range;
-		range.b.cursor = 0;
-		range.e.cursor = chip_info.num_wires;
-		return range;
-	}
-
-	// -------------------------------------------------
-
-	PipId getPipByName(IdString name) const;
-
-	IdString getPipName(PipId pip) const
-	{
-		assert(!pip.nil());
-		std::string src_name = chip_info.wire_data[chip_info.pip_data[pip.index].src].name;
-		std::string dst_name = chip_info.wire_data[chip_info.pip_data[pip.index].dst].name;
-		return src_name + "->" + dst_name;
-	}
-
-	void bindPip(PipId bel, IdString net)
-	{
-	}
-
-	void unbindPip(PipId bel)
-	{
-	}
-
-	bool checkPipAvail(PipId bel) const
-	{
-	}
-
-	AllPipRange getPips() const
-	{
-		AllPipRange range;
-		range.b.cursor = 0;
-		range.e.cursor = chip_info.num_pips;
-		return range;
-	}
-
-	WireId getPipSrcWire(PipId pip) const
-	{
-		WireId wire;
-		assert(!pip.nil());
-		wire.index = chip_info.pip_data[pip.index].src;
-		return wire;
-	}
-
-	WireId getPipDstWire(PipId pip) const
-	{
-		WireId wire;
-		assert(!pip.nil());
-		wire.index = chip_info.pip_data[pip.index].dst;
-		return wire;
-	}
-
-	DelayInfo getPipDelay(PipId pip) const
-	{
-		DelayInfo delay;
-		assert(!pip.nil());
-		delay.delay = chip_info.pip_data[pip.index].delay;
-		return delay;
-	}
-
-	PipRange getPipsDownhill(WireId wire) const
-	{
-		PipRange range;
-		assert(!wire.nil());
-		range.b.cursor = chip_info.wire_data[wire.index].pips_downhill;
-		range.e.cursor = range.b.cursor + chip_info.wire_data[wire.index].num_downhill;
-		return range;
-	}
-
-	PipRange getPipsUphill(WireId wire) const
-	{
-		PipRange range;
-		assert(!wire.nil());
-		range.b.cursor = chip_info.wire_data[wire.index].pips_uphill;
-		range.e.cursor = range.b.cursor + chip_info.wire_data[wire.index].num_uphill;
-		return range;
-	}
-
-	PipRange getWireAliases(WireId wire) const
-	{
-		PipRange range;
-		assert(!wire.nil());
-		range.b.cursor = nullptr;
-		range.e.cursor = nullptr;
-		return range;
-	}
-
-	// -------------------------------------------------
-
-	void getBelPosition(BelId bel, float &x, float &y) const;
-	void getWirePosition(WireId wire, float &x, float &y) const;
-	void getPipPosition(PipId pip, float &x, float &y) const;
-	vector<GraphicElement> getBelGraphics(BelId bel) const;
-	vector<GraphicElement> getWireGraphics(WireId wire) const;
-	vector<GraphicElement> getPipGraphics(PipId pip) const;
-	vector<GraphicElement> getFrameGraphics() const;
+        return range;
+    }
+
+    BelType getBelType(BelId bel) const
+    {
+        assert(!bel.nil());
+        return chip_info.bel_data[bel.index].type;
+    }
+
+    WireId getWireBelPin(BelId bel, PortPin pin) const;
+
+    BelPin getBelPinUphill(WireId wire) const
+    {
+        BelPin ret;
+        assert(!wire.nil());
+
+        if (chip_info.wire_data[wire.index].bel_uphill.bel_index >= 0) {
+            ret.bel.index =
+                    chip_info.wire_data[wire.index].bel_uphill.bel_index;
+            ret.pin = chip_info.wire_data[wire.index].bel_uphill.port;
+        }
+
+        return ret;
+    }
+
+    BelPinRange getBelPinsDownhill(WireId wire) const
+    {
+        BelPinRange range;
+        assert(!wire.nil());
+        range.b.ptr = chip_info.wire_data[wire.index].bels_downhill;
+        range.e.ptr =
+                range.b.ptr + chip_info.wire_data[wire.index].num_bels_downhill;
+        return range;
+    }
+
+    // -------------------------------------------------
+
+    WireId getWireByName(IdString name) const;
+
+    IdString getWireName(WireId wire) const
+    {
+        assert(!wire.nil());
+        return chip_info.wire_data[wire.index].name;
+    }
+
+    void bindWire(WireId bel, IdString net) {}
+
+    void unbindWire(WireId bel) {}
+
+    bool checkWireAvail(WireId bel) const {}
+
+    WireRange getWires() const
+    {
+        WireRange range;
+        range.b.cursor = 0;
+        range.e.cursor = chip_info.num_wires;
+        return range;
+    }
+
+    // -------------------------------------------------
+
+    PipId getPipByName(IdString name) const;
+
+    IdString getPipName(PipId pip) const
+    {
+        assert(!pip.nil());
+        std::string src_name =
+                chip_info.wire_data[chip_info.pip_data[pip.index].src].name;
+        std::string dst_name =
+                chip_info.wire_data[chip_info.pip_data[pip.index].dst].name;
+        return src_name + "->" + dst_name;
+    }
+
+    void bindPip(PipId bel, IdString net) {}
+
+    void unbindPip(PipId bel) {}
+
+    bool checkPipAvail(PipId bel) const {}
+
+    AllPipRange getPips() const
+    {
+        AllPipRange range;
+        range.b.cursor = 0;
+        range.e.cursor = chip_info.num_pips;
+        return range;
+    }
+
+    WireId getPipSrcWire(PipId pip) const
+    {
+        WireId wire;
+        assert(!pip.nil());
+        wire.index = chip_info.pip_data[pip.index].src;
+        return wire;
+    }
+
+    WireId getPipDstWire(PipId pip) const
+    {
+        WireId wire;
+        assert(!pip.nil());
+        wire.index = chip_info.pip_data[pip.index].dst;
+        return wire;
+    }
+
+    DelayInfo getPipDelay(PipId pip) const
+    {
+        DelayInfo delay;
+        assert(!pip.nil());
+        delay.delay = chip_info.pip_data[pip.index].delay;
+        return delay;
+    }
+
+    PipRange getPipsDownhill(WireId wire) const
+    {
+        PipRange range;
+        assert(!wire.nil());
+        range.b.cursor = chip_info.wire_data[wire.index].pips_downhill;
+        range.e.cursor =
+                range.b.cursor + chip_info.wire_data[wire.index].num_downhill;
+        return range;
+    }
+
+    PipRange getPipsUphill(WireId wire) const
+    {
+        PipRange range;
+        assert(!wire.nil());
+        range.b.cursor = chip_info.wire_data[wire.index].pips_uphill;
+        range.e.cursor =
+                range.b.cursor + chip_info.wire_data[wire.index].num_uphill;
+        return range;
+    }
+
+    PipRange getWireAliases(WireId wire) const
+    {
+        PipRange range;
+        assert(!wire.nil());
+        range.b.cursor = nullptr;
+        range.e.cursor = nullptr;
+        return range;
+    }
+
+    // -------------------------------------------------
+
+    void getBelPosition(BelId bel, float &x, float &y) const;
+    void getWirePosition(WireId wire, float &x, float &y) const;
+    void getPipPosition(PipId pip, float &x, float &y) const;
+    vector<GraphicElement> getBelGraphics(BelId bel) const;
+    vector<GraphicElement> getWireGraphics(WireId wire) const;
+    vector<GraphicElement> getPipGraphics(PipId pip) const;
+    vector<GraphicElement> getFrameGraphics() const;
 };
 
 #endif