dealing with transistor notch issues

broccolimicro · Mar 28, 2024 · 4ad490e · 4ad490e
1 parent 3391190
commit 4ad490e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/deps/ruler b/deps/ruler
diff --git a/floret/Circuit.cpp b/floret/Circuit.cpp
@@ -309,7 +309,7 @@ void Stack::push(const Circuit *ckt, int device, bool flip) {
 	// contact, then add this transistor. We need to test both the flipped and
 	// unflipped orderings.
 
-	if (not link and not pins.empty() and pins.back().device >= 0) {
+	if (not link and not pins.empty() and pins.back().isGate()) {
 		pins.push_back(Pin(ckt->tech, pins.back().rightNet));
 	}
 
@@ -348,7 +348,7 @@ void Stack::draw(const Tech &tech, const Circuit *base, Layout &dst) {
 
 Circuit::Circuit(const Tech &tech) : tech(tech) {
 	cellHeight = 0;
-	for (int type = 0; type < 3; type++) {
+	for (int type = 0; type < (int)stack.size(); type++) {
 		stack[type].type = type;
 	}
 }

diff --git a/floret/Router.cpp b/floret/Router.cpp
@@ -918,8 +918,8 @@ void Router::buildHorizConstraints(const Tech &tech) {
 			if (i+1 < (int)base->stack[type].pins.size()) {
 				printf("pin to pin %d,%d\n", type, i);
 				Pin &next = base->stack[type].pins[i+1];
-				int substrateMode = (pin.isGate() or next.isGate()) ? Layout::IGNORE : Layout::DEFAULT;
-				if (minOffset(&off, tech, 0, pin.layout, 0, next.layout, 0, substrateMode, Layout::DEFAULT)) {
+				int substrateMode = (pin.isGate() or next.isGate()) ? Layout::MERGENET : Layout::DEFAULT;
+				if (minOffset(&off, tech, 0, pin.layout, 0, next.layout, 0, substrateMode, Layout::DEFAULT, false)) {
 					pin.offsetToPin(Index(type, i+1), off);
 				} else {
 					printf("error: no offset found at pin (%d,%d)\n", type, i+1);