Merge remote-tracking branch 'upstream/master'

src/main/java/com/loomcom/symon/Bus.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

src/main/java/com/loomcom/symon/Cpu.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2012 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2012 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,10 +55,6 @@ public class Cpu implements InstructionTable {
     public static final int IRQ_VECTOR_L = 0xfffe;
     public static final int IRQ_VECTOR_H = 0xffff;
 
-    // The delay in microseconds between steps.
-    // TODO: Make configurable
-    private static final int CLOCK_IN_NS = 1000;
-
     /* Simulated behavior */
     private static CpuBehavior behavior;
 
@@ -872,7 +868,7 @@ public class Cpu implements InstructionTable {
      */
     private int lsr(int m) {
         setCarryFlag((m & 0x01) != 0);
-        return (m >>> 1) & 0xff;
+        return (m & 0xff) >>> 1;
     }
 
     /**

src/main/java/com/loomcom/symon/InstructionTable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2012 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2012 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

src/main/java/com/loomcom/symon/Main.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *                         Maik Merten <maikmerten@googlemail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining

src/main/java/com/loomcom/symon/MemoryRange.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

src/main/java/com/loomcom/symon/Preferences.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

src/main/java/com/loomcom/symon/Simulator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -354,7 +354,6 @@ public class Simulator {
         }
 
         // If a key has been pressed, fill the ACIA.
-        // TODO: Interrupt handling.
         try {
             if (machine.getAcia() != null && console.hasInput()) {
                 machine.getAcia().rxWrite((int) console.readInputChar());
@@ -463,7 +462,6 @@ public class Simulator {
                     }
                     menuBar.simulatorDidStop();
                     traceLog.simulatorDidStop();
-                    // TODO: Update memory window, if frame is visible.
                 }
             });
 
@@ -488,7 +486,6 @@ public class Simulator {
         }
 
         public void actionPerformed(ActionEvent actionEvent) {
-            // TODO: Error dialogs on failure.
             try {
                 int retVal = fileChooser.showOpenDialog(mainWindow);
                 if (retVal == JFileChooser.APPROVE_OPTION) {
@@ -497,11 +494,10 @@ public class Simulator {
                         long fileSize = f.length();
 
                         if (fileSize > machine.getMemorySize()) {
-                            throw new IOException("Program of size $" +
-                                    Integer.toString((int)fileSize, 16) +
-                                    " will not fit in available memory of size $" +
+                            throw new IOException("File will not fit in " +
+                                    "available memory ($" +
                                     Integer.toString(machine.getMemorySize(), 16) +
-                                    ".");
+                                    " bytes)");
                         } else {
                             byte[] program = new byte[(int) fileSize];
                             int i = 0;
@@ -520,13 +516,21 @@ public class Simulator {
 
                             // Now load the program at the starting address.
                             loadProgram(program, preferences.getProgramStartAddress());
+                            // TODO: "Don't Show Again" checkbox
+                            JOptionPane.showMessageDialog(mainWindow,
+                                    "Loaded Successfully At " +
+                                            String.format("$%04X", preferences.getProgramStartAddress()),
+                                    "OK",
+                                    JOptionPane.PLAIN_MESSAGE);
                         }
                     }
                 }
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, "Unable to read program file: " + ex.getMessage());
+                JOptionPane.showMessageDialog(mainWindow, ex.getMessage(), "Failure", JOptionPane.ERROR_MESSAGE);
             } catch (MemoryAccessException ex) {
                 logger.log(Level.SEVERE, "Memory access error loading program: " + ex.getMessage());
+                JOptionPane.showMessageDialog(mainWindow, ex.getMessage(), "Failure", JOptionPane.ERROR_MESSAGE);
             }
         }
     }
@@ -539,7 +543,6 @@ public class Simulator {
         }
 
         public void actionPerformed(ActionEvent actionEvent) {
-            // TODO: Error dialogs on failure.
             try {
                 int retVal = fileChooser.showOpenDialog(mainWindow);
                 if (retVal == JFileChooser.APPROVE_OPTION) {
@@ -560,15 +563,24 @@ public class Simulator {
 
                             logger.log(Level.INFO, "ROM File `" + romFile.getName() + "' loaded at " +
                                                    String.format("0x%04X", machine.getRomBase()));
+                            // TODO: "Don't Show Again" checkbox
+                            JOptionPane.showMessageDialog(mainWindow,
+                                    "Loaded Successfully At " +
+                                            String.format("$%04X", machine.getRomBase()),
+                                    "OK",
+                                    JOptionPane.PLAIN_MESSAGE);
                         }
                     }
                 }
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, "Unable to read ROM file: " + ex.getMessage());
+                JOptionPane.showMessageDialog(mainWindow, ex.getMessage(), "Failure", JOptionPane.ERROR_MESSAGE);
             } catch (MemoryRangeException ex) {
                 logger.log(Level.SEVERE, "Memory range error while loading ROM file: " + ex.getMessage());
+                JOptionPane.showMessageDialog(mainWindow, ex.getMessage(), "Failure", JOptionPane.ERROR_MESSAGE);
             } catch (MemoryAccessException ex) {
                 logger.log(Level.SEVERE, "Memory access error while loading ROM file: " + ex.getMessage());
+                JOptionPane.showMessageDialog(mainWindow, ex.getMessage(), "Failure", JOptionPane.ERROR_MESSAGE);
             }
         }
     }

src/main/java/com/loomcom/symon/devices/Acia.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

src/main/java/com/loomcom/symon/devices/Acia6551.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

src/main/java/com/loomcom/symon/devices/Acia6850.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *                         Maik Merten <maikmerten@googlemail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining

src/main/java/com/loomcom/symon/devices/Device.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

src/main/java/com/loomcom/symon/devices/Memory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

src/main/java/com/loomcom/symon/devices/Via.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

src/main/java/com/loomcom/symon/exceptions/FifoUnderrunException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

src/main/java/com/loomcom/symon/exceptions/MemoryAccessException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

src/main/java/com/loomcom/symon/exceptions/MemoryRangeException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

src/main/java/com/loomcom/symon/exceptions/SymonException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

src/main/java/com/loomcom/symon/machines/Machine.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *                         Maik Merten <maikmerten@googlemail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining

src/main/java/com/loomcom/symon/machines/MulticompMachine.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *                         Maik Merten <maikmerten@googlemail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining

src/main/java/com/loomcom/symon/machines/SymonMachine.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *                         Maik Merten <maikmerten@googlemail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining

src/main/java/com/loomcom/symon/util/FifoRingBuffer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the

src/main/java/com/loomcom/symon/util/HexUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2013 Seth J. Morabito <sethm@loomcom.com>
+ * Copyright (c) 2008-2014 Seth J. Morabito <web@loomcom.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the