add code and data dump functionality in GUI also

andrescv · Jan 14, 2019 · 373064e · 373064e
1 parent 4e0c9b8
commit 373064e
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 33 deletions.
diff --git a/V-Sim/resources/css/vsim.css b/V-Sim/resources/css/vsim.css
@@ -301,7 +301,7 @@
   -fx-spacing: 5;
 }
 
-#goBtn, #stopBtn, #stepBtn, #backstepBtn, #resetBtn, #dumpBtn, #downBtn, #upBtn {
+#goBtn, #stopBtn, #stepBtn, #backstepBtn, #resetBtn, #dumpCodeBtn, #dumpDataBtn, #downBtn, #upBtn {
   -fx-cursor: hand;
   -fx-font-family: 'Roboto';
   -fx-font-weight: bold;
@@ -328,10 +328,14 @@
   -fx-background-color: #ffa000;
 }
 
-#dumpBtn {
+#dumpCodeBtn {
   -fx-background-color: #7b1fa2;
 }
 
+#dumpDataBtn {
+  -fx-background-color: #3949ab;
+}
+
 #upBtn {
   -fx-background-color: #00897b;
 }

diff --git a/V-Sim/resources/fxml/Simulator.fxml b/V-Sim/resources/fxml/Simulator.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<SplitPane dividerPositions="0.62" prefHeight="553.0" prefWidth="837.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="vsim.gui.controllers.SimulatorController">
+<SplitPane dividerPositions="0.62" prefHeight="624.0" prefWidth="966.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="vsim.gui.controllers.SimulatorController">
    <items>
       <VBox alignment="CENTER" minWidth="520.0" prefHeight="263.0" prefWidth="520.0">
          <children>
@@ -62,11 +62,20 @@
                         </ImageView>
                      </graphic>
                   </JFXButton>
-                  <JFXButton id="dumpBtn" fx:id="dumpBtn" text="Dump">
+                  <JFXButton id="dumpCodeBtn" fx:id="dumpCodeBtn" text="Dump Code">
                      <graphic>
                         <ImageView fitHeight="24.0" fitWidth="24.0" pickOnBounds="true" preserveRatio="true">
                            <image>
-                              <Image url="@../img/icons/dumpBtn.png" />
+                              <Image url="@../img/icons/code.png" />
+                           </image>
+                        </ImageView>
+                     </graphic>
+                  </JFXButton>
+                  <JFXButton id="dumpDataBtn" fx:id="dumpDataBtn" layoutX="491.0" layoutY="10.0" text="Dump Data">
+                     <graphic>
+                        <ImageView fitHeight="24.0" fitWidth="24.0" pickOnBounds="true" preserveRatio="true">
+                           <image>
+                              <Image url="@../img/icons/data.png" />
                            </image>
                         </ImageView>
                      </graphic>

diff --git a/V-Sim/resources/img/icons/code.png b/V-Sim/resources/img/icons/code.png
diff --git a/V-Sim/resources/img/icons/data.png b/V-Sim/resources/img/icons/data.png
diff --git a/V-Sim/resources/img/icons/dumpBtn.png b/V-Sim/resources/img/icons/dumpBtn.png
diff --git a/V-Sim/src/vsim/gui/controllers/SimulatorController.java b/V-Sim/src/vsim/gui/controllers/SimulatorController.java
@@ -17,10 +17,7 @@
 
 package vsim.gui.controllers;
 
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import javafx.application.Platform;
@@ -83,8 +80,10 @@ public class SimulatorController {
   @FXML protected JFXButton backstepBtn;
   /** Simulator reset button */
   @FXML protected JFXButton resetBtn;
-  /** Simulator dump button */
-  @FXML protected JFXButton dumpBtn;
+  /** Simulator dump code button */
+  @FXML protected JFXButton dumpCodeBtn;
+  /** Simulator dump data button */
+  @FXML protected JFXButton dumpDataBtn;
 
   /** Simulator text segment table view */
   @FXML protected TableView<InfoStatement> textTable;
@@ -344,30 +343,21 @@ protected void clearAllBreakpoints() {
   }
 
   /** Dumps generated machine code to a file. */
-  protected void dump() {
+  protected void dumpCode() {
     FileChooser chooser = new FileChooser();
     chooser.setTitle("Dump Machine Code To File");
     File file = chooser.showSaveDialog(this.mainController.stage);
-    if (file != null) {
-      try {
-        if (!file.exists())
-          file.createNewFile();
-      } catch (IOException e) {
-        Message.error("the file " + file + " could not be created");
-        return;
-      }
-      try {
-        BufferedWriter bw = new BufferedWriter(new FileWriter(file));
-        for (InfoStatement stmt : this.textTable.getItems()) {
-          bw.write(stmt.getMachineCode().substring(2));
-          bw.newLine();
-        }
-        bw.close();
-        Message.log("machine code dumped to: " + file);
-      } catch (IOException e) {
-        Message.error("the file " + file + " could not be written");
-      }
-    }
+    if (file != null)
+      Linker.dumpCode(this.debugger.getProgram(), file);
+  }
+
+  /** Dumps static data segment code to a file */
+  protected void dumpData() {
+    FileChooser chooser = new FileChooser();
+    chooser.setTitle("Dump Static Data To File");
+    File file = chooser.showSaveDialog(this.mainController.stage);
+    if (file != null)
+      Linker.dumpData(file);
   }
 
   /** Shows Symbol Table tab if SHOW_LABELS setting is set to true. */
@@ -558,8 +548,10 @@ private void initButtons() {
     this.backstepBtn.disableProperty().bind(Bindings.or(Status.EMPTY, Bindings.or(Status.EXIT, Status.RUNNING)));
     this.resetBtn.setOnAction(e -> this.reset());
     this.resetBtn.disableProperty().bind(Bindings.or(Status.RUNNING, Status.EMPTY));
-    this.dumpBtn.setOnAction(e -> this.dump());
-    this.dumpBtn.disableProperty().bind(Status.RUNNING);
+    this.dumpCodeBtn.setOnAction(e -> this.dumpCode());
+    this.dumpCodeBtn.disableProperty().bind(Status.RUNNING);
+    this.dumpDataBtn.setOnAction(e -> this.dumpData());
+    this.dumpDataBtn.disableProperty().bind(Status.RUNNING);
   }
 
   /** This method initializes the text segment table. */

diff --git a/V-Sim/src/vsim/simulator/Debugger.java b/V-Sim/src/vsim/simulator/Debugger.java
@@ -546,6 +546,15 @@ else if (args[0].equals("reset")) {
       Message.warning("unknown command '" + args[0] + "' (ignoring)");
   }
 
+  /**
+   * Gets linked program.
+   *
+   * @return linked program
+   */
+  public LinkedProgram getProgram() {
+    return this.program;
+  }
+
   /**
    * This method creates a command line interface that the user can use to interact with the debugger.
    */