Set the BuiltInFunctions thread as deamon

Author: itoshkov

InstallDir/VMEmulator.sh

@@ -1,3 +1,11 @@
-#!/bin/sh
-cd `dirname $0`
-java -jar ../VMEmulator/target/VMEmulator-*.jar $@
+#!/bin/bash
+cd $(dirname $0)
+if [[ $# -eq 0 ]]; then
+    java -jar ../VMEmulator/target/VMEmulator-*.jar
+elif [[ $# -eq 1 ]]; then
+    [ -z "$N2T_VM_USE_BUILTINS" ] && export N2T_VM_USE_BUILTINS="yes"
+    java -jar ../VMEmulator/target/VMEmulator-*.jar "$1"
+else
+    echo "The program expects 0 or 1 arguments!"
+    exit 1
+fi

SimulatorsPackage/src/main/java/Hack/VMEmulator/BuiltInFunctionsRunner.java

@@ -19,8 +19,10 @@
 
 import Hack.Controller.ProgramException;
 import Hack.Utilities.Definitions;
+
 import java.io.File;
-import java.lang.reflect.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 /**
  * A class that runs built-in VM code as a coroutine so that
@@ -89,7 +91,9 @@ public BuiltInFunctionsRunner(CPU cpu, File builtInDir) {
 		builtInToProgram = new BuiltInToProgramRequest();
 		programToBuiltIn = new ProgramToBuiltInRequest();
 		synchronized (this) {
-			new Thread(this).start();
+			final Thread thread = new Thread(this, "built-in-functions");
+			thread.setDaemon(true);
+			thread.start();
 			continueOtherThread(); // Let the built-in code runner init itself
 								   // The notify part of this call does nothing
 		}

SimulatorsPackage/src/main/java/Hack/VMEmulator/VMEmulator.java

@@ -451,28 +451,30 @@ public void doCommand(String[] command)
             hideHighlights();
 
         // execute the appropriate command
-        if (command[0].equals(COMMAND_VMSTEP)) {
-            if (command.length != 1)
-                throw new CommandException("Illegal number of arguments to command", command);
-
-            cpu.executeInstruction();
-        }
-        else if (command[0].equals(COMMAND_SETVAR)) {
-            if (command.length != 3)
-                throw new CommandException("Illegal number of arguments to command", command);
-            setValue(command[1], command[2]);
-        }
-        else if (command[0].equals(COMMAND_ROMLOAD)) {
-            if (command.length != 1 && command.length != 2)
-                throw new CommandException("Illegal number of arguments to command", command);
-
-            String fileName = workingDir + (command.length == 1 ? "" : "/" + command[1]);
-
-            cpu.getProgram().loadProgram(fileName);
-            cpu.boot();
+        switch (command[0]) {
+            case COMMAND_VMSTEP:
+                if (command.length != 1)
+                    throw new CommandException("Illegal number of arguments to command", command);
+
+                cpu.executeInstruction();
+                break;
+            case COMMAND_SETVAR:
+                if (command.length != 3)
+                    throw new CommandException("Illegal number of arguments to command", command);
+                setValue(command[1], command[2]);
+                break;
+            case COMMAND_ROMLOAD:
+                if (command.length != 1 && command.length != 2)
+                    throw new CommandException("Illegal number of arguments to command", command);
+
+                String fileName = workingDir + (command.length == 1 ? "" : "/" + command[1]);
+
+                cpu.getProgram().loadProgram(fileName);
+                cpu.boot();
+                break;
+            default:
+                throw new CommandException("Unknown simulator command", command);
         }
-        else
-            throw new CommandException("Unknown simulator command", command);
     }
 
     // Hides all highlights in GUIs.
@@ -635,7 +637,7 @@ public Breakpoint genStepOverBreakpoint() {
     }
 
     /**
-     * Called when an error occured in a computer part.
+     * Called when an error occurred in a computer part.
      * The event contains the source object and the error message.
      */
     public void computerPartErrorOccured(ComputerPartErrorEvent event) {

SimulatorsPackage/src/main/java/Hack/VMEmulator/VMProgram.java

@@ -35,11 +35,10 @@
 /**
  * A list of VM instructions, with a program counter.
  */
-public class VMProgram extends InteractiveComputerPart
- implements ProgramEventListener {
+class VMProgram extends InteractiveComputerPart implements ProgramEventListener {
 
 	// pseudo address for returning to built-in functions
-	public static final short BUILTIN_FUNCTION_ADDRESS = -1;
+	static final short BUILTIN_FUNCTION_ADDRESS = -1;
 
 	// Possible values for the current status - has the user allowed
 	// access to built-in vm functions?
@@ -86,12 +85,12 @@ public class VMProgram extends InteractiveComputerPart
     /**
      * Constructs a new empty program with the given GUI.
      */
-    public VMProgram(VMProgramGUI gui) {
+    VMProgram(VMProgramGUI gui) {
         super(gui != null);
         this.gui = gui;
-        listeners = new Vector<ProgramEventListener>();
-        staticRange = new Hashtable<String, Object>();
-        functions = new Hashtable<String, Short>();
+        listeners = new Vector<>();
+        staticRange = new Hashtable<>();
+        functions = new Hashtable<>();
 
         if (hasGUI) {
             assert gui != null;
@@ -132,7 +131,7 @@ public void loadProgram(String fileName) throws ProgramException {
 		staticRange.clear();
 		functions.clear();
 		builtInAccessStatus = BUILTIN_ACCESS_UNDECIDED;
-        Hashtable<String, Short> symbols = new Hashtable<String, Short>();
+        Hashtable<String, Short> symbols = new Hashtable<>();
         nextPC = 0;
         for (File f : files) {
             String name = f.getName();
@@ -534,7 +533,7 @@ private String unCommentLine(String line) {
      * form of a 2-elements array {startAddress, endAddress}.
      * If unknown class name, returns null.
      */
-    public int[] getStaticRange(String className) {
+    int[] getStaticRange(String className) {
         return (int[])staticRange.get(className);
     }
 
@@ -545,7 +544,7 @@ public int getSize() {
         return instructionsLength;
     }
 
-	public short getAddress(String functionName) throws ProgramException {
+	short getAddress(String functionName) throws ProgramException {
         Short address = functions.get(functionName);
         if (address != null) {
             return address;
@@ -580,28 +579,28 @@ public short getAddress(String functionName) throws ProgramException {
     /**
      * Returns the next program counter.
      */
-    public short getPC() {
+    short getPC() {
         return nextPC;
     }
 
     /**
      * Returns the current value of the program counter.
      */
-    public short getCurrentPC() {
+    short getCurrentPC() {
         return currentPC;
     }
 
     /**
      * Returns the previous value of the program counter.
      */
-    public short getPreviousPC() {
+    short getPreviousPC() {
         return prevPC;
     }
 
     /**
      * Sets the program counter with the given address.
      */
-    public void setPC(short address) {
+    void setPC(short address) {
         prevPC = currentPC;
         currentPC = nextPC;
         nextPC = address;
@@ -618,7 +617,7 @@ public void setPC(short address) {
 	 * stop an infinite loop in a built-in jack class.
 	 * A message containing information may be provided (can be null).
      */
-    public void setPCToInfiniteLoopForBuiltIns(String message) {
+    void setPCToInfiniteLoopForBuiltIns(String message) {
 		if (hasGUI) {
 			gui.notify(message);
 		}
@@ -629,7 +628,7 @@ public void setPCToInfiniteLoopForBuiltIns(String message) {
      * Returns the next VMEmulatorInstruction and increments the PC by one.
      * The PC will be incremented by more if the next instruction is a label.
      */
-    public VMEmulatorInstruction getNextInstruction() {
+    VMEmulatorInstruction getNextInstruction() {
         VMEmulatorInstruction result = null;
 
         if (nextPC < instructionsLength) {
@@ -645,7 +644,7 @@ public VMEmulatorInstruction getNextInstruction() {
         return result;
     }
 
-    public short getNextInstructionAddress(short pc) {
+    short getNextInstructionAddress(short pc) {
         do {
             pc++;
         } while (pc < instructionsLength && instructions[pc].getOpCode() == HVMInstructionSet.LABEL_CODE);
@@ -655,7 +654,7 @@ public short getNextInstructionAddress(short pc) {
     /**
      * Restarts the program from the beginning.
      */
-    public void restartProgram() {
+    void restartProgram() {
         currentPC = -999;
         prevPC = -999;
         nextPC = startAddress;
@@ -713,16 +712,16 @@ private void setGUIPC() {
             gui.setCurrentInstruction(nextPC);
     }
 
-    public VMEmulatorInstruction getInstructionAt(short pc) {
+    VMEmulatorInstruction getInstructionAt(short pc) {
         return pc >= 0 && pc < instructions.length ? instructions[pc] : null;
     }
 
     // The task that loads a new program into the emulator
-    class LoadProgramTask implements Runnable {
+    private class LoadProgramTask implements Runnable {
 
         private String fileName;
 
-        public LoadProgramTask(String fileName) {
+        LoadProgramTask(String fileName) {
             this.fileName = fileName;
         }
 
@@ -746,7 +745,7 @@ public void refreshGUI() {
     /**
      * Registers the given ProgramEventListener as a listener to this GUI.
      */
-    public void addProgramListener(ProgramEventListener listener) {
+    void addProgramListener(ProgramEventListener listener) {
         listeners.add(listener);
     }
 
@@ -755,7 +754,7 @@ public void addProgramListener(ProgramEventListener listener) {
      * a ProgramEvent (with the new event type and program's file name) and sending it using the
      * programChanged function to all the listeners.
      */
-    protected void notifyProgramListeners(byte eventType, String programFileName) {
+    private void notifyProgramListeners(byte eventType, String programFileName) {
         ProgramEvent event = new ProgramEvent(this, eventType, programFileName);
 
         for (ProgramEventListener listener : listeners)

VMEmulator/src/main/java/VMEmulatorMain.java

@@ -15,37 +15,44 @@
  * mark your changes clearly, for the benefit of others.                        *
  ********************************************************************************/
 
-import Hack.Controller.*;
-import Hack.VMEmulator.*;
-import HackGUI.*;
-import SimulatorsGUI.*;
+import Hack.Controller.ControllerGUI;
+import Hack.Controller.HackController;
+import Hack.VMEmulator.VMEmulator;
+import Hack.VMEmulator.VMEmulatorApplication;
+import Hack.VMEmulator.VMEmulatorGUI;
+import HackGUI.ControllerComponent;
+import SimulatorsGUI.VMEmulatorComponent;
+
 import javax.swing.*;
 
 /**
  * The VM Emulator.
  */
-public class VMEmulatorMain
-{
-  /**
-   * The command line VM Emulator program.
-   */
-  public static void main(String[] args) {
-        if (args.length > 1)
-            System.err.println("Usage: java CPUEmulatorMain [script name]");
-        else if (args.length == 0) {
-            try {
-                UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
-            } catch (Exception e) {
-            }
+public class VMEmulatorMain {
+    /**
+     * The command line VM Emulator program.
+     */
+    public static void main(String[] args) {
+        switch (args.length) {
+            case 0:
+                try {
+                    UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
+                } catch (Exception ignored) {
+                }
 
-            VMEmulatorGUI simulatorGUI = new VMEmulatorComponent();
-            ControllerGUI controllerGUI = new ControllerComponent();
-            VMEmulatorApplication application =
+                final VMEmulatorGUI simulatorGUI = new VMEmulatorComponent();
+                final ControllerGUI controllerGUI = new ControllerComponent();
                 new VMEmulatorApplication(controllerGUI, simulatorGUI, "bin/scripts/defaultVM.txt",
-                                          "bin/help/vmUsage.html", "bin/help/vmAbout.html");
+                        "bin/help/vmUsage.html", "bin/help/vmAbout.html");
+                break;
+
+            case 1:
+                new HackController(new VMEmulator(), args[0]);
+                break;
+
+            default:
+                System.err.println("Usage: java CPUEmulatorMain [script name]");
         }
-        else
-            new HackController(new VMEmulator(), args[0]);
     }
 }