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

fixed a bug in the CUPL generator logic

Browse Source
This commit is contained in:
hneemann 2018-01-11 18:19:03 +01:00
parent e44050b938
commit 9df338f820
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/de/neemann/digital/builder/hardware/GenerateCUPL.java
View File

@ -14,26 +14,28 @@ import java.io.FileOutputStream;
import java.io.IOException;
/**
* Creates CUPL code
* Creates CUPL code.
* The {@link GenerateFile} class is not usable for CUPL creation because CUPL files needed to be stored
* in a separate folder. Here you will find the creation of this new folder.
*/
public class GenerateCUPL implements HardwareDescriptionGenerator {
private CuplExporter cupl;
private String path;
private CuplExporterFactory cuplExporterFactory;
private String menuPath;
/**
* Creates e new instance
*
* @param cupl the CUPL exporter
* @param path the gui menu path
* @param cuplExporterFactory the CUPL exporter
* @param menuPath the gui menu path
*/
public GenerateCUPL(CuplExporter cupl, String path) {
this.cupl = cupl;
this.path = path;
public GenerateCUPL(CuplExporterFactory cuplExporterFactory, String menuPath) {
this.cuplExporterFactory = cuplExporterFactory;
this.menuPath = menuPath;
}
@Override
public String getMenuPath() {
return path;
return menuPath;
}
@Override
@ -70,11 +72,22 @@ public class GenerateCUPL implements HardwareDescriptionGenerator {
throw new IOException(Lang.get("err_couldNotCreateFolder_N0", cuplPath.getPath()));
File f = new File(cuplPath, "CUPL.PLD");
cupl.setProjectName(circuitFile.getName());
cupl.getPinMapping().addAll(table.getPins());
new BuilderExpressionCreator(cupl.getBuilder(), ExpressionModifier.IDENTITY).create(expressions);
CuplExporter cuplExporter = cuplExporterFactory.create();
cuplExporter.setProjectName(circuitFile.getName());
cuplExporter.getPinMapping().addAll(table.getPins());
new BuilderExpressionCreator(cuplExporter.getBuilder(), ExpressionModifier.IDENTITY).create(expressions);
try (FileOutputStream out = new FileOutputStream(f)) {
cupl.writeTo(out);
cuplExporter.writeTo(out);
}
}
/**
* Interface used to create a {@link CuplExporter}
*/
public interface CuplExporterFactory {
/**
* @return the created cupl exporter
*/
CuplExporter create();
}
}

6
src/main/java/de/neemann/digital/gui/components/table/TableDialog.java
View File

@ -433,14 +433,14 @@ public class TableDialog extends JDialog {
}
JMenu hardware = new JMenu(Lang.get("menu_table_create_hardware"));
register(hardware, new GenerateCUPL(new CuplExporter(), "GAL16v8/CUPL"));
register(hardware, new GenerateCUPL(CuplExporter::new, "GAL16v8/CUPL"));
register(hardware, new GenerateFile("jed", () -> new ExpressionToFileExporter(new Gal16v8JEDECExporter()),
"GAL16v8/JEDEC", Lang.get("menu_table_create_jedec_tt")));
register(hardware, new GenerateCUPL(new Gal22v10CuplExporter(), "GAL22v10/CUPL"));
register(hardware, new GenerateCUPL(Gal22v10CuplExporter::new, "GAL22v10/CUPL"));
register(hardware, new GenerateFile("jed", () -> new ExpressionToFileExporter(new Gal22v10JEDECExporter()),
"GAL22v10/JEDEC", Lang.get("menu_table_create_jedec_tt")));
for (ATFDevice atfDev : ATFDevice.values()) {
register(hardware, new GenerateCUPL(atfDev.getCuplExporter(), "ATF150x/" + atfDev.getMenuName() + "/CUPL"));
register(hardware, new GenerateCUPL(atfDev::getCuplExporter, "ATF150x/" + atfDev.getMenuName() + "/CUPL"));
register(hardware, new GenerateFile("tt2",
() -> atfDev.createExpressionToFileExporter(TableDialog.this, getProjectName()),
"ATF150x/" + atfDev.getMenuName() + "/TT2",