TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-18 09:24:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

added a test for sequential GAL16v8 programming

Browse Source
This commit is contained in:
helmut.neemann 2016-05-30 10:31:54 +02:00
parent 33a24aa418
commit c5766749d4
2 changed files with 69 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/de/neemann/digital/builder/Gal16v8/Gal16v8JEDECExporter.java
View File

@ -98,12 +98,18 @@ public class Gal16v8JEDECExporter implements ExpressionExporter<Gal16v8JEDECExpo
} }
for (String o : builder.getOutputs()) { for (String o : builder.getOutputs()) {
int offs = (19 - pinMap.getOutputFor(o)) * 256; int OLMC = 19 - pinMap.getOutputFor(o);
int offs = OLMC * 256;
if (builder.getCombinatorial().containsKey(o)) { if (builder.getCombinatorial().containsKey(o)) {
for (int j = 0; j < 32; j++) map.setFuse(offs + j); if (registered) {
filler.fillExpression(offs + 32, builder.getCombinatorial().get(o), 7); for (int j = 0; j < 32; j++) map.setFuse(offs + j);
filler.fillExpression(offs + 32, builder.getCombinatorial().get(o), 7);
} else {
map.setFuse(XOR+OLMC); // set XOR to compensate inverted driver
filler.fillExpression(offs, builder.getCombinatorial().get(o), 8);
}
} else if (builder.getRegistered().containsKey(o)) { } else if (builder.getRegistered().containsKey(o)) {
enableRegisterFor(19 - pinMap.getOutputFor(o)); enableRegisterFor(OLMC);
filler.fillExpression(offs, builder.getRegistered().get(o), 8); filler.fillExpression(offs, builder.getRegistered().get(o), 8);
} else } else
throw new FuseMapFillerException("variable " + o + " not found!"); throw new FuseMapFillerException("variable " + o + " not found!");

61
src/test/java/de/neemann/digital/builder/Gal16v8/Gal16V8JEDECExporterTest.java
View File

@ -15,8 +15,8 @@ import static de.neemann.digital.analyse.expression.Operation.or;
*/ */
public class Gal16V8JEDECExporterTest extends TestCase { public class Gal16V8JEDECExporterTest extends TestCase {
// stepper control // stepper control; sequential and combinatorial
public void testWriteTo() throws Exception { public void testSequential() throws Exception {
Variable D = new Variable("D"); Variable D = new Variable("D");
Variable Q0 = new Variable("Q0"); Variable Q0 = new Variable("Q0");
@ -113,4 +113,61 @@ public class Gal16V8JEDECExporterTest extends TestCase {
} }
// BitCount
public void testCommbinatorial() throws Exception {
Variable A = new Variable("A");
Variable B = new Variable("B");
Variable C = new Variable("C");
//Y_0 = (!A & !B & C) #
// (!A & B & !C) #
// (A & !B & !C) #
// (A & B & C);
Expression Y_0 = or(
and(not(A), not(B), C),
and(not(A), B, not(C)),
and(A, not(B), not(C)),
and(A, B, C));
//Y_1 = (A & C) # (A & B) # (B & C);
Expression Y_1 = or(and(A, C), and(A, B), and(B, C));
Gal16v8JEDECExporter gal = new Gal16v8JEDECExporter()
.assignPin("A", 2)
.assignPin("B", 3)
.assignPin("C", 4)
.assignPin("Y_1", 12)
.assignPin("Y_0", 13);
gal.getBuilder()
.addCombinatorial("Y_0", Y_0)
.addCombinatorial("Y_1", Y_1);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
gal.writeTo(baos);
assertEquals("\u0002Digital GAL16v8 assembler*\r\n" +
"QF2194*\r\n" +
"G0*\r\n" +
"F0*\r\n" +
"L1536 10111011011111111111111111111111*\r\n" +
"L1568 10110111101111111111111111111111*\r\n" +
"L1600 01111011101111111111111111111111*\r\n" +
"L1632 01110111011111111111111111111111*\r\n" +
"L1792 01111111011111111111111111111111*\r\n" +
"L1824 01110111111111111111111111111111*\r\n" +
"L1856 11110111011111111111111111111111*\r\n" +
//"L2048 00000011001100000011000000100000*\r\n" + // WinCupl fills some bits to the signature! Don't know why!
"L2048 00000011000000000000000000000000*\r\n" +
//"L2112 00000000111111001111111111111111*\r\n" + // WinCupl sets AC1(n) for unused OLMC! Don't know why!
"L2112 00000000000000001111111111111111*\r\n" +
"L2144 11111111111111111111111111111111*\r\n" +
"L2176 111111111111111110*\r\n" +
"C240D*\r\n" +
"\u00035E1B", baos.toString());
}
} }