diff --git a/src/main/dig/cmos/d-tg-ff2.dig b/src/main/dig/cmos/d-tg-ff2.dig new file mode 100644 index 000000000..a81e48e5c --- /dev/null +++ b/src/main/dig/cmos/d-tg-ff2.dig @@ -0,0 +1,356 @@ + + + 1 + + + Description + The two FETs in the transmission gate are not +necessary in this simulation because no body diodes +are simulated. +In order to be compatible with the literature, two FETs +are also used in the simulation. + + + + + PFET + + + + + PFET + + + + + NFET + + + + + NFET + + + + + Out + + + Description + not Out + + + Label + ~Q + + + + + + Out + + + Description + Out + + + Label + Q + + + + + + NFET + + + rotation + + + + + + + PFET + + + rotation + + + + + + + In + + + Description + Data In + + + Label + D + + + + + + NFET + + + + + PFET + + + + + VDD + + + + + In + + + Description + Clock In + + + Label + C + + + + + + Ground + + + + + Testcase + + + Testdata + + C D Q ~Q +1 0 0 1 +0 0 0 1 +0 1 0 1 +0 0 0 1 +1 1 1 0 +0 1 1 0 +0 0 1 0 +1 0 0 1 +0 0 0 1 + + + + + + + + VDD + + + + + Ground + + + + + PullUp + + + + + PullDown + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/java/de/neemann/digital/integration/TestExamples.java b/src/test/java/de/neemann/digital/integration/TestExamples.java index 951332855..82618ad12 100644 --- a/src/test/java/de/neemann/digital/integration/TestExamples.java +++ b/src/test/java/de/neemann/digital/integration/TestExamples.java @@ -28,8 +28,8 @@ public class TestExamples extends TestCase { */ public void testDistExamples() throws Exception { File examples = new File(Resources.getRoot().getParentFile().getParentFile(), "/main/dig"); - assertEquals(189, new FileScanner(this::check).scan(examples)); - assertEquals(88, testCasesInFiles); + assertEquals(188, new FileScanner(this::check).scan(examples)); + assertEquals(87, testCasesInFiles); } /** @@ -39,8 +39,8 @@ public class TestExamples extends TestCase { */ public void testTestExamples() throws Exception { File examples = new File(Resources.getRoot(), "/dig/test"); - assertEquals(78, new FileScanner(this::check).scan(examples)); - assertEquals(72, testCasesInFiles); + assertEquals(80, new FileScanner(this::check).scan(examples)); + assertEquals(74, testCasesInFiles); } diff --git a/src/main/dig/cmos/d-ff.dig b/src/test/resources/dig/test/fet/d-ff.dig similarity index 100% rename from src/main/dig/cmos/d-ff.dig rename to src/test/resources/dig/test/fet/d-ff.dig diff --git a/src/main/dig/cmos/d-sram-ff.dig b/src/test/resources/dig/test/fet/d-sram-ff.dig similarity index 100% rename from src/main/dig/cmos/d-sram-ff.dig rename to src/test/resources/dig/test/fet/d-sram-ff.dig