remove inversion from kessels OLC scan (and special case from test code)

diff --git a/electric/kesselsCounter.jelib b/electric/kesselsCounter.jelib
index 976b5d1..32cd7cf 100644 (file)
--- a/electric/kesselsCounter.jelib
+++ b/electric/kesselsCounter.jelib
@@ -388,7 +388,7 @@ Eval|~val|D5G2;Y2;|pin@15||B
 X
 
 # Cell counter_oneBit;1{sch}
-Ccounter_oneBit;1{sch}||schematic|1242938375621|1243579053003|
+Ccounter_oneBit;1{sch}||schematic|1242938375621|1243579171258|
 Ngeneric:Facet-Center|art@0||0|0||||AV
 NOff-Page|conn@11||-22|77|||XRRR|
 NOff-Page|conn@12||24|46|||X|
@@ -416,7 +416,6 @@ IredFive:inv;1{ic}|inv@16||-102|-13|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_
 IredFive:inv;1{ic}|inv@17||-119|-15|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@18||-119|-11|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@19||-86|-17|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
-IredFive:inv;1{ic}|inv@20||-70|-24|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@23||-102|-47|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@25||-102|-36|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
 IredFive:inv;1{ic}|inv@26||-119|-38|||D5G4;|ATTR_Delay(D5G1;NPX2;Y-2;)I100|ATTR_X(D5FLeave alone;G1.5;NOLPX1.5;Y2;)S1|ATTR_drive0(P)Sstrong0|ATTR_drive1(P)Sstrong1
@@ -525,6 +524,8 @@ NWire_Pin|pin@202||-96.5|10||||
 NWire_Pin|pin@203||-105|-2||||
 NWire_Pin|pin@204||-105|7||||
 NWire_Pin|pin@205||-85.5|7||||
+NWire_Pin|pin@206||-67.5|-24||||
+NWire_Pin|pin@207||-72.5|-24||||
 Awire|ci|D5G2;||0|nand2@4|inb|-128.5|17|pin@113||-145|17
 Awire|ci|D5G2;||0|pin@136||-114.5|-24|pin@109||-145|-24
 Awire|ci|D5G2;||0|inv@18|in|-121.5|-11|pin@145||-141|-11
@@ -599,8 +600,6 @@ Awire|net@267|||900|pin@150||-82|-17|pin@151||-82|-23
 Awire|net@268|||1800|pin@151||-82|-23|nor2@2|inb|-79.5|-23
 Awire|net@270|||2700|pin@152||-82|-35|pin@153||-82|-25
 Awire|net@271|||1800|pin@153||-82|-25|nor2@2|ina|-79.5|-25
-Awire|net@272|||1800|nor2@2|out|-74.5|-24|inv@20|in|-72.5|-24
-Awire|net@273|||1800|inv@20|out|-67.5|-24|conn@29|a|-61|-24
 Awire|net@276|||1800|pin@136||-114.5|-24|nand3@0|inb|-112.5|-24
 Awire|net@277|||1800|inv@7|out|-116.5|-22|nand3@0|inc|-112.5|-22
 Awire|net@278|||1800|inv@15|out|-116.5|-26|nand3@0|ina|-112.5|-26
@@ -644,6 +643,9 @@ Awire|net@346|||1800|nand2@6|out|-123.5|-2|pin@203||-105|-2
 Awire|net@347|||2700|pin@203||-105|-2|pin@204||-105|7
 Awire|net@348|||1800|pin@204||-105|7|pin@205||-85.5|7
 Awire|net@349|||2700|pin@205||-85.5|7|nand2@8|ina|-85.5|8
+Awire|net@350|||0|conn@29|a|-61|-24|pin@206||-67.5|-24
+Awire|net@351|||1800|nor2@2|out|-74.5|-24|pin@207||-72.5|-24
+Awire|net@352|||1800|pin@207||-72.5|-24|pin@206||-67.5|-24
 Awire|one|D5G2;RRRY-4;||900|pin@64||-31|22|pin@38||-31|4
 Awire|one|D5G2;||0|inv@15|in|-121.5|-26|pin@140||-141|-26
 Awire|one|D5G2;||0|inv@17|in|-121.5|-15|pin@144||-141|-15

diff --git a/testCode/com/sun/vlsi/chips/marina/test/Marina.java b/testCode/com/sun/vlsi/chips/marina/test/Marina.java
index 158e6df..353a88f 100644 (file)
--- a/testCode/com/sun/vlsi/chips/marina/test/Marina.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/Marina.java
@@ -277,10 +277,8 @@ public class Marina {
         shiftReport(true, false);
         BitVector odd = cc.getOutBits(REPORT_CHAIN+"."+OLC_PATH_ODD).bitReverse();
         BitVector even = cc.getOutBits(REPORT_CHAIN+"."+OLC_PATH_EVEN).bitReverse();
-        if (!kesselsCounter) {
-            odd = odd.not();
-            even = even.not();
-        }
+        odd = odd.not();
+        even = even.not();
         BitVector bv = new BitVector(6, "olc");
         for(int i=0; i<3; i++) {
             bv.set(i*2,   odd.get(i));

diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index d7eec1b..6973111 100644 (file)
--- a/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -2080,6 +2080,13 @@ public class MarinaTest {
                     doOneTest(2);       // passes extracted parasitics
                     doOneTest(3);       // passes extracted parasitics
                     doOneTest(4);       // passes extracted parasitics
+
+                    doOneTest(6);
+                    doOneTest(1002);
+                    doOneTest(1005);
+                    doOneTest(3019);
+                    doOneTest(3025);
+
                     doOneTest(5);       // passes extracted parasitics
                     doOneTest(6);       // passes extracted parasitics
                     doOneTest(1000);    // passes extracted parasitics