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

Check the circuit for errors before creating the hdl.

Browse Source
This commit is contained in:
hneemann 2019-05-22 07:35:27 +02:00
parent ca665c86a6
commit d2785a9d9e
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/de/neemann/digital/toolchain/Configuration.java
View File

@ -8,11 +8,15 @@ package de.neemann.digital.toolchain;
import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.StaxDriver; import com.thoughtworks.xstream.io.xml.StaxDriver;
import de.neemann.digital.builder.tt2.OSExecute; import de.neemann.digital.builder.tt2.OSExecute;
import de.neemann.digital.core.NodeException;
import de.neemann.digital.core.element.Keys; import de.neemann.digital.core.element.Keys;
import de.neemann.digital.core.wiring.Clock; import de.neemann.digital.core.wiring.Clock;
import de.neemann.digital.draw.elements.Circuit; import de.neemann.digital.draw.elements.Circuit;
import de.neemann.digital.draw.elements.PinException;
import de.neemann.digital.draw.elements.VisualElement; import de.neemann.digital.draw.elements.VisualElement;
import de.neemann.digital.draw.library.ElementLibrary; import de.neemann.digital.draw.library.ElementLibrary;
import de.neemann.digital.draw.library.ElementNotFoundException;
import de.neemann.digital.draw.model.ModelCreator;
import de.neemann.digital.gui.SaveAsHelper; import de.neemann.digital.gui.SaveAsHelper;
import de.neemann.digital.gui.StatusInterface; import de.neemann.digital.gui.StatusInterface;
import de.neemann.digital.hdl.hgs.*; import de.neemann.digital.hdl.hgs.*;
@ -234,7 +238,13 @@ public final class Configuration {
return name; return name;
} }
private HDLModel writeHDL(String hdl, File digFile) throws IOException, HGSEvalException { private HDLModel writeHDL(String hdl, File digFile) throws IOException, HGSEvalException, ElementNotFoundException, PinException, NodeException {
// Creates the simulation model to ensure the circuit is error free.
new ModelCreator(circuitProvider.getCurrentCircuit(), libraryProvider.getCurrentLibrary())
.createModel(false)
.close();
switch (hdl) { switch (hdl) {
case "verilog": case "verilog":
File verilogFile = SaveAsHelper.checkSuffix(digFile, "v"); File verilogFile = SaveAsHelper.checkSuffix(digFile, "v");

2
src/test/java/de/neemann/digital/toolchain/ConfigurationTest.java
View File

@ -123,7 +123,7 @@ public class ConfigurationTest extends TestCase {
@Override @Override
public void showError(Command command, Exception e) { public void showError(Command command, Exception e) {
throw new RuntimeException(command.getName(), e); fail(e.getMessage());
} }
void clear() { void clear() {