Add release action

Add missing mike42 machine flag to run options
Add install maven step (gitea actions
2026-09-29 13:44:53 +01:00 · 2026-09-29 12:15:37 +01:00 · 2026-09-29 01:05:01 +01:00 · 2026-09-29 01:02:24 +01:00 · 2026-09-29 00:51:56 +01:00 · 2026-09-29 00:46:42 +01:00
62 changed files with 1185 additions and 592 deletions
@@ -0,0 +1,36 @@
+name: Build and Test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup JDK
+        uses: actions/setup-java@v6
+        with:
+          distribution: temurin
+          java-version: '21'
+          #cache: maven
+
+      - name: Install Maven
+        run: apt-get update && apt-get install -y maven
+
+      - name: Test and package
+        run: mvn -B verify
+
+      - name: Upload jar
+        uses: actions/upload-artifact@v3
+        with:
+          name: package
+          path: target/*.jar
@@ -0,0 +1,33 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    container:
+      image: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup JDK
+        uses: actions/setup-java@v6
+        with:
+          distribution: temurin
+          java-version: '21'
+
+      - name: Install Maven
+        run: apt-get update && apt-get install -y maven
+
+      - name: Package
+        run: mvn -B verify
+
+      - name: Create release
+        uses: https://gitea.com/actions/gitea-release-action@v1
+        with:
+          files: |-
+            target/symon*.jar
@@ -1,13 +1,13 @@
-SYMON - A 6502 System Simulator
+kSYMON - A 6502 System Simulator
 ===============================

-**Version:** 1.3.2
+**Version:** 1.5.1k

-**Last Updated:** 08 March, 2021
+**Last Updated:** 24 September, 2026

 See the file COPYING for license.

-![Symon Simulator in Action](https://github.com/sethm/symon/raw/master/screenshots/full.jpg)
+![Symon Simulator in Action](https://codeberg.org/sethm/symon/raw/master/screenshots/full.jpg)

 ## 1.0 About

@@ -25,20 +25,20 @@ Klaus Dormann's 6502 Functional Test Suite as of version 0.8.2
 (See [this thread on the 6502.org Forums](http://forum.6502.org/viewtopic.php?f=2&t=2241)
 for more information about this functional test suite).

-Symon is under constant, active development. Feedback and patches
-are always welcome.
+Symon is under active maintenance. Feedback and patches are always
+welcome.

 ## 2.0 Requirements

-  - Java 1.8 or higher
-  - Maven 2.0.x or higher (for building from source)
+  - Java 10 or higher
+  - Maven 3.0.x or higher (for building from source)
  - JUnit 4 or higher (for testing)

 ## 3.0 Features

 Symon can simulate multiple 6502 based architectures. At present, four
-machines are implemented: Symon (the default), MULTICOMP, BenEater, and a "Simple"
-machine useful for debugging.
+machines are implemented: Symon (the default), MULTICOMP, BenEater, and
+a "Simple" machine useful for debugging.

 ### 3.1 Memory Maps

@@ -71,9 +71,16 @@ memory.
  - `$6000`--`$600F`: 6522 VIA
  - `$8000`--`$FFFF`: 16KB ROM

+#### 3.1.5 Mike42 Memory Map
+
+  - `$0000`--`$7FFF`: 32KB RAM
+  - `$8000`--`$800F`: 6522 VIA
+  - `$8400`--`$8403`: MOS 6551 ACIA (Serial Console)
+  - `$C000`--`$FFFF`: 16KB ROM
+
 ### 3.2 Serial Console and CPU Status

-![Serial Console](https://github.com/sethm/symon/raw/master/screenshots/console.png)
+![Serial Console](https://codeberg.org/sethm/symon/raw/master/screenshots/console.png)

 The main window of the simulator acts as the primary Input/Output
 system through a virtual serial terminal. It also provides CPU status.
@@ -100,13 +107,13 @@ see the official datasheet:

  - [MOS 6551 ACIA](http://archive.6502.org/datasheets/mos_6551_acia.pdf)

-![Font Selection](https://github.com/sethm/symon/raw/master/screenshots/font_selection.png)
+![Font Selection](https://codeberg.org/sethm/symon/raw/master/screenshots/font_selection.png)

 The console supports font sizes from 10 to 20 points.

 ### 3.3 ROM Loading

-![ROM Loading](https://github.com/sethm/symon/raw/master/screenshots/load_rom.png)
+![ROM Loading](https://codeberg.org/sethm/symon/raw/master/screenshots/load_rom.png)

 Symon can load any appropriately sized ROM image. The Symon
 architecture expects as 16KB (16384 byte) ROM image, while the
@@ -117,32 +124,32 @@ address.

 ### 3.4 Memory Window

-![Memory Window](https://github.com/sethm/symon/raw/master/screenshots/memory_window.png)
+![Memory Window](https://codeberg.org/sethm/symon/raw/master/screenshots/memory_window.png)

 Memory contents can be viewed (and edited) one page at a time through the Memory Window.

 ### 3.5 Trace Log

-![Trace Log](https://github.com/sethm/symon/raw/master/screenshots/trace_log.png)
+![Trace Log](https://codeberg.org/sethm/symon/raw/master/screenshots/trace_log.png)

 The last 20,000 execution steps are disassembled and logged to the Trace Log
 Window.

 ### 3.6 Simulator Speeds

-![Speeds](https://github.com/sethm/symon/raw/master/screenshots/simulator_menu.png)
+![Speeds](https://codeberg.org/sethm/symon/raw/master/screenshots/simulator_menu.png)

 Simulated speeds may be set from 1MHz to 8MHz.

 ### 3.7 Breakpoints

-![Breakpoints](https://github.com/sethm/symon/raw/master/screenshots/breakpoints.png)
+![Breakpoints](https://codeberg.org/sethm/symon/raw/master/screenshots/breakpoints.png)

 Breakpoints can be set and removed through the Breakpoints window.

 ### 3.8 Experimental 6545 CRTC Video

-![Composite Video](https://github.com/sethm/symon/raw/master/screenshots/video_window.png)
+![Composite Video](https://codeberg.org/sethm/symon/raw/master/screenshots/video_window.png)

 This feature is highly experimental. It's possible to open a video window
 from the "View" menu.  This window simulates the output of a MOS 6545 CRT
@@ -229,7 +236,18 @@ to specify machine type and CPU type. The options are:
  - `-r`,`-rom <file>`: Use the specified file as the ROM image.
  - `-b`,`-brk`: Halt the simulator on a BRK instruction (default is to continue)

-### 4.2 ROM images
+### 4.2 High-DPI UI scaling
+
+In certain environments with high-DPI (e.g. 4K) displays, the UI may
+not automatically scale and appear quite tiny. This can be fixed
+with the command line argument `-Dsun.java2d.uiScale=<factor>`,
+for example:
+
+```
+java -Dsun.java2d.uiScale=2.0 -jar symon-1.5.0.jar
+```
+
+### 4.3 ROM images

 The simulator requires a ROM image loaded into memory to work
 properly. Without a ROM in memory, the simulator will not be able to
@@ -247,7 +265,7 @@ architecture named 'ehbasic.rom', containing Lee Davison's Enhanced
 *Note*: Presently, EhBASIC only works with the Symon machine
 architecture, not with MULTICOMP.

-### 4.3 Loading A Program
+### 4.4 Loading A Program

 In addition to ROM images, programs in the form of raw binary object files can
 be loaded directly into memory from "Load Program..." in the File menu.
@@ -263,13 +281,24 @@ for testing.

 - 'hello.prg' will continuously print "Hello, 6502 World!" to the console.

-### 4.4 Running
+### 4.5 Running

 After loading a program or ROM image, clicking "Run" will start the simulator
 running.

 ## 5.0 Revision History

+  - **1.5.0:** 30 March 2025 - Fixed a bug that caused some 6502
+    instructions to be disassembled improperly in the trace log
+    (GitHub issue #17).
+
+    Added a new "Step Over" button that allows stepping over the
+    current subroutine. This button only becomes active when the
+    next instruction is a "JSR" while stepping through execution 
+    one instruction at a time. It will continue execution until
+    the subroutine returns through a corresponding "RTS" instruction.
+    (GitHub feature request #18).
+
  - **1.4.0:** 11 November 2023 - Adds a new machine, the Ben Eater
    machine.  Correct handling of 6551 interrupts, and several 6551
    bug fixes. Fixes power-on status of 6502 status register. Fixes a
@@ -355,17 +384,12 @@ running.

  - Feedback (in the form of dialogs, status bar, etc).

-  - Better debugging tools from the UI, including breakpoints
-    and disassembly.
-
  - UI needs a ton more polish.

  - More extensive testing.

  - Clean up JavaDoc.

-  - Implement CMOS 65C02 instructions and NMOS / CMOS mode flag.
-
  - Allow displaying ACIA status and dumping ACIA buffers, for
    debugging.

@@ -375,13 +399,19 @@ running.

  - Symbolic debugging.

+  - Better / correct disassembly and tracing of 65C02 and 65C816
+    instructions.
+
 ## 8.0 Copyright and Acknowledgements

-**Copyright (c) 2014 Seth J. Morabito &lt;web@loomcom.com&gt;**
+**Copyright (c) 2008-2025 Seth J. Morabito &lt;web@loomcom.com&gt;**

-Portions Copyright (c) 2014 Maik Merten &lt;maikmerten@googlemail.com&gt;
-Portions Copyright (c) 2022 Tim Allen &lt;thristian@gmail.com&gt;
-Portions Copyright (c) 2023 Chelsea Wilkinson &lt;mail@chelseawilkinson.me&gt;
+  - Portions Copyright (c) 2014 Maik Merten 
+    &lt;maikmerten@googlemail.com&gt;
+  - Portions Copyright (c) 2022 Tim Allen 
+    &lt;thristian@gmail.com&gt;
+  - Portions Copyright (c) 2023 Chelsea Wilkinson 
+    &lt;mail@chelseawilkinson.me&gt;

 Additional components used in this project are copyright their respective owners.

@@ -1,12 +1,13 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.loomcom.symon</groupId>
    <artifactId>symon</artifactId>
    <packaging>jar</packaging>
-    <version>1.4.0</version>
+    <version>1.5.1k</version>
    <name>symon</name>
-    <url>http://www.loomcom.com/symon</url>
+    <url>https://git.loomcom.com/seth/symon</url>
    <properties>
        <project.build.sourceEncoding>
            UTF-8
@@ -15,11 +16,32 @@
            UTF-8
        </project.reporting.outputEncoding>
    </properties>
+    <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
    <dependencies>
        <dependency>
            <groupId>ch.qos.logback</groupId>
            <artifactId>logback-classic</artifactId>
-            <version>1.4.5</version>
+            <version>1.5.34</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>1.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.formdev</groupId>
+            <artifactId>flatlaf</artifactId>
+            <version>3.7.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.Dansoftowner</groupId>
+            <artifactId>jSystemThemeDetector</artifactId>
+            <version>3.9.1</version>
        </dependency>
        <dependency>
            <groupId>junit</groupId>
@@ -30,13 +52,13 @@
        <dependency>
            <groupId>org.mockito</groupId>
            <artifactId>mockito-core</artifactId>
-            <version>4.8.0</version>
+            <version>4.11.0</version>
            <scope>test</scope>
        </dependency>
        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.5.0</version>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>5.14.0</version>
        </dependency>
    </dependencies>

@@ -48,7 +70,8 @@
                <version>3.2.0</version>
                <configuration>
                    <transformers>
-                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                        <transformer
+                                implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                            <mainClass>com.loomcom.symon.Main</mainClass>
                        </transformer>
                    </transformers>
@@ -79,8 +102,8 @@
                <version>3.7.0</version>
                <configuration>
                    <compilerArgument>-Xlint:unchecked</compilerArgument>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>16</source>
+                    <target>16</target>
                </configuration>
            </plugin>

@@ -120,4 +143,4 @@
            </plugin>
        </plugins>
    </build>
-</project>
+</project>
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2008-2025 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
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package com.loomcom.symon;

 import com.loomcom.symon.exceptions.MemoryAccessException;
@@ -9,8 +32,8 @@ import java.util.TreeSet;

 public class Breakpoints extends AbstractTableModel {

-    private TreeSet<Integer> breakpoints;
-    private Simulator simulator;
+    private final TreeSet<Integer> breakpoints;
+    private final Simulator simulator;

    public Breakpoints(Simulator simulator) {
        this.breakpoints = new TreeSet<>();
@@ -26,11 +49,6 @@ public class Breakpoints extends AbstractTableModel {
        fireTableDataChanged();
    }

-    public void removeBreakpoint(int address) {
-        this.breakpoints.remove(address);
-        fireTableDataChanged();
-    }
-
    public void removeBreakpointAtIndex(int index) {
        if (index < 0) {
            return;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -42,19 +42,19 @@ import java.util.TreeSet;
 public class Bus {

    // The default address at which to load programs
-    public static int DEFAULT_LOAD_ADDRESS = 0x0200;
+    public static final int DEFAULT_LOAD_ADDRESS = 0x0200;

    // By default, our bus starts at 0, and goes up to 64K
-    private int startAddress = 0x0000;
-    private int endAddress = 0xffff;
+    private final int startAddress;
+    private final int endAddress;

    // The CPU
    private Cpu cpu;

    // Ordered sets of IO devices, associated with their priority
-    private Map<Integer, SortedSet<Device>> deviceMap;
+    private final Map<Integer, SortedSet<Device>> deviceMap;

-    // an array for quick lookup of adresses, brute-force style
+    // an array for quick lookup of addresses, brute-force style
    private Device[] deviceAddressArray;


@@ -94,8 +94,8 @@ public class Bus {
     * Add a device to the bus.
     *
     * @param device   Device to add
-     * @param priority Bus prioirity.
-     * @throws MemoryRangeException
+     * @param priority Bus priority.
+     * @throws MemoryRangeException Invalid device address range.
     */
    public void addDevice(Device device, int priority) throws MemoryRangeException {

@@ -109,12 +109,7 @@ public class Bus {
            throw new MemoryRangeException("end address of device " + device.getName() + " does not fall within the address range of the bus");
        }

-        SortedSet<Device> deviceSet = deviceMap.get(priority);
-
-        if (deviceSet == null) {
-            deviceSet = new TreeSet<>();
-            deviceMap.put(priority, deviceSet);
-        }
+        SortedSet<Device> deviceSet = deviceMap.computeIfAbsent(priority, k -> new TreeSet<>());

        device.setBus(this);
        deviceSet.add(device);
@@ -125,7 +120,7 @@ public class Bus {
     * Add a device to the bus. Throws a MemoryRangeException if the device overlaps with any others.
     *
     * @param device Device to add
-     * @throws MemoryRangeException
+     * @throws MemoryRangeException Invalid device memory range.
     */
    public void addDevice(Device device) throws MemoryRangeException {
        addDevice(device, 0);
@@ -224,9 +219,7 @@ public class Bus {

        for (int priority : priorities) {
            SortedSet<Device> deviceSet = deviceMap.get(priority);
-            for (Device device : deviceSet) {
-                devices.add(device);
-            }
+            devices.addAll(deviceSet);
        }

        return devices;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -158,6 +158,8 @@ public class Cpu implements InstructionTable {
     * Performs an individual instruction cycle.
     */
    public void step() throws MemoryAccessException {
+        int hi, lo; // Address calculation
+
        opBeginTime = System.nanoTime();

        // Store the address from which the IR was read, for debugging
@@ -317,8 +319,8 @@ public class Cpu implements InstructionTable {
                break;
            case 0x40: // RTI - Return from Interrupt - Implied
                setProcessorStatus(stackPop());
-                int lo = stackPop();
-                int hi = stackPop();
+                lo = stackPop();
+                hi = stackPop();
                setProgramCounter(Utils.address(lo, hi));
                break;
            case 0x48: // PHA - Push Accumulator - Implied
@@ -1697,6 +1699,10 @@ public class Cpu implements InstructionTable {
        return state.ir;
    }

+    public int getNextIr() {
+        return state.nextIr;
+    }
+
    /**
     * @value The value of the Process Status Register bits to be set.
     */
@@ -1923,6 +1929,7 @@ public class Cpu implements InstructionTable {
                break;
            case AIX:
                sb.append(" ($").append(Utils.wordToHex(Utils.address(args[0], args[1]))).append(",X)");
+                break;
            case ABX:
                sb.append(" $").append(Utils.wordToHex(Utils.address(args[0], args[1]))).append(",X");
                break;
@@ -1935,6 +1942,9 @@ public class Cpu implements InstructionTable {
            case IND:
                sb.append(" ($").append(Utils.wordToHex(Utils.address(args[0], args[1]))).append(")");
                break;
+            case ZPI:
+                sb.append(" ($").append(Utils.byteToHex(args[0])).append(")");
+                break;
            case XIN:
                sb.append(" ($").append(Utils.byteToHex(args[0])).append(",X)");
                break;
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2008-2025 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
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package com.loomcom.symon;

 import com.loomcom.symon.util.Utils;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -25,26 +25,24 @@ package com.loomcom.symon;

 public interface InstructionTable {

+    int BRK = 0x00;
+    int JSR = 0x20;
+    int RTS = 0x60;
+
    /**
     * Enumeration of valid CPU behaviors. These determine what behavior and instruction
     * set will be simulated, depending on desired version of 6502.
-     *
-     * TODO: As of version 0.6, this is still not used! All CPUs are "idealized" NMOS 6502 only.
     */
    enum CpuBehavior {
        /**
         * The earliest NMOS 6502 includes a bug that causes the ROR instruction
         * to behave like an ASL that does not affect the carry bit. This version
         * is very rare in the wild.
-         *
-         * NB: Does NOT implement "unimplemented" NMOS instructions.
         */
        NMOS_WITH_ROR_BUG,

        /**
         * All NMOS 6502's have a bug with the indirect JMP instruction. If the
-         *
-         * NB: Does NOT implement "unimplemented" NMOS instructions.
         */
        NMOS_6502,

@@ -68,11 +66,13 @@ public interface InstructionTable {
                return "Accumulator";
            }
        },
+
        AIX {
            public String toString() {
                return "Absolute, X-Indexed Indirect";
            }
        },
+
        ABS {
            public String toString() {
                return "Absolute";
@@ -168,41 +168,44 @@ public interface InstructionTable {

    /**
     * Instruction opcode names. This lists all opcodes for
-     * NMOS 6502, CMOS 65C02, and CMOS 65C816
+     * NMOS 6502, CMOS 65C02, and CMOS 65C816.
+     * <p>
+     * TODO (2025-03-14): This table is clearly wrong for 65C816.
+     * TODO (2025-03-14): Rockwell/WDC 65C02 names conflict with 65C816 names.
     */
    String[] opcodeNames = {
-        "BRK", "ORA", "NOP", "NOP", "TSB", "ORA", "ASL",  "RMB0",  // 0x00-0x07
-        "PHP", "ORA", "ASL", "NOP", "TSB", "ORA", "ASL",  "BBR0",  // 0x08-0x0f
-        "BPL", "ORA", "ORA", "NOP", "TRB", "ORA", "ASL",  "RMB1",  // 0x10-0x17
-        "CLC", "ORA", "INC", "NOP", "TRB", "ORA", "ASL",  "BBR1",  // 0x18-0x1f
-        "JSR", "AND", "NOP", "NOP", "BIT", "AND", "ROL",  "RMB2",  // 0x20-0x27
-        "PLP", "AND", "ROL", "NOP", "BIT", "AND", "ROL",  "BBR2",  // 0x28-0x2f
-        "BMI", "AND", "AND", "NOP", "BIT", "AND", "ROL",  "RMB3",  // 0x30-0x37
-        "SEC", "AND", "DEC", "NOP", "BIT", "AND", "ROL",  "BBR3",  // 0x38-0x3f
-        "RTI", "EOR", "NOP", "NOP", "NOP", "EOR", "LSR",  "RMB4",  // 0x40-0x47
-        "PHA", "EOR", "LSR", "NOP", "JMP", "EOR", "LSR",  "BBR4",  // 0x48-0x4f
-        "BVC", "EOR", "EOR", "NOP", "NOP", "EOR", "LSR",  "RMB5",  // 0x50-0x57
-        "CLI", "EOR", "PHY", "NOP", "NOP", "EOR", "LSR",  "BBR5",  // 0x58-0x5f
-        "RTS", "ADC", "NOP", "NOP", "STZ", "ADC", "ROR",  "RMB6",  // 0x60-0x67
-        "PLA", "ADC", "ROR", "NOP", "JMP", "ADC", "ROR",  "BBR6",  // 0x68-0x6f
-        "BVS", "ADC", "ADC", "NOP", "STZ", "ADC", "ROR",  "RMB7",  // 0x70-0x77
-        "SEI", "ADC", "PLY", "NOP", "JMP", "ADC", "ROR",  "BBR7",  // 0x78-0x7f
-        "BRA", "STA", "NOP", "NOP", "STY", "STA", "STX",  "SMB0",  // 0x80-0x87
-        "DEY", "BIT", "TXA", "NOP", "STY", "STA", "STX",  "BBS0",  // 0x88-0x8f
-        "BCC", "STA", "STA", "NOP", "STY", "STA", "STX",  "SMB1",  // 0x90-0x97
-        "TYA", "STA", "TXS", "NOP", "STZ", "STA", "STZ",  "BBS1",  // 0x98-0x9f
-        "LDY", "LDA", "LDX", "NOP", "LDY", "LDA", "LDX",  "SMB2",  // 0xa0-0xa7
-        "TAY", "LDA", "TAX", "NOP", "LDY", "LDA", "LDX",  "BBS2",  // 0xa8-0xaf
-        "BCS", "LDA", "LDA", "NOP", "LDY", "LDA", "LDX",  "SMB3",  // 0xb0-0xb7
-        "CLV", "LDA", "TSX", "NOP", "LDY", "LDA", "LDX",  "BBS3",  // 0xb8-0xbf
-        "CPY", "CMP", "NOP", "NOP", "CPY", "CMP", "DEC",  "SMB4",  // 0xc0-0xc7
-        "INY", "CMP", "DEX", "NOP", "CPY", "CMP", "DEC",  "BBS4",  // 0xc8-0xcf
-        "BNE", "CMP", "CMP", "NOP", "NOP", "CMP", "DEC",  "SMB5",  // 0xd0-0xd7
-        "CLD", "CMP", "PHX", "NOP", "NOP", "CMP", "DEC",  "BBS5",  // 0xd8-0xdf
-        "CPX", "SBC", "NOP", "NOP", "CPX", "SBC", "INC",  "SMB6",  // 0xe0-0xe7
-        "INX", "SBC", "NOP", "NOP", "CPX", "SBC", "INC",  "BBS6",  // 0xe8-0xef
-        "BEQ", "SBC", "SBC", "NOP", "NOP", "SBC", "INC",  "SMB7",  // 0xf0-0xf7
-        "SED", "SBC", "PLX", "NOP", "NOP", "SBC", "INC",  "BBS7"   // 0xf8-0xff
+        "BRK", "ORA", "NOP", "NOP", "TSB", "ORA", "ASL", "RMB0",  // 0x00-0x07
+        "PHP", "ORA", "ASL", "NOP", "TSB", "ORA", "ASL", "BBR0",  // 0x08-0x0f
+        "BPL", "ORA", "ORA", "NOP", "TRB", "ORA", "ASL", "RMB1",  // 0x10-0x17
+        "CLC", "ORA", "INC", "NOP", "TRB", "ORA", "ASL", "BBR1",  // 0x18-0x1f
+        "JSR", "AND", "NOP", "NOP", "BIT", "AND", "ROL", "RMB2",  // 0x20-0x27
+        "PLP", "AND", "ROL", "NOP", "BIT", "AND", "ROL", "BBR2",  // 0x28-0x2f
+        "BMI", "AND", "AND", "NOP", "BIT", "AND", "ROL", "RMB3",  // 0x30-0x37
+        "SEC", "AND", "DEC", "NOP", "BIT", "AND", "ROL", "BBR3",  // 0x38-0x3f
+        "RTI", "EOR", "NOP", "NOP", "NOP", "EOR", "LSR", "RMB4",  // 0x40-0x47
+        "PHA", "EOR", "LSR", "NOP", "JMP", "EOR", "LSR", "BBR4",  // 0x48-0x4f
+        "BVC", "EOR", "EOR", "NOP", "NOP", "EOR", "LSR", "RMB5",  // 0x50-0x57
+        "CLI", "EOR", "PHY", "NOP", "NOP", "EOR", "LSR", "BBR5",  // 0x58-0x5f
+        "RTS", "ADC", "NOP", "NOP", "STZ", "ADC", "ROR", "RMB6",  // 0x60-0x67
+        "PLA", "ADC", "ROR", "NOP", "JMP", "ADC", "ROR", "BBR6",  // 0x68-0x6f
+        "BVS", "ADC", "ADC", "NOP", "STZ", "ADC", "ROR", "RMB7",  // 0x70-0x77
+        "SEI", "ADC", "PLY", "NOP", "JMP", "ADC", "ROR", "BBR7",  // 0x78-0x7f
+        "BRA", "STA", "NOP", "NOP", "STY", "STA", "STX", "SMB0",  // 0x80-0x87
+        "DEY", "BIT", "TXA", "NOP", "STY", "STA", "STX", "BBS0",  // 0x88-0x8f
+        "BCC", "STA", "STA", "NOP", "STY", "STA", "STX", "SMB1",  // 0x90-0x97
+        "TYA", "STA", "TXS", "NOP", "STZ", "STA", "STZ", "BBS1",  // 0x98-0x9f
+        "LDY", "LDA", "LDX", "NOP", "LDY", "LDA", "LDX", "SMB2",  // 0xa0-0xa7
+        "TAY", "LDA", "TAX", "NOP", "LDY", "LDA", "LDX", "BBS2",  // 0xa8-0xaf
+        "BCS", "LDA", "LDA", "NOP", "LDY", "LDA", "LDX", "SMB3",  // 0xb0-0xb7
+        "CLV", "LDA", "TSX", "NOP", "LDY", "LDA", "LDX", "BBS3",  // 0xb8-0xbf
+        "CPY", "CMP", "NOP", "NOP", "CPY", "CMP", "DEC", "SMB4",  // 0xc0-0xc7
+        "INY", "CMP", "DEX", "NOP", "CPY", "CMP", "DEC", "BBS4",  // 0xc8-0xcf
+        "BNE", "CMP", "CMP", "NOP", "NOP", "CMP", "DEC", "SMB5",  // 0xd0-0xd7
+        "CLD", "CMP", "PHX", "NOP", "NOP", "CMP", "DEC", "BBS5",  // 0xd8-0xdf
+        "CPX", "SBC", "NOP", "NOP", "CPX", "SBC", "INC", "SMB6",  // 0xe0-0xe7
+        "INX", "SBC", "NOP", "NOP", "CPX", "SBC", "INC", "BBS6",  // 0xe8-0xef
+        "BEQ", "SBC", "SBC", "NOP", "NOP", "SBC", "INC", "SMB7",  // 0xf0-0xf7
+        "SED", "SBC", "PLX", "NOP", "NOP", "SBC", "INC", "BBS7"   // 0xf8-0xff
    };

    /**
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
- *                    Maik Merten <maikmerten@googlemail.com>
+ * Copyright (c) 2008-2025 Seth J. Morabito <web@loomcom.com>
+ *                         Maik Merten <maikmerten@googlemail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
@@ -22,34 +22,35 @@
 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

-
 package com.loomcom.symon;

-import com.loomcom.symon.machines.MulticompMachine;
-import com.loomcom.symon.machines.SimpleMachine;
-import com.loomcom.symon.machines.SymonMachine;
-import com.loomcom.symon.machines.BenEaterMachine;
+import com.loomcom.symon.machines.*;
+import com.loomcom.symon.ui.Ui;
+
 import org.apache.commons.cli.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import java.util.Locale;
-import javax.swing.JOptionPane;
+
 import javax.swing.SwingUtilities;
-import javax.swing.UIManager;

 public class Main {
-    
-     /**
+    private final static Logger logger = LoggerFactory.getLogger(Main.class.getName());
+
+    /**
     * Main entry point to the simulator. Creates a simulator and shows the main
     * window.
     *
     * @param args Program arguments
     */
    public static void main(String[] args) throws Exception {
-        
-        Class machineClass = SymonMachine.class;
+
+        Class<?> machineClass = null;

        Options options = new Options();

+        options.addOption(new Option("h", "help", false, "Print this message."));
        options.addOption(new Option("m", "machine", true, "Specify machine type."));
        options.addOption(new Option("c", "cpu", true, "Specify CPU type."));
        options.addOption(new Option("r", "rom", true, "Specify ROM file."));
@@ -58,11 +59,18 @@ public class Main {
        CommandLineParser parser = new DefaultParser();

        try {
+
            CommandLine line = parser.parse(options, args);
            InstructionTable.CpuBehavior cpuBehavior = null;
            String romFile = null;
            boolean haltOnBreak = false;

+            if (line.hasOption("help")) {
+                HelpFormatter formatter = new HelpFormatter();
+                formatter.printHelp("symon", options, false);
+                return;
+            }
+
            if (line.hasOption("machine")) {
                String machine = line.getOptionValue("machine").toLowerCase(Locale.ENGLISH);
                switch (machine) {
@@ -78,8 +86,11 @@ public class Main {
                    case "beneater":
                        machineClass = BenEaterMachine.class;
                        break;
+                    case "mike42":
+                        machineClass = MichaelBillingtonMachine.class;
+                        break;
                    default:
-                        System.err.println("Could not start Symon. Unknown machine type " + machine);
+                        logger.error("Could not start Symon. Unknown machine type {}", machine);
                        return;
                }
            }
@@ -97,7 +108,7 @@ public class Main {
                        cpuBehavior = InstructionTable.CpuBehavior.CMOS_65816;
                        break;
                    default:
-                        System.err.println("Could not start Symon. Unknown cpu type " + cpu);
+                        logger.error("Could not start Symon. Unknown cpu type {}", cpu);
                        return;
                }
            }
@@ -110,28 +121,11 @@ public class Main {
                haltOnBreak = true;
            }

+            Ui.initUi();
+
            while (true) {
                if (machineClass == null) {
-                    Object[] possibilities = {"Symon", "Multicomp", "Simple", "BenEater"};
-                    String s = (String)JOptionPane.showInputDialog(
-                            null,
-                            "Please choose the machine type to be emulated:",
-                            "Machine selection",
-                            JOptionPane.PLAIN_MESSAGE,
-                            null,
-                            possibilities,
-                            "Symon");
-
-
-                    if (s != null && s.equals("Multicomp")) {
-                        machineClass = MulticompMachine.class;
-                    } else if (s != null && s.equals("Simple")) {
-                        machineClass = SimpleMachine.class;
-                    } else if (s != null && s.equals("BenEater")) {
-                        machineClass = BenEaterMachine.class;
-                    } else {
-                        machineClass = SymonMachine.class;
-                    }
+                    machineClass = Ui.showMachineSelectionDialog();
                }

                if (cpuBehavior == null) {
@@ -140,20 +134,16 @@ public class Main {

                final Simulator simulator = new Simulator(machineClass, cpuBehavior, romFile, haltOnBreak);

-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-                            // Create the main UI window
-                            simulator.createAndShowUi();
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
+                SwingUtilities.invokeLater(() -> {
+                    // Create the main UI window:
+                    try {
+                        simulator.createAndShowUi();
+                    } catch (Exception e) {
+                        logger.error("Error during Symon UI initialization: {}", e.getMessage());
+                        System.exit(-1);
                    }
                });

-
                Simulator.MainCommand cmd = simulator.waitForCommand();

                if (cmd.equals(Simulator.MainCommand.SELECTMACHINE)) {
@@ -163,7 +153,8 @@ public class Main {
                }
            }
        } catch (ParseException ex) {
-            System.err.println("Could not start Symon. Reason: " + ex.getMessage());
+            logger.error("Could not start Symon. Reason: {}", ex.getMessage());
        }
    }
+
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -27,7 +27,7 @@ import com.loomcom.symon.exceptions.*;

 /**
 * MemoryRange is a simple container class representing a literal
- * range of memory, with a staraddress, and an end address.  It has
+ * range of memory, with a start address, and an end address.  It has
 * guards against creating impossible memory ranges, and implements
 * some useful methods for checking address inclusion and range
 * overlaps.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -1,5 +1,5 @@
 /*
- * Copyrighi (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -23,6 +23,7 @@

 package com.loomcom.symon;

+import com.formdev.flatlaf.util.UIScale;
 import com.loomcom.symon.devices.Memory;
 import com.loomcom.symon.exceptions.*;
 import com.loomcom.symon.machines.Machine;
@@ -31,14 +32,13 @@ import com.loomcom.symon.ui.Console;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import javax.management.monitor.CounterMonitor;
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 import java.awt.*;
 import java.awt.event.*;
 import java.io.*;
-import java.util.SortedSet;
-import java.util.TreeSet;
+
+import static com.loomcom.symon.InstructionTable.*;

 /**
 * Symon Simulator Interface and Control.
@@ -54,7 +54,7 @@ public class Simulator {

    // UI constants
    private static final int DEFAULT_FONT_SIZE = 12;
-    private static final Font DEFAULT_FONT = new Font(Font.MONOSPACED, Font.PLAIN, DEFAULT_FONT_SIZE);
+    private static final Font DEFAULT_FONT = new Font(Font.MONOSPACED, Font.PLAIN, UIScale.scale(DEFAULT_FONT_SIZE));
    private static final int CONSOLE_BORDER_WIDTH = 10;

    // Clock periods, in NS, for each speed. 0MHz, 1MHz, 2MHz, 3MHz, 4MHz, 5MHz, 6MHz, 7MHz, 8MHz.
@@ -72,7 +72,7 @@ public class Simulator {
    private static final int MAX_STEPS_BETWEEN_UPDATES = 20000;

    // The simulated machine
-    private Machine machine;
+    private final Machine machine;

    // Number of CPU steps between CRT repaints.
    // TODO: Dynamically refresh the value at runtime based on performance figures to reach ~ 30fps.
@@ -115,18 +115,19 @@ public class Simulator {

    private JButton runStopButton;
    private JButton stepButton;
+    private JButton stepOverButton;
    private JComboBox<String> stepCountBox;

    private JFileChooser fileChooser;
    private PreferencesDialog preferences;

-    private Breakpoints breakpoints;
+    private final Breakpoints breakpoints;

    private final Object commandMonitorObject = new Object();

    private MainCommand command = MainCommand.NONE;

-    private boolean haltOnBreak;
+    private final boolean haltOnBreak;

    public enum MainCommand {
        NONE,
@@ -138,11 +139,11 @@ public class Simulator {
     */
    private static final String[] STEPS = {"1", "5", "10", "20", "50", "100"};

-    public Simulator(Class machineClass) throws Exception {
+    public Simulator(Class<?> machineClass) throws Exception {
        this(machineClass, InstructionTable.CpuBehavior.NMOS_6502, null, false);
    }

-    public Simulator(Class machineClass, InstructionTable.CpuBehavior cpuType,
+    public Simulator(Class<?> machineClass, InstructionTable.CpuBehavior cpuType,
                     String romFile, boolean haltOnBreak) throws Exception {
        this.haltOnBreak = haltOnBreak;
        this.breakpoints = new Breakpoints(this);
@@ -165,7 +166,7 @@ public class Simulator {
    /**
     * Display the main simulator UI.
     */
-    public void createAndShowUi() throws IOException {
+    public void createAndShowUi() {
        mainWindow = new JFrame();
        mainWindow.setTitle("6502 Simulator - " + machine.getName());
        mainWindow.setResizable(false);
@@ -191,18 +192,22 @@ public class Simulator {

        runStopButton = new JButton("Run");
        stepButton = new JButton("Step");
+        stepOverButton = new JButton("Step Over");
+        stepOverButton.setEnabled(false);
        JButton softResetButton = new JButton("Soft Reset");
        JButton hardResetButton = new JButton("Hard Reset");

        stepCountBox = new JComboBox<>(STEPS);
-        stepCountBox.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
+        stepCountBox.addActionListener(actionEvent -> {
+            JComboBox<?> cb = (JComboBox<?>) actionEvent.getSource();
+            String cbStepsPerClick = (String) cb.getSelectedItem();
+
+            stepsPerClick = 1; // Default in case of error
+
+            if (cbStepsPerClick != null) {
                try {
-                    JComboBox cb = (JComboBox) actionEvent.getSource();
-                    stepsPerClick = Integer.parseInt((String) cb.getSelectedItem());
+                    stepsPerClick = Integer.parseInt(cbStepsPerClick);
                } catch (NumberFormatException ex) {
-                    stepsPerClick = 1;
                    stepCountBox.setSelectedIndex(0);
                }
            }
@@ -210,6 +215,7 @@ public class Simulator {

        buttonContainer.add(runStopButton);
        buttonContainer.add(stepButton);
+        buttonContainer.add(stepOverButton);
        buttonContainer.add(stepCountBox);
        buttonContainer.add(softResetButton);
        buttonContainer.add(hardResetButton);
@@ -224,38 +230,25 @@ public class Simulator {
        // Bottom - buttons.
        mainWindow.getContentPane().add(buttonContainer, BorderLayout.PAGE_END);

-        runStopButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
-                if (runLoop != null && runLoop.isRunning()) {
-                    Simulator.this.handleStop();
-                } else {
-                    Simulator.this.handleStart();
-                }
+        runStopButton.addActionListener(actionEvent -> {
+            if (runLoop != null && runLoop.isRunning()) {
+                Simulator.this.handleStop();
+            } else {
+                Simulator.this.handleStart();
            }
        });

-        stepButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
-                Simulator.this.handleStep(stepsPerClick);
-            }
+        stepButton.addActionListener(actionEvent -> Simulator.this.handleStep(stepsPerClick));
+        stepOverButton.addActionListener(actionEvent -> Simulator.this.handleStepOver());
+
+        softResetButton.addActionListener(actionEvent -> {
+            // If this was a CTRL-click, do a hard reset.
+            Simulator.this.handleReset(false);
        });

-        softResetButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
-                // If this was a CTRL-click, do a hard reset.
-                Simulator.this.handleReset(false);
-            }
-        });
-
-        hardResetButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
-                // If this was a CTRL-click, do a hard reset.
-                Simulator.this.handleReset(true);
-            }
+        hardResetButton.addActionListener(actionEvent -> {
+            // If this was a CTRL-click, do a hard reset.
+            Simulator.this.handleReset(true);
        });

        mainWindow.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
@@ -277,7 +270,7 @@ public class Simulator {
            try {
                commandMonitorObject.wait();
            } catch (InterruptedException ex) {
-                ex.printStackTrace();
+                logger.error("Interrupted during wait on command monitor.");
            }
        }
        return command;
@@ -340,12 +333,28 @@ public class Simulator {
                step();
            }
            updateVisibleState();
+            stepOverButton.setEnabled(machine.getCpu().getNextIr() == JSR);
        } catch (SymonException ex) {
            logger.error("Exception during simulator step", ex);
-            ex.printStackTrace();
        }
    }

+    /**
+     * Step over a JSR / RTS function. This function is much more like a "run()"
+     * than a "step()", and may enter an infinite loop if no RTS is encountered.
+     */
+    private void handleStepOver() {
+        if (runLoop != null && runLoop.isRunning()) {
+            // This should really never happen...
+            logger.error("Can't step over when the simulator is already running!");
+            return;
+        }
+
+        runLoop = new RunLoop();
+        runLoop.haltOnRts(true);
+        runLoop.start();
+    }
+
    /**
     * Perform a single step of the simulated system.
     */
@@ -365,7 +374,7 @@ public class Simulator {
        // If a key has been pressed, fill the ACIA.
        try {
            if (machine.getAcia() != null && console.hasInput()) {
-                machine.getAcia().rxWrite((int) console.readInputChar());
+                machine.getAcia().rxWrite(console.readInputChar());
            }
        } catch (FifoUnderrunException ex) {
            logger.error("Console type-ahead buffer underrun!");
@@ -414,53 +423,73 @@ public class Simulator {
     */
    class RunLoop extends Thread {
        private boolean isRunning = false;
+        private boolean haltOnRts = false;
+        // The number of JSR instructions we've seen since being asked to
+        // step over a subroutine. While stepping over, this is incremented
+        // on RTS instructions, and decremented on JSR instructions.
+        private int callStackDepth = 0;

        public boolean isRunning() {
-            return isRunning;
+            return this.isRunning;
        }

        public void requestStop() {
-            isRunning = false;
+            this.isRunning = false;
+        }
+
+        public void haltOnRts(boolean value) {
+            this.haltOnRts = value;
        }

        public void run() {
-            logger.debug("Starting main run loop.");
-            isRunning = true;
+            if (this.haltOnRts) {
+                logger.debug("Running until next RTS instruction");
+            } else {
+                logger.debug("Running");
+            }
+            this.isRunning = true;

-            SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    // Don't allow step while the simulator is running
-                    stepButton.setEnabled(false);
-                    stepCountBox.setEnabled(false);
-                    menuBar.simulatorDidStart();
-                    // Toggle the state of the run button
-                    runStopButton.setText("Stop");
-                }
+            SwingUtilities.invokeLater(() -> {
+                // Don't allow step while the simulator is running
+                stepButton.setEnabled(false);
+                stepOverButton.setEnabled(false);
+                stepCountBox.setEnabled(false);
+                menuBar.simulatorDidStart();
+                // Toggle the state of the run button
+                runStopButton.setText("Stop");
            });

            try {
                do {
                    step();
+                    if (this.haltOnRts) {
+                        var instruction = machine.getCpu().getInstruction();
+                        if (instruction == JSR) {
+                            this.callStackDepth++;
+                            logger.trace("Step-over call stack increased to {}", this.callStackDepth);
+                        } else if (this.callStackDepth > 0 && instruction == RTS) {
+                            this.callStackDepth--;
+                            logger.trace("Step-over call stack decreased to {}", this.callStackDepth);
+                        }
+                    }
+
                } while (shouldContinue());
            } catch (SymonException ex) {
                logger.error("Exception in main simulator run thread. Exiting run.", ex);
            }

-            SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    statusPane.updateState();
-                    memoryWindow.updateState();
-                    runStopButton.setText("Run");
-                    stepButton.setEnabled(true);
-                    stepCountBox.setEnabled(true);
-                    if (traceLog.isVisible()) {
-                        traceLog.refresh();
-                    }
-                    menuBar.simulatorDidStop();
-                    traceLog.simulatorDidStop();
+            SwingUtilities.invokeLater(() -> {
+                statusPane.updateState();
+                memoryWindow.updateState();
+                runStopButton.setText("Run");
+                stepButton.setEnabled(true);
+                stepOverButton.setEnabled(machine.getCpu().getNextIr() == JSR);
+                stepCountBox.setEnabled(true);
+                if (traceLog.isVisible()) {
+                    traceLog.refresh();
                }
+                menuBar.simulatorDidStop();
+                traceLog.simulatorDidStop();
            });

            isRunning = false;
@@ -470,9 +499,13 @@ public class Simulator {
         * @return True if the run loop should proceed to the next step.
         */
        private boolean shouldContinue() {
-            return !breakpoints.contains(machine.getCpu().getProgramCounter()) &&
-                    isRunning &&
-                    !(preferences.getHaltOnBreak() && machine.getCpu().getInstruction() == 0x00);
+            var instruction = machine.getCpu().getInstruction();
+
+            var stepOverHalt = this.haltOnRts && this.callStackDepth == 0 && instruction == RTS;
+            var breakpointHalt = breakpoints.contains(machine.getCpu().getProgramCounter());
+            var brkHalt = preferences.getHaltOnBreak() && instruction == BRK;
+
+            return isRunning && !(stepOverHalt || breakpointHalt || brkHalt);
        }
    }

@@ -513,12 +546,9 @@ public class Simulator {
                            // Now load the program at the starting address.
                            loadProgram(program, preferences.getProgramStartAddress());

-                            SwingUtilities.invokeLater(new Runnable() {
-                                @Override
-                                public void run() {
-                                    console.reset();
-                                    breakpoints.refresh();
-                                }
+                            SwingUtilities.invokeLater(() -> {
+                                console.reset();
+                                breakpoints.refresh();
                            });

                            // TODO: "Don't Show Again" checkbox
@@ -556,7 +586,7 @@ public class Simulator {
                        long fileSize = romFile.length();

                        if (fileSize != machine.getRomSize()) {
-                            throw new IOException("ROM file must be exactly " + String.valueOf(machine.getRomSize()) + " bytes.");
+                            throw new IOException("ROM file must be exactly " + machine.getRomSize() + " bytes.");
                        }

                        // Load the new ROM image
@@ -650,30 +680,27 @@ public class Simulator {
    }

    class SetFontAction extends AbstractAction {
-        private int size;
+        private final int size;

        public SetFontAction(int size) {
-            super(Integer.toString(size) + " pt", null);
+            super(size + " pt", null);
            this.size = size;
            putValue(SHORT_DESCRIPTION, "Set font to " + size + "pt.");
        }

        public void actionPerformed(ActionEvent actionEvent) {
-            SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    console.setFont(new Font("Monospaced", Font.PLAIN, size));
-                    mainWindow.pack();
-                }
+            SwingUtilities.invokeLater(() -> {
+                console.setFont(new Font("Monospaced", Font.PLAIN, size));
+                mainWindow.pack();
            });
        }
    }

    class SetSpeedAction extends AbstractAction {
-        private int speed;
+        private final int speed;

        public SetSpeedAction(int speed) {
-            super(Integer.toString(speed) + " MHz", null);
+            super(speed + " MHz", null);
            this.speed = speed;
            putValue(SHORT_DESCRIPTION, "Set simulated speed to " + speed + " MHz.");
        }
@@ -689,7 +716,7 @@ public class Simulator {
    }

    class SetCpuAction extends AbstractAction {
-        private Cpu.CpuBehavior behavior;
+        private final Cpu.CpuBehavior behavior;

        public SetCpuAction(String cpu, Cpu.CpuBehavior behavior) {
            super(cpu, null);
@@ -729,11 +756,7 @@ public class Simulator {

        public void actionPerformed(ActionEvent actionEvent) {
            synchronized (memoryWindow) {
-                if (memoryWindow.isVisible()) {
-                    memoryWindow.setVisible(false);
-                } else {
-                    memoryWindow.setVisible(true);
-                }
+                memoryWindow.setVisible(!memoryWindow.isVisible());
            }
        }
    }
@@ -746,11 +769,7 @@ public class Simulator {

        public void actionPerformed(ActionEvent actionEvent) {
            synchronized (videoWindow) {
-                if (videoWindow.isVisible()) {
-                    videoWindow.setVisible(false);
-                } else {
-                    videoWindow.setVisible(true);
-                }
+                videoWindow.setVisible(!videoWindow.isVisible());
            }
        }
    }
@@ -763,11 +782,7 @@ public class Simulator {

        public void actionPerformed(ActionEvent actionEvent) {
            synchronized (breakpointsWindow) {
-                if (breakpointsWindow.isVisible()) {
-                    breakpointsWindow.setVisible(false);
-                } else {
-                    breakpointsWindow.setVisible(true);
-                }
+                breakpointsWindow.setVisible(!breakpointsWindow.isVisible());
            }
        }
    }
@@ -963,15 +978,11 @@ public class Simulator {

    private void updateVisibleState() {
        // Immediately update the UI.
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                // Now update the state
-                statusPane.updateState();
-                memoryWindow.updateState();
-                if (traceLog.shouldUpdate()) {
-                    traceLog.refresh();
-                }
+        SwingUtilities.invokeLater(() -> {
+            statusPane.updateState();
+            memoryWindow.updateState();
+            if (traceLog.shouldUpdate()) {
+                traceLog.refresh();
            }
        });
    }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -32,7 +32,7 @@ import com.loomcom.symon.exceptions.MemoryRangeException;

 public abstract class Acia extends Device {

-    private String name;
+    private final String name;

    /**
     * Register addresses
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -121,9 +121,6 @@ public class Acia6551 extends Acia {
        // Mask the lower four bits to get the baud rate.
        int baudSelector = data & 0x0f;
        switch (baudSelector) {
-            case 0:
-                rate = 0;
-                break;
            case 1:
                rate = 50;
                break;
@@ -169,6 +166,8 @@ public class Acia6551 extends Acia {
            case 15:
                rate = 19200;
                break;
+            default:
+                break;
        }

        setBaudRate(rate);
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
- *                    Maik Merten <maikmerten@googlemail.com>
+ * Copyright (c) 2008-2025 Seth J. Morabito <web@loomcom.com>
+ *                         Maik Merten <maikmerten@googlemail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
@@ -31,7 +31,7 @@ import com.loomcom.symon.exceptions.MemoryRangeException;
 /**
 * This is a simulation of the Motorola 6850 ACIA, with limited
 * functionality.
- *
+ * <p>
 * Unlike a 16550 UART, the 6850 ACIA has only one-byte transmit and
 * receive buffers. It is the programmer's responsibility to check the
 * status (full or empty) for transmit and receive buffers before
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -26,8 +26,6 @@ package com.loomcom.symon.devices;
 import com.loomcom.symon.exceptions.MemoryAccessException;
 import com.loomcom.symon.exceptions.MemoryRangeException;

-import java.io.IOException;
-
 /**
 * Simulation of a 6545 CRTC and virtual CRT output.
 */
@@ -87,9 +85,9 @@ public class Crtc extends Device {
    private boolean displayEnableSkew = false;
    private boolean cursorSkew = false;

-    private Memory memory;
+    private final Memory memory;

-    public Crtc(int deviceAddress, Memory memory) throws MemoryRangeException, IOException {
+    public Crtc(int deviceAddress, Memory memory) throws MemoryRangeException {
        super(deviceAddress, deviceAddress + 2, "CRTC");
        this.memory = memory;

@@ -120,19 +118,17 @@ public class Crtc extends Device {

    @Override
    public int read(int address, boolean cpuAccess) throws MemoryAccessException {
-        switch (address) {
-            case REGISTER_RW:
-                switch (currentRegister) {
-                    case CURSOR_POSITION_LOW:
-                        return cursorPosition & 0xff;
-                    case CURSOR_POSITION_HIGH:
-                        return cursorPosition >> 8;
-                    default:
-                        return 0;
-                }
-            default:
-                return 0;
+        if (address == REGISTER_RW) {
+            switch (currentRegister) {
+                case CURSOR_POSITION_LOW:
+                    return cursorPosition & 0xff;
+                case CURSOR_POSITION_HIGH:
+                    return cursorPosition >> 8;
+                default:
+                    return 0;
+            }
        }
+        return 0;
    }

    @Override
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -45,7 +45,7 @@ public abstract class Device implements Comparable<Device> {
    /**
     * The memory range for this device.
     */
-    private MemoryRange memoryRange;
+    private final MemoryRange memoryRange;

    /**
     * The name of the device.
@@ -60,7 +60,7 @@ public abstract class Device implements Comparable<Device> {
    /**
     * Listeners to notify on update.
     */
-    private Set<DeviceChangeListener> deviceChangeListeners;
+    private final Set<DeviceChangeListener> deviceChangeListeners;

    public Device(int startAddress, int endAddress, String name) throws MemoryRangeException {
        this.memoryRange = new MemoryRange(startAddress, endAddress);
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -30,8 +30,8 @@ import com.loomcom.symon.exceptions.*;

 public class Memory extends Device {

-    private boolean readOnly;
-    private int[] mem;
+    private final boolean readOnly;
+    private final int[] mem;

    /* Initialize all locations to 0x00 (BRK) */
    private static final int DEFAULT_FILL = 0x00;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
- *                    Maik Merten <maikmerten@googlemail.com>
+ * Copyright (c) 2008-2025 Seth J. Morabito <web@loomcom.com>
+ *                         Maik Merten <maikmerten@googlemail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
@@ -119,7 +119,10 @@ public class SdController extends Device {
        if (sdImageFile != null) {
            try {
                FileInputStream fis = new FileInputStream(sdImageFile);
-                fis.skip(this.position);
+                long bytesSkipped = fis.skip(this.position);
+                if (bytesSkipped < this.position) {
+                    logger.log(Level.WARNING, "Failed to seek to position " + this.position);
+                }
                int read = fis.read(readBuffer);
                if (read < SECTOR_SIZE) {
                    logger.log(Level.WARNING, "not enough data to fill read buffer from SD image file");
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -25,85 +25,90 @@ package com.loomcom.symon.devices;

 import com.loomcom.symon.exceptions.MemoryAccessException;
 import com.loomcom.symon.exceptions.MemoryRangeException;
+import com.loomcom.symon.util.Utils;

 /**
- * Very basic implementation of a MOS 6522 VIA.
- *
- * TODO: Implement timers as threads.
+ * Skeleton for future implementation of a MOS 6522 VIA.
 */
 public class Via6522 extends Pia {
    public static final int VIA_SIZE = 16;

-    enum Register {
-        ORB, ORA, DDRB, DDRA, T1C_L, T1C_H, T1L_L, T1L_H,
-        T2C_L, T2C_H, SR, ACR, PCR, IFR, IER, ORA_H
-    }
+
+    static final int IOB_REG    = 0;    // Output Register B / Input Register B
+    static final int IOA_REG    = 1;    // Output Register A / Input Register A
+    static final int DDRB_REG   = 2;    // Data Direction Register B
+    static final int DDRA_REG   = 3;    // Data Direction Register A
+    static final int T1CL_REG   = 4;    // T1 Low-Order Counter / Latches
+    static final int T1CH_REG   = 5;    // T1 High-Order Counter
+    static final int T1LL_REG   = 6;    // T1 Low-Order Latches
+    static final int T1LH_REG   = 7;    // T1 High-Order Latches
+    static final int T2CL_REG   = 8;    // T2 Low-Order Counter / Latches
+    static final int T2CH_REG   = 9;    // T2 High-Order Counter
+    static final int SR_REG     = 10;   // Shift Register
+    static final int AuxC_REG   = 11;   // Auxiliary Control Register
+    static final int PerC_REG   = 12;   // Peripheral Control Register
+    static final int IntF_REG   = 13;   // Interrupt Flag Register
+    static final int IntE_REG   = 14;   // Interrupt Enable Register
+    static final int IOANH_REG  = 15;   // Same as Register 1 (IOA), but no Handshake
+
+    private int outputRegisterB, inputRegisterB;
+    private int outputRegisterA, inputRegisterA;
+    private int dataDirectionB,  dataDirectionA;

    public Via6522(int address) throws MemoryRangeException {
        super(address, address + VIA_SIZE - 1, "MOS 6522 VIA");
+        outputRegisterA = outputRegisterB = 0;
+        dataDirectionA = dataDirectionB = 0;
    }

    @Override
    public void write(int address, int data) throws MemoryAccessException {
-        Register[] registers = Register.values();
-
-        if (address >= registers.length) {
-            throw new MemoryAccessException("Unknown register: " + address);
-        }
-
-        Register r = registers[address];
-
-        switch (r) {
-            case ORA:
-            case ORB:
-            case DDRA:
-            case DDRB:
-            case T1C_L:
-            case T1C_H:
-            case T1L_L:
-            case T1L_H:
-            case T2C_L:
-            case T2C_H:
-            case SR:
-            case ACR:
-            case PCR:
-            case IFR:
-            case IER:
-            case ORA_H:
-            default:
+        switch (address) {
+            case IOB_REG    -> outputRegisterB  = data & 0xFF;
+            case IOA_REG    -> outputRegisterA  = data & 0xFF;
+            case DDRB_REG   -> dataDirectionB   = data & 0xFF;
+            case DDRA_REG   -> dataDirectionA   = data & 0xFF;
+            case IOANH_REG  -> outputRegisterA  = data & 0xFF;
+            default -> throw new MemoryAccessException("No Register or Not Implemented!");
        }
    }

    @Override
    public int read(int address, boolean cpuAccess) throws MemoryAccessException {
-        Register[] registers = Register.values();
+        return switch (address) {
+            case IOB_REG    -> pbRead();
+            case IOA_REG    -> paRead();
+            case DDRB_REG   -> dataDirectionB;
+            case DDRA_REG   -> dataDirectionA;
+            case IOANH_REG  -> paRead();
+            default -> throw new MemoryAccessException("No Register or Not Implemented!");
+        };
+    }

-        if (address >= registers.length) {
-            throw new MemoryAccessException("Unknown register: " + address);
-        }
+    public void setInputRegisterB(int data) {
+        inputRegisterB = data & 0xFF;
+    }

-        Register r = registers[address];
+    public void setInputRegisterA(int data) {
+        inputRegisterA = data & 0xFF;
+    }

-        switch (r) {
-            case ORA:
-            case ORB:
-            case DDRA:
-            case DDRB:
-            case T1C_L:
-            case T1C_H:
-            case T1L_L:
-            case T1L_H:
-            case T2C_L:
-            case T2C_H:
-            case SR:
-            case ACR:
-            case PCR:
-            case IFR:
-            case IER:
-            case ORA_H:
-            default:
-        }

-        return 0;
+    public String getPBStatus() {
+        return "%" + Utils.byteToBin(pbRead());
+    }
+
+    public String getPAStatus() {
+        return "%" + Utils.byteToBin(paRead());
+    }
+
+    private int pbRead() {
+        // Return bits of output register where DDRB is 1 and input register where DDRB is 0
+        return (outputRegisterB & dataDirectionB) | (inputRegisterB & ~dataDirectionB);
+    }
+
+    private int paRead() {
+        // Return bits of output register where DDRB is 1 and input register where DDRB is 0
+        return (outputRegisterA & dataDirectionA) | (inputRegisterA & ~dataDirectionA);
    }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 Seth J. Morabito <web@loomcom.com>
 * Portions Copyright (c) 2009-2011 Graham Edgecombe
 *
 * Permission is hereby granted, free of charge, to any person obtaining
@@ -25,13 +25,8 @@
 package com.loomcom.symon.jterminal;

 import com.loomcom.symon.jterminal.vt100.Vt100TerminalModel;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.event.AdjustmentEvent;
-import java.awt.event.AdjustmentListener;
+
+import java.awt.*;
 import javax.swing.JComponent;
 import javax.swing.JScrollBar;

@@ -88,10 +83,6 @@ public class JTerminal extends JComponent {
 		revalidate();
 	}

-	public int getBorderWidth() {
-		return borderWidth;
-	}
-
 	public void setFont(Font font) {
 		this.font = font;
 		setCellWidthAndHeight(font);
@@ -113,13 +104,6 @@ public class JTerminal extends JComponent {
 		return model;
 	}

-	public void println(String str) {
-		if (str == null) {
-			throw new NullPointerException("str");
-		}
-		print(str.concat("\r\n"));
-	}
-
 	public void print(String str) {
 		model.print(str);
 	}
@@ -177,12 +161,8 @@ public class JTerminal extends JComponent {
 		int bufferSize = model.getBufferSize();

 		if (bufferSize > rows) {
-			scrollBar = new JScrollBar(1, 0, rows, 0, bufferSize + 1);
-			scrollBar.addAdjustmentListener(new AdjustmentListener() {
-				public void adjustmentValueChanged(AdjustmentEvent evt) {
-					repaint();
-				}
-			});
+			scrollBar = new JScrollBar(Adjustable.VERTICAL, 0, rows, 0, bufferSize + 1);
+			scrollBar.addAdjustmentListener(evt -> repaint());
 			add("After", scrollBar);
 		}

@@ -32,51 +32,45 @@ import com.loomcom.symon.jterminal.bell.BellStrategy;
 */
 public interface TerminalModel {

-	/**
-	 * Gets the bell strategy.
-	 * @return The bell strategy.
-	 */
-	public BellStrategy getBellStrategy();
-
 	/**
 	 * Sets the bell strategy.
 	 * @param strategy The bell strategy.
 	 * @throws NullPointerException if the strategy is {@code null}.
 	 */
-	public void setBellStrategy(BellStrategy strategy);
+    void setBellStrategy(BellStrategy strategy);

 	/**
 	 * Clears the terminal.
 	 */
-	public void clear();
+    void clear();

 	/**
 	 * Moves the cursor back n characters.
 	 * @param n The number of characters.
 	 * @throws IllegalArgumentException if n is not positive.
 	 */
-	public void moveCursorBack(int n);
+    void moveCursorBack(int n);

 	/**
 	 * Moves the cursor forward n characters.
 	 * @param n The number of characters.
 	 * @throws IllegalArgumentException if n is not positive.
 	 */
-	public void moveCursorForward(int n);
+    void moveCursorForward(int n);

 	/**
 	 * Moves the cursor down n characters.
 	 * @param n The number of characters.
 	 * @throws IllegalArgumentException if n is not positive.
 	 */
-	public void moveCursorDown(int n);
+    void moveCursorDown(int n);

 	/**
 	 * Moves the cursor up n characters.
 	 * @param n The number of characters.
 	 * @throws IllegalArgumentException if n is not positive.
 	 */
-	public void moveCursorUp(int n);
+    void moveCursorUp(int n);

 	/**
 	 * Sets a cell.
@@ -86,7 +80,7 @@ public interface TerminalModel {
 	 * @throws IndexOutOfBoundsException if the column and/or row number(s) are
 	 * out of bounds.
 	 */
-	public void setCell(int column, int row, TerminalCell cell);
+    void setCell(int column, int row, TerminalCell cell);

 	/**
 	 * Gets a cell.
@@ -96,7 +90,7 @@ public interface TerminalModel {
 	 * @throws IndexOutOfBoundsException if the column and/or row number(s) are
 	 * out of bounds.
 	 */
-	public TerminalCell getCell(int column, int row);
+    TerminalCell getCell(int column, int row);

 	/**
 	 * Prints the specified string to the terminal at the cursor position,
@@ -105,63 +99,63 @@ public interface TerminalModel {
 	 * @param str The string to print.
 	 * @throws NullPointerException if the string is {@code null}.
 	 */
-	public void print(String str);
+    void print(String str);

 	/**
 	 * Gets the number of columns.
 	 * @return The number of columns.
 	 */
-	public int getColumns();
+    int getColumns();

 	/**
 	 * Gets the number of rows.
 	 * @return The number of rows.
 	 */
-	public int getRows();
+	int getRows();

 	/**
 	 * Gets the buffer size.
 	 * @return The buffer size.
 	 */
-	public int getBufferSize();
+	int getBufferSize();

 	/**
 	 * Gets the cursor row.
 	 * @return The cursor row.
 	 */
-	public int getCursorRow();
+	int getCursorRow();

 	/**
 	 * Sets the cursor row.
 	 * @param row The cursor row.
 	 * @throws IllegalArgumentException if the row is out of the valid range.
 	 */
-	public void setCursorRow(int row);
+	void setCursorRow(int row);

 	/**
 	 * Gets the cursor column.
 	 * @return The cursor column.
 	 */
-	public int getCursorColumn();
+	int getCursorColumn();

 	/**
 	 * Sets the cursor column.
 	 * @param column The cursor column.
 	 * @throws IllegalArgumentException if the column is out of the valid range.
 	 */
-	public void setCursorColumn(int column);
+	void setCursorColumn(int column);

 	/**
 	 * Gets the default background color.
 	 * @return The default background color.
 	 */
-	public Color getDefaultBackgroundColor();
+	Color getDefaultBackgroundColor();

 	/**
 	 * Gets the default foreground color.
 	 * @return The default foreground color.
 	 */
-	public Color getDefaultForegroundColor();
+	Color getDefaultForegroundColor();

 }

@@ -31,7 +31,7 @@ public interface BellStrategy {
 	/**
 	 * Sounds the bell.
 	 */
-	public void soundBell();
+	void soundBell();

 }

@@ -50,7 +50,7 @@ public class AnsiControlSequence {
 			throw new NullPointerException("parameters");
 		}
 		this.command = command;
-		if (parameters.length == 1 && parameters[0].equals("")) {
+		if (parameters.length == 1 && parameters[0].isEmpty()) {
 			this.parameters = new String[0];
 		} else {
 			this.parameters = parameters.clone();
@@ -32,13 +32,13 @@ public interface AnsiControlSequenceListener {
 	 * Called when a control sequence has been parsed.
 	 * @param seq The control sequence.
 	 */
-	public void parsedControlSequence(AnsiControlSequence seq);
+	void parsedControlSequence(AnsiControlSequence seq);

 	/**
 	 * Called when a string has been parsed.
 	 * @param str The string.
 	 */
-	public void parsedString(String str);
+	void parsedString(String str);

 }

@@ -33,7 +33,7 @@ import java.io.StringReader;
 public class AnsiControlSequenceParser {

 	/**
-	 * The multi-byte control sequence introducer.
+	 * The multibyte control sequence introducer.
 	 */
 	private static final char[] MULTI_CSI = new char[] { 27, '[' };

@@ -43,7 +43,7 @@ public class AnsiControlSequenceParser {
 	private static final char SINGLE_CSI = 155;

 	/**
-	 * The buffer of data from the last call to {@link #parse()}. This is
+	 * The buffer of data from the last call to "parse()". This is
 	 * populated with data if an escape sequence is not complete.
 	 */
 	private StringBuilder buffer = new StringBuilder();
@@ -70,13 +70,10 @@ public class AnsiControlSequenceParser {
 			str = buffer.toString().concat(str);
 			buffer = new StringBuilder();
 		}
-		Reader reader = new StringReader(str);
-		try {
-			try {
-				parse(reader);
-			} finally {
-				reader.close();
-			}
+        try {
+            try (Reader reader = new StringReader(str)) {
+                parse(reader);
+            }
 		} catch (IOException ex) {
 			/* ignore */
 		}
@@ -147,7 +144,7 @@ public class AnsiControlSequenceParser {
 		if (!finishedSequence) {
 			// not an ideal solution if they used the two byte CSI, but it's
 			// easier and cleaner than keeping track of it
-			buffer.append((char) SINGLE_CSI);
+			buffer.append(SINGLE_CSI);
 			buffer.append(parameters);
 		}
 	}
@@ -56,6 +56,7 @@ public class Vt100TerminalModel extends AbstractTerminalModel {
 		@Override
 		public void parsedControlSequence(AnsiControlSequence seq) {
 			char command = seq.getCommand();
+			int n;
 			String[] parameters = seq.getParameters();

 			switch (command) {
@@ -63,7 +64,7 @@ public class Vt100TerminalModel extends AbstractTerminalModel {
 			case 'B':
 			case 'C':
 			case 'D':
-				int n = 1;
+				n = 1;
 				if (parameters.length == 1) {
 					n = Integer.parseInt(parameters[0]);
 				}
@@ -73,7 +74,7 @@ public class Vt100TerminalModel extends AbstractTerminalModel {
 					moveCursorDown(n);
 				} else if (command == 'C') {
 					moveCursorForward(n);
-				} else if (command == 'D') {
+				} else {
 					moveCursorBack(n);
 				}
 				break;
@@ -85,7 +86,7 @@ public class Vt100TerminalModel extends AbstractTerminalModel {
 				}
 				if (command == 'E') {
 					moveCursorDown(n);
-				} else if (command == 'F') {
+				} else {
 					moveCursorUp(n);
 				}
 				setCursorColumn(0);
@@ -465,12 +466,7 @@ public class Vt100TerminalModel extends AbstractTerminalModel {
 		return bufferSize;
 	}

-	@Override
-	public BellStrategy getBellStrategy() {
-		return bellStrategy;
-	}
-
-	@Override
+    @Override
 	public void setBellStrategy(BellStrategy strategy) {
 		if (strategy == null) {
 			throw new NullPointerException("strategy");
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
- *                    Maik Merten <maikmerten@googlemail.com>
- *                    Chelsea Wilkinson <mail@chelseawilkinson.me>
+ * Copyright (c) 2008-2025 Seth J. Morabito <web@loomcom.com>
+ *                         Maik Merten <maikmerten@googlemail.com>
+ *                         Chelsea Wilkinson <mail@chelseawilkinson.me>
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
- *                    Maik Merten <maikmerten@googlemail.com>
+ * Copyright (c) 2008-2025 Seth J. Morabito <web@loomcom.com>
+ *                         Maik Merten <maikmerten@googlemail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
@@ -42,9 +42,9 @@ public interface Machine {
    Memory getRam();
    
    Acia getAcia();
-    
+
    Pia getPia();
-    
+
    Crtc getCrtc();
    
    Memory getRom();
@@ -0,0 +1,133 @@
+package com.loomcom.symon.machines;
+
+import com.loomcom.symon.Bus;
+import com.loomcom.symon.Cpu;
+import com.loomcom.symon.devices.*;
+import com.loomcom.symon.exceptions.MemoryRangeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+
+public class MichaelBillingtonMachine implements Machine{
+
+    private static final Logger logger = LoggerFactory.getLogger(MichaelBillingtonMachine.class.getName());
+
+    // Constants used by the simulated system
+    private static final int BUS_BOTTOM = 0x0000;
+    private static final int BUS_TOP    = 0xffff;
+
+    // 32k of ram, from $0000 to $7fff
+    private static final int MEMORY_BASE = 0x0000;
+    private static final int MEMORY_SIZE = 0x8000;
+
+    // VIA at $8000-$800f
+    private static final int PIA_BASE = 0x8000;
+
+    // ACIA at $8400-$8403
+    private static final int ACIA_BASE = 0x8400;
+
+    // 16k ROM from $c000 to $ffff
+    private static final int ROM_BASE = 0xc000;
+    private static final int ROM_SIZE = 0x4000;
+
+    private final   Bus     bus;
+    private final   Cpu     cpu;
+    private final   Acia    acia;
+    private final   Pia     pia;
+    private final   Memory  ram;
+    private         Memory  rom;
+
+    public MichaelBillingtonMachine(String romFile) throws Exception {
+        this.bus = new Bus(BUS_BOTTOM, BUS_TOP);
+        this.cpu = new Cpu();
+        this.ram = new Memory(MEMORY_BASE, MEMORY_BASE + MEMORY_SIZE - 1);
+        this.pia = new Via6522(PIA_BASE);
+        this.acia = new Acia6551(ACIA_BASE);
+
+        bus.addCpu(cpu);
+        bus.addDevice(ram);
+        bus.addDevice(pia);
+        bus.addDevice(acia);
+
+        if (romFile != null) {
+            File romImage = new File(romFile);
+            if (romImage.canRead()) {
+                logger.info("Loading ROM image from file {}", romImage);
+                this.rom = Memory.makeROM(ROM_BASE, ROM_BASE + ROM_SIZE - 1, romImage);
+            } else {
+                logger.info("Default ROM file {} not found, loading empty R/W memory image.", romImage);
+                this.rom = Memory.makeRAM(ROM_BASE, ROM_BASE + ROM_SIZE - 1);
+            }
+        } else {
+            logger.info("No ROM file specified, loading empty R/W memory image.");
+            this.rom = Memory.makeRAM(ROM_BASE, ROM_BASE + ROM_SIZE - 1);
+        }
+
+        bus.addDevice(rom);
+    }
+
+    @Override
+    public Bus getBus() {
+        return bus;
+    }
+
+    @Override
+    public Cpu getCpu() {
+        return cpu;
+    }
+
+    @Override
+    public Memory getRam() {
+        return ram;
+    }
+
+    @Override
+    public Acia getAcia() {
+        return acia;
+    }
+
+    @Override
+    public Pia getPia() {
+        return pia;
+    }
+
+    @Override
+    public Crtc getCrtc() {
+        return null;
+    }
+
+    @Override
+    public Memory getRom() {
+        return rom;
+    }
+
+    @Override
+    public void setRom(Memory rom) throws MemoryRangeException {
+        if (this.rom != null) {
+            bus.removeDevice(this.rom);
+        }
+        this.rom = rom;
+        bus.addDevice(this.rom);
+    }
+
+    @Override
+    public int getRomBase() {
+        return ROM_BASE;
+    }
+
+    @Override
+    public int getRomSize() {
+        return ROM_SIZE;
+    }
+
+    @Override
+    public int getMemorySize() {
+        return MEMORY_SIZE;
+    }
+
+    @Override
+    public String getName() {
+        return "mike42";
+    }
+}
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
- *                    Maik Merten <maikmerten@googlemail.com>
+ * Copyright (c) 2008-2025 Seth J. Morabito <web@loomcom.com>
+ *                         Maik Merten <maikmerten@googlemail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
- *                    Maik Merten <maikmerten@googlemail.com>
+ * Copyright (c) 2008-2025 Seth J. Morabito <web@loomcom.com>
+ *                         Maik Merten <maikmerten@googlemail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
@@ -91,7 +91,7 @@ public class SimpleMachine implements Machine {
    }

    @Override
-    public void setRom(Memory rom) throws MemoryRangeException {
+    public void setRom(Memory rom) {
        // No-op
    }

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
- *                    Maik Merten <maikmerten@googlemail.com>
+ * Copyright (c) 2008-2025 Seth J. Morabito <web@loomcom.com>
+ *                         Maik Merten <maikmerten@googlemail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -30,10 +30,7 @@ import org.slf4j.LoggerFactory;

 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 import java.awt.*;
-import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

 /**
@@ -46,8 +43,8 @@ public class BreakpointsWindow extends JFrame {
    private static final Dimension FRAME_SIZE = new Dimension(240, 280);
    private static final String EMPTY_STRING = "";

-    private JFrame mainWindow;
-    private Breakpoints breakpoints;
+    private final JFrame mainWindow;
+    private final Breakpoints breakpoints;

    public BreakpointsWindow(Breakpoints breakpoints,
                             JFrame mainWindow) {
@@ -73,18 +70,8 @@ public class BreakpointsWindow extends JFrame {

        final JTable breakpointsTable = new JTable(breakpoints);
        breakpointsTable.setShowGrid(true);
-        breakpointsTable.setGridColor(Color.LIGHT_GRAY);
        breakpointsTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        breakpointsTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
-            @Override
-            public void valueChanged(ListSelectionEvent e) {
-                if (e.getFirstIndex() > -1) {
-                    removeButton.setEnabled(true);
-                } else {
-                    removeButton.setEnabled(false);
-                }
-            }
-        });
+        breakpointsTable.getSelectionModel().addListSelectionListener(e -> removeButton.setEnabled(e.getFirstIndex() > -1));

        JScrollPane scrollPane = new JScrollPane(breakpointsTable);
        scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
@@ -92,45 +79,33 @@ public class BreakpointsWindow extends JFrame {

        breakpointsPanel.add(scrollPane, BorderLayout.CENTER);

-        ActionListener addBreakpointListener = new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                int value;
+        ActionListener addBreakpointListener = e -> {
+            int value;

-                String newBreakpoint = addTextField.getText();
+            String newBreakpoint = addTextField.getText();

-                if (newBreakpoint == null || newBreakpoint.isEmpty()) {
-                    return;
-                }
-
-                try {
-                    value = (Integer.parseInt(addTextField.getText(), 16) & 0xffff);
-                } catch (NumberFormatException ex) {
-                    logger.warn("Can't parse page number {}", newBreakpoint);
-                    return;
-                }
-
-                if (value < 0) {
-                    return;
-                }
-
-                breakpoints.addBreakpoint(value);
-
-                logger.debug("Added breakpoint ${}", Utils.wordToHex(value));
-
-                addTextField.setText(EMPTY_STRING);
+            if (newBreakpoint == null || newBreakpoint.isEmpty()) {
+                return;
            }
+
+            try {
+                value = (Integer.parseInt(addTextField.getText(), 16) & 0xffff);
+            } catch (NumberFormatException ex) {
+                logger.warn("Can't parse page number {}", newBreakpoint);
+                return;
+            }
+
+            breakpoints.addBreakpoint(value);
+
+            logger.debug("Added breakpoint ${}", Utils.wordToHex(value));
+
+            addTextField.setText(EMPTY_STRING);
        };

        addButton.addActionListener(addBreakpointListener);
        addTextField.addActionListener(addBreakpointListener);

-        removeButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                breakpoints.removeBreakpointAtIndex(breakpointsTable.getSelectedRow());
-            }
-        });
+        removeButton.addActionListener(e -> breakpoints.removeBreakpointAtIndex(breakpointsTable.getSelectedRow()));

        controlPanel.add(addTextField);
        controlPanel.add(addButton);
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -51,8 +51,8 @@ public class Console extends JTerminal implements KeyListener, MouseListener {
    private static final boolean SWAP_CR_AND_LF       = true;

    // If true, send CRLF (0x0d 0x0a) whenever CR is typed
-    private boolean sendCrForLf;
-    private FifoRingBuffer<Character> typeAheadBuffer;
+    private final boolean sendCrForLf;
+    private final FifoRingBuffer<Character> typeAheadBuffer;

    public Console(int columns, int rows, Font font, boolean sendCrForLf) {
        super(new Vt100TerminalModel(columns, rows), font);
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -49,7 +49,7 @@ public class MemoryWindow extends JFrame implements ActionListener {

    private static final Logger logger = LoggerFactory.getLogger(MemoryWindow.class);

-    private MemoryTableModel memoryTableModel;
+    private final MemoryTableModel memoryTableModel;
    private JTable memoryTable;
    private JTextField pageNumberTextField;
    private JButton previousPageButton;
@@ -111,7 +111,7 @@ public class MemoryWindow extends JFrame implements ActionListener {
    }

    /**
-     * Set-up the UI.
+     * Set up the UI.
     */
    private void createUi() {
        setTitle("Memory Contents");
@@ -230,7 +230,7 @@ public class MemoryWindow extends JFrame implements ActionListener {
     * A JTable that will automatically select all text in a cell
     * being edited.
     */
-    private class MemoryTable extends JTable {
+    private static class MemoryTable extends JTable {

        public MemoryTable(TableModel tableModel) {
            super(tableModel);
@@ -242,7 +242,7 @@ public class MemoryWindow extends JFrame implements ActionListener {

            final Component editor = getEditorComponent();

-            if (editor != null && editor instanceof JTextComponent) {
+            if (editor instanceof JTextComponent) {
                ((JTextComponent) editor).selectAll();
            }

@@ -250,7 +250,7 @@ public class MemoryWindow extends JFrame implements ActionListener {
        }
    }

-    private class MemoryTableCellRenderer extends DefaultTableCellRenderer {
+    private static class MemoryTableCellRenderer extends DefaultTableCellRenderer {

        @Override
        public Component getTableCellRendererComponent(JTable table, Object value,
@@ -272,9 +272,9 @@ public class MemoryWindow extends JFrame implements ActionListener {
    /**
     * The model that backs the Memory Table.
     */
-    private class MemoryTableModel extends AbstractTableModel {
+    private static class MemoryTableModel extends AbstractTableModel {

-        private Bus bus;
+        private final Bus bus;
        private int pageNumber;

        private static final int COLUMN_COUNT = 17;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -23,17 +23,20 @@

 package com.loomcom.symon.ui;

+import com.formdev.flatlaf.util.UIScale;
 import com.loomcom.symon.Cpu;
 import com.loomcom.symon.CpuState;
+import com.loomcom.symon.devices.Pia;
+import com.loomcom.symon.devices.Via6522;
 import com.loomcom.symon.machines.Machine;

 import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.border.EtchedBorder;
-import javax.swing.plaf.metal.MetalTextFieldUI;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Objects;

 /**
 * UI component that displays the current state of the simulated CPU.
@@ -69,12 +72,14 @@ public class StatusPanel extends JPanel {
    private JTextField aField;
    private JTextField xField;
    private JTextField yField;
+    private JTextField piaBField;
+    private JTextField piaAField;

    private final Machine machine;

    private static final int EMPTY_BORDER = 10;
    private static final Border LABEL_BORDER = BorderFactory.createEmptyBorder(0, 5, 0, 0);
-    private static final Font LABEL_FONT = new Font(Font.SANS_SERIF, Font.BOLD, 12);
+    private static final Font LABEL_FONT = new Font(Font.SANS_SERIF, Font.BOLD, UIScale.scale(12));
    private static final Dimension LARGE_TEXT_FIELD_SIZE = new Dimension(134, 22);
    private static final Dimension SMALL_TEXT_FIELD_SIZE = new Dimension(65, 22);

@@ -86,7 +91,7 @@ public class StatusPanel extends JPanel {

    private void createUi() {
        Border emptyBorder = BorderFactory.createEmptyBorder(EMPTY_BORDER, EMPTY_BORDER,
-                                                             EMPTY_BORDER, EMPTY_BORDER);
+                EMPTY_BORDER, EMPTY_BORDER);
        Border etchedBorder = BorderFactory.createEtchedBorder(EtchedBorder.LOWERED);

        setBorder(BorderFactory.createCompoundBorder(emptyBorder, etchedBorder));
@@ -99,20 +104,20 @@ public class StatusPanel extends JPanel {
        JPanel statusFlagsPanel = new JPanel();
        statusFlagsPanel.setAlignmentX(LEFT_ALIGNMENT);

-        carryOn = new ImageIcon(this.getClass().getResource("/C_on.png"));
-        carryOff = new ImageIcon(this.getClass().getResource("/C_off.png"));
-        zeroOn = new ImageIcon(this.getClass().getResource("/Z_on.png"));
-        zeroOff = new ImageIcon(this.getClass().getResource("/Z_off.png"));
-        irqOn = new ImageIcon(this.getClass().getResource("/I_on.png"));
-        irqOff = new ImageIcon(this.getClass().getResource("/I_off.png"));
-        decimalOn = new ImageIcon(this.getClass().getResource("/D_on.png"));
-        decimalOff = new ImageIcon(this.getClass().getResource("/D_off.png"));
-        breakOn = new ImageIcon(this.getClass().getResource("/B_on.png"));
-        breakOff = new ImageIcon(this.getClass().getResource("/B_off.png"));
-        overflowOn = new ImageIcon(this.getClass().getResource("/O_on.png"));
-        overflowOff = new ImageIcon(this.getClass().getResource("/O_off.png"));
-        negativeOn = new ImageIcon(this.getClass().getResource("/N_on.png"));
-        negativeOff = new ImageIcon(this.getClass().getResource("/N_off.png"));
+        carryOn = loadScaledIcon("/C_on.png");
+        carryOff = loadScaledIcon("/C_off.png");
+        zeroOn = loadScaledIcon("/Z_on.png");
+        zeroOff = loadScaledIcon("/Z_off.png");
+        irqOn = loadScaledIcon("/I_on.png");
+        irqOff = loadScaledIcon("/I_off.png");
+        decimalOn = loadScaledIcon("/D_on.png");
+        decimalOff = loadScaledIcon("/D_off.png");
+        breakOn = loadScaledIcon("/B_on.png");
+        breakOff = loadScaledIcon("/B_off.png");
+        overflowOn = loadScaledIcon("/O_on.png");
+        overflowOff = loadScaledIcon("/O_off.png");
+        negativeOn = loadScaledIcon("/N_on.png");
+        negativeOff = loadScaledIcon("/N_off.png");

        // Initialize all to off
        carryFlagLabel = new JLabel(carryOff, JLabel.CENTER);
@@ -125,16 +130,15 @@ public class StatusPanel extends JPanel {

        // Add tool-tip text
        carryFlagLabel.setToolTipText("Carry: The last operation caused an overflow " +
-                                      "from bit 7 of the result or an underflow from bit 0");
+                "from bit 7 of the result or an underflow from bit 0");
        zeroFlagLabel.setToolTipText("Zero: The result of the last operation was 0");
        irqDisableFlagLabel.setToolTipText("Interrupt Disable: Processor will not respond to IRQ");
        decimalModeFlagLabel.setToolTipText("Decimal Mode");
        breakFlagLabel.setToolTipText("Break: BRK instruction occurred");
        overflowFlagLabel.setToolTipText("Overflow: The result of the last operation was " +
-                                         "an invalid 2's complement result");
+                "an invalid 2's complement result");
        negativeFlagLabel.setToolTipText("Negative: The result of the last operation set bit 7");

-
        statusFlagsPanel.add(negativeFlagLabel);
        statusFlagsPanel.add(overflowFlagLabel);
        statusFlagsPanel.add(breakFlagLabel);
@@ -152,6 +156,10 @@ public class StatusPanel extends JPanel {
        JLabel xLabel = makeLabel("X");
        JLabel yLabel = makeLabel("Y");

+        // PIA/VIA labels
+        JLabel piaBLabel = makeLabel("PB");
+        JLabel piaALabel = makeLabel("PA");
+
        statusFlagsLabel.setToolTipText("6502 Processor Status Flags");
        opcodeLabel.setToolTipText("Instruction Register");
        pcLabel.setToolTipText("Program Counter");
@@ -164,6 +172,9 @@ public class StatusPanel extends JPanel {
        xField = makeTextField(SMALL_TEXT_FIELD_SIZE, true);
        yField = makeTextField(SMALL_TEXT_FIELD_SIZE, true);

+        piaBField = makeTextField(LARGE_TEXT_FIELD_SIZE, false);
+        piaAField = makeTextField(LARGE_TEXT_FIELD_SIZE, false);
+
        // Make fields editable
        pcField.addActionListener(new ActionListener() {
            @Override
@@ -243,7 +254,6 @@ public class StatusPanel extends JPanel {
        constraints.gridy = 1;
        add(statusFlagsPanel, constraints);

-
        constraints.insets = new Insets(5, 0, 0, 0);
        constraints.gridy = 2;
        add(opcodeLabel, constraints);
@@ -287,6 +297,25 @@ public class StatusPanel extends JPanel {
        add(xField, constraints);
        constraints.gridx = 1;
        add(yField, constraints);
+
+        constraints.insets = new Insets(5, 0, 0, 0);
+        constraints.gridx = 0;
+        constraints.gridwidth = 2;
+        constraints.gridy = 10;
+        add(piaBLabel, constraints);
+
+        constraints.insets = new Insets(2, 2, 2, 2);
+        constraints.gridy = 11;
+        add(piaBField, constraints);
+
+        constraints.insets = new Insets(5, 0, 0, 0);
+        constraints.gridy = 12;
+        add(piaALabel, constraints);
+
+        constraints.insets = new Insets(2, 2, 2, 2);
+        constraints.gridy = 13;
+        add(piaAField, constraints);
+
    }

    /**
@@ -296,6 +325,8 @@ public class StatusPanel extends JPanel {
        Cpu cpu = machine.getCpu();
        CpuState cpuState = cpu.getCpuState();

+        Pia pia = machine.getPia();
+
        // Update the Processor Status Flag display
        int status = cpuState.getStatusFlag();

@@ -317,6 +348,12 @@ public class StatusPanel extends JPanel {
        xField.setText(cpu.getXRegisterStatus());
        yField.setText(cpu.getYRegisterStatus());

+        // Update the Pia Variables
+        if (pia instanceof Via6522) {
+            piaBField.setText(((Via6522) pia).getPBStatus());
+            piaAField.setText(((Via6522) pia).getPAStatus());
+        }
+
        repaint();
    }

@@ -389,16 +426,11 @@ public class StatusPanel extends JPanel {
        JTextField textField = new JTextField("");
        textField.setAlignmentX(LEFT_ALIGNMENT);
        textField.setEditable(editable);
-        textField.setMinimumSize(size);
-        textField.setMaximumSize(size);
-        textField.setPreferredSize(size);
-        textField.setBackground(Color.WHITE);
-        // Although we usually defer to the system look-and-feel, for
-        // these small text fields in particular, we use a Metal
-        // look-and-feel because native look-and-feel breaks very small
-        // text fields under GTK+ (they are drawn with an inner margin
-        // even if the margin is set to 0)
-        textField.setUI(new MetalTextFieldUI());
+
+        Dimension scaleSize = UIScale.scale(size);
+        textField.setMinimumSize(scaleSize);
+        textField.setMaximumSize(scaleSize);
+        textField.setPreferredSize(scaleSize);

        return textField;
    }
@@ -407,4 +439,14 @@ public class StatusPanel extends JPanel {
        String val = source.getText().replaceAll("[^0-9a-fA-F]", "");
        return Integer.parseInt(val, 16);
    }
+
+    private ImageIcon loadScaledIcon(String resourcePath) {
+        ImageIcon icon = new ImageIcon(Objects.requireNonNull(this.getClass().getResource(resourcePath)));
+
+        int scaledWidth = UIScale.scale(icon.getIconWidth());
+        int scaledHeight = UIScale.scale(icon.getIconHeight());
+
+        Image scaleImage = icon.getImage().getScaledInstance(scaledWidth, scaledHeight, Image.SCALE_SMOOTH);
+        return new ImageIcon(scaleImage);
+    }
 }
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
- *                    Maik Merten <maikmerten@googlemail.com>
+ * Copyright (c) 2008-2025 Seth J. Morabito <web@loomcom.com>
+ *                         Maik Merten <maikmerten@googlemail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2008-2025 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
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.loomcom.symon.ui;
+
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.LookAndFeel;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+import com.loomcom.symon.machines.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.formdev.flatlaf.FlatDarkLaf;
+import com.formdev.flatlaf.FlatLaf;
+import com.formdev.flatlaf.FlatLightLaf;
+import com.formdev.flatlaf.util.SystemInfo;
+import com.jthemedetecor.OsThemeDetector;
+
+import java.awt.*;
+import java.beans.PropertyChangeListener;
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+public final class Ui {
+    private final static Logger logger = LoggerFactory.getLogger(Ui.class.getName());
+
+    public static void initUi() throws UnsupportedLookAndFeelException {
+        // Location of properties resources for app-specific UI defaults:
+        FlatLaf.registerCustomDefaultsSource("com.loomcom.symon.themes");
+
+        logger.debug("AWT Toolkit class: {}", Toolkit.getDefaultToolkit().getClass().getName());
+
+        // Enable automatic scaling, based on system DPI settings:
+        //System.setProperty("sun.java2d.uiScale.enabled", "true");
+        //System.setProperty("sun.java2d.uiScale", "1x");
+        //System.setProperty("flatlaf.uiScale", "1x");
+
+        applyDetectedUiScale();
+
+        // OS-specific tweaking:
+
+        if (SystemInfo.isLinux) {
+            logger.debug("Adapting UI for Linux.");
+
+            // Enable custom window decorations:
+            JFrame.setDefaultLookAndFeelDecorated(true);
+            JDialog.setDefaultLookAndFeelDecorated(true);
+        }
+
+        else if (SystemInfo.isMacOS) {
+            logger.debug("Adapting UI for MacOS.");
+
+            // Move menu bar from JFrame window to top of screen:
+            System.setProperty("apple.laf.useScreenMenuBar", "true");
+            // Set name used in screen menu bar (first menu after Apple menu):
+            System.setProperty("apple.awt.application.name", "Symon");
+            // Use current macOS appearance (light/dark) for window title bars:
+            System.setProperty("apple.awt.application.appearance", "system");
+        }
+
+        else if (SystemInfo.isWindows) {
+            logger.debug("Adapting UI for Windows.");
+        }
+
+        UIManager.setLookAndFeel(createLookAndFeel());
+    }
+
+    public static Class<?> showMachineSelectionDialog() {
+        Object[] possibilities = { "Symon", "Multicomp", "Simple", "BenEater", "Mike42" };
+        String s = (String) JOptionPane.showInputDialog(
+                null,
+                "Please choose the machine type to be emulated:",
+                "Machine selection",
+                JOptionPane.PLAIN_MESSAGE,
+                null,
+                possibilities,
+                "Symon");
+
+        if (s != null && s.equals("Multicomp")) {
+            return MulticompMachine.class;
+        } else if (s != null && s.equals("Simple")) {
+            return SimpleMachine.class;
+        } else if (s != null && s.equals("BenEater")) {
+            return BenEaterMachine.class;
+        } else if (s != null && s.equals("Mike42")) {
+            return MichaelBillingtonMachine.class;
+        } else {
+            return SymonMachine.class;
+        }
+    }
+
+    private static LookAndFeel createLookAndFeel() {
+        final OsThemeDetector themeDetector = OsThemeDetector.getDetector();
+        final boolean systemThemeIsDark = themeDetector.isDark();
+
+        // Set light/dark mode depending on what can be detected from the system theme:
+        FlatLaf theme;
+        if (systemThemeIsDark) {
+            logger.debug("Using DARK theme.");
+            theme = new FlatDarkLaf();
+        } else {
+            logger.debug("Using LIGHT theme.");
+            theme = new FlatLightLaf();
+        }
+        return theme;
+    }
+
+    private static void applyDetectedUiScale() {
+        Double rawScale = null;
+
+        if (SystemInfo.isLinux) rawScale = X11ResourceReader.readXftDpiScale(); // ex: 1.5, 2.0, 2.5...
+
+        if (rawScale != null && rawScale > 1.0) {
+            // flatlaf.uiScale aceita frações — mantém a precisão original
+            System.setProperty("flatlaf.uiScale", rawScale + "x");
+
+            // sun.java2d.uiScale só aceita inteiros — arredonda para cima
+            int javaScale = (int) Math.ceil(rawScale);
+            //System.setProperty("sun.java2d.uiScale", String.valueOf(javaScale));
+
+            logger.debug("Detected scale {}x, applying flatlaf.uiScale={}x, sun.java2d.uiScale={}x",
+                    rawScale, rawScale, javaScale);
+        } else {
+            logger.debug("No X11 HiDPI scale detected, using default.");
+        }
+    }
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -64,12 +64,13 @@ public class VideoWindow extends JFrame implements DeviceChangeListener {
    private static final long WINDOW_REPAINT_INTERVAL = 66; // 30fps rate
    private static final int CHAR_WIDTH = 8;
    private static final int CHAR_HEIGHT = 8;
+    private static final String ASCII_ROM = "/ascii.rom";

    private final int scaleX, scaleY;
    private final boolean shouldScale;

    private BufferedImage image;
-    private int[] charRom;
+    private final int[] charRom;

    private int horizontalDisplayed;
    private int verticalDisplayed;
@@ -78,9 +79,9 @@ public class VideoWindow extends JFrame implements DeviceChangeListener {
    private boolean hideCursor;

    private Dimension dimensions;
-    private Crtc crtc;
+    private final Crtc crtc;

-    private ScheduledExecutorService scheduler;
+    private final ScheduledExecutorService scheduler;
    private ScheduledFuture<?> cursorBlinker;

    /**
@@ -123,12 +124,9 @@ public class VideoWindow extends JFrame implements DeviceChangeListener {
     */
    private class CursorBlinker implements Runnable {
        public void run() {
-            SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    if (cursorBlinkRate > 0) {
-                        hideCursor = !hideCursor;
-                    }
+            SwingUtilities.invokeLater(() -> {
+                if (cursorBlinkRate > 0) {
+                    hideCursor = !hideCursor;
                }
            });
        }
@@ -136,12 +134,9 @@ public class VideoWindow extends JFrame implements DeviceChangeListener {

    private class WindowPainter implements Runnable {
        public void run() {
-            SwingUtilities.invokeLater(new Runnable () {
-                @Override
-                public void run() {
-                    if (VideoWindow.this.isVisible()) {
-                        VideoWindow.this.repaint();
-                    }
+            SwingUtilities.invokeLater(() -> {
+                if (VideoWindow.this.isVisible()) {
+                    VideoWindow.this.repaint();
                }
            });
        }
@@ -152,7 +147,7 @@ public class VideoWindow extends JFrame implements DeviceChangeListener {

        this.scheduler = Executors.newSingleThreadScheduledExecutor();
        this.crtc = crtc;
-        this.charRom = loadCharRom("/ascii.rom");
+        this.charRom = loadCharRom();
        this.scaleX = scaleX;
        this.scaleY = scaleY;
        this.shouldScale = (scaleX > 1 || scaleY > 1);
@@ -292,14 +287,17 @@ public class VideoWindow extends JFrame implements DeviceChangeListener {
     * Since the BufferedImage is a TYPE_BYTE_BINARY, the data must be converted
     * into a single byte per pixel, 0 for black and 255 for white.

-     * @param resource The ROM file resource to load.
     * @return An array of glyphs, each ready for insertion.
-     * @throws IOException
+     * @throws IOException Failure to load character ROM.
     */
-    private int[] loadCharRom(String resource) throws IOException {
-        BufferedInputStream bis = null;
-        try {
-            bis = new BufferedInputStream(this.getClass().getResourceAsStream(resource));
+    private int[] loadCharRom() throws IOException {
+        var resource = this.getClass().getResourceAsStream(ASCII_ROM);
+
+        if (resource == null) {
+            throw new IOException("Resource " + ASCII_ROM + " not found");
+        }
+
+        try (BufferedInputStream bis = new BufferedInputStream(resource)) {
            ByteArrayOutputStream bos = new ByteArrayOutputStream();
            while (bis.available() > 0) {
                bos.write(bis.read());
@@ -314,7 +312,7 @@ public class VideoWindow extends JFrame implements DeviceChangeListener {
            int[] converted = new int[raw.length * CHAR_WIDTH];

            int romIndex = 0;
-            for (int i = 0; i < converted.length;) {
+            for (int i = 0; i < converted.length; ) {
                byte charRow = raw[romIndex++];

                for (int j = 7; j >= 0; j--) {
@@ -322,10 +320,6 @@ public class VideoWindow extends JFrame implements DeviceChangeListener {
                }
            }
            return converted;
-        } finally {
-            if (bis != null) {
-                bis.close();
-            }
        }
    }
 }
@@ -0,0 +1,54 @@
+package com.loomcom.symon.ui;
+
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.PointerByReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class X11ResourceReader {
+
+    private final static Logger logger = LoggerFactory.getLogger(X11ResourceReader.class.getName());
+
+
+    public interface X11 extends Library {
+        X11 INSTANCE = Native.load("X11", X11.class);
+
+        Pointer XOpenDisplay(String display);
+        Pointer XResourceManagerString(Pointer display);
+        void XCloseDisplay(Pointer display);
+    }
+
+    public static Double readXftDpiScale() {
+        Pointer display = null;
+        try {
+            display = X11.INSTANCE.XOpenDisplay(null);
+            if (display == null) {
+                return null; // não conseguimos ligar ao X server (ex: Wayland puro sem XWayland)
+            }
+
+            Pointer resourceString = X11.INSTANCE.XResourceManagerString(display);
+            if (resourceString == null) {
+                return null;
+            }
+
+            String resources = resourceString.getString(0);
+            for (String line : resources.split("\n")) {
+                if (line.startsWith("Xft.dpi:")) {
+                    int dpi = Integer.parseInt(line.split(":")[1].trim());
+                    return Math.round((dpi / 96.0) * 4) / 4.0;
+                }
+            }
+            return null;
+        } catch (UnsatisfiedLinkError | Exception e) {
+            logger.debug("Could not read X11 resource manager (libX11 unavailable?)", e);
+            return null;
+        } finally {
+            if (display != null) {
+                X11.INSTANCE.XCloseDisplay(display);
+            }
+        }
+    }
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -34,8 +34,8 @@ import java.util.Queue;
 */
 public class FifoRingBuffer<E> implements Iterable<E> {

-    private Queue<E> fifoBuffer;
-    private int maxLength;
+    private final Queue<E> fifoBuffer;
+    private final int maxLength;

    public FifoRingBuffer(int maxLength) {
        this.fifoBuffer = new LinkedList<>();
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Seth J. Morabito <web@loomcom.com>
+ * Copyright (c) 2008-2025 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
@@ -76,6 +76,16 @@ public class Utils {
                                           "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7",
                                           "F8", "F9", "FA", "FB", "FC", "FD", "FE", "FF"};

+    private static final String[] BIN_CONSTANTS = new String[256];
+
+    static {
+        for (int i = 0; i < 256; i++) {
+            String bin = Integer.toBinaryString(i);
+            // Left-pad to 8 digits with zeros
+            BIN_CONSTANTS[i] = "00000000".substring(bin.length()) + bin;
+        }
+    }
+
    /**
     * Very fast 8-bit int to ASCII conversion.
     *
@@ -116,4 +126,14 @@ public class Utils {
    public static int address(int lowByte, int hiByte) {
        return ((hiByte << 8) | lowByte) & 0xffff;
    }
+
+    /**
+     * Very fast 8-bit int to binary conversion, with zero-padded output.
+     *
+     * @param val The unsigned 8-bit value to convert to a zero padded binary string.
+     * @return Eight digit, zero padded binary string.
+     */
+    public static String byteToBin(int val) {
+        return BIN_CONSTANTS[val & 0xff];
+    }
 }
@@ -0,0 +1,3 @@
+# Loaded for FlatDarkLaf theme only.
+
+Colors.accent.default = #4B6EAF
@@ -0,0 +1 @@
+# Loaded for all FlatLaf themes.
@@ -0,0 +1,3 @@
+# Loaded for FlatLightLaf theme only.
+
+Colors.accent.default = #2675BF
@@ -670,4 +670,78 @@ public class CpuTest extends TestCase {
        cpu.step();
        assertEquals(0x3E, cpu.getAccumulator());
    }
+
+    // Have tests:
+    //    ACC, AIX, ABS, ABX, ABY, IMP, IMM, IND, XIN, INY,
+    //    REL, ZPG, ZPI
+
+    // Need to test:
+    //    ZPR, ZPX, ZPY, NUL
+
+    // Question: Should 'NUL' even exist? Isn't it just 'IMP'?
+
+    public void testDisassembleOpHandlesAccumulatorCorrectly() {
+        var dis = Cpu.disassembleOp(0x2a, new int[]{});
+        assertEquals("ROL", dis);
+    }
+
+    public void testDisassembleOpHandlesAbsoluteXIndexedIndirectCorrectly() {
+        var dis = Cpu.disassembleOp(0x7c, new int[]{0x00, 0x1a});
+        assertEquals("JMP ($1A00,X)", dis);
+    }
+
+    public void testDisassembleOpHandlesAbsoluteCorrectly() {
+        var dis = Cpu.disassembleOp(0x0d, new int[]{0x10, 0x0c});
+        assertEquals("ORA $0C10", dis);
+    }
+
+    public void testDisassembleOpHandlesAbsoluteXIndexedCorrectly() {
+        var dis = Cpu.disassembleOp(0x1d, new int[]{0x00, 0x1c});
+        assertEquals("ORA $1C00,X", dis);
+    }
+
+    public void testDisassembleOpHandlesAbsoluteYIndexedCorrectly() {
+        var dis = Cpu.disassembleOp(0x19, new int[]{0x00, 0x1c});
+        assertEquals("ORA $1C00,Y", dis);
+    }
+
+    public void testDisassembleOpHandlesImpliedCorrectly() {
+        var dis = Cpu.disassembleOp(0x00, new int[]{});
+        assertEquals("BRK", dis);
+    }
+
+    public void testDisassembleOpHandlesIndirectCorrectly() {
+        var dis = Cpu.disassembleOp(0x6c, new int[]{0x00, 0x1c});
+        assertEquals("JMP ($1C00)", dis);
+    }
+
+    public void testDisassembleOpHandlesImmediateCorrectly() {
+        var dis = Cpu.disassembleOp(0xA9, new int[]{0xff});
+        assertEquals("LDA #$FF", dis);
+    }
+
+    public void testDisassembleOpHandlesXIndexedIndirectCorrectly() {
+        var dis = Cpu.disassembleOp(0x01, new int[]{0x10});
+        assertEquals("ORA ($10,X)", dis);
+    }
+
+    public void testDisassembleOpHandlesIndirectYIndexedCorrectly() {
+        var dis = Cpu.disassembleOp(0x11, new int[]{0x10});
+        assertEquals("ORA ($10),Y", dis);
+    }
+
+    public void testDisassembleOpHandlesRelativeCorrectly() {
+        var dis = Cpu.disassembleOp(0x10, new int[]{0xff});
+        assertEquals("BPL $FF", dis);
+    }
+
+    public void testDisassembleOpHandlesZeroPageCorrectly() {
+        var dis = Cpu.disassembleOp(0x24, new int[]{0x10});
+        assertEquals("BIT $10", dis);
+    }
+
+    public void testDisassembleOpHandlesZeroPageIndirectCorrectly() throws Exception {
+        var dis = Cpu.disassembleOp(0xB2, new int[]{0x1a});
+        assertEquals("LDA ($1A)", dis);
+    }
 }
Author	SHA1	Message	Date
RuiFPB	3ee3a7e300	Add release action Build and Test / build (push) Successful in 1m5s Details Release / release (push) Successful in 1m6s Details	2026-09-29 13:44:53 +01:00
RuiFPB	b2810fa062	Add missing mike42 machine flag to run options Build and Test / build (push) Successful in 1m3s Details	2026-09-29 12:15:37 +01:00
RuiFPB	c9f9121477	Add install maven step (gitea actions Build and Test / build (push) Successful in 1m2s Details	2026-09-29 01:05:01 +01:00
RuiFPB	91ef70fe4e	Disable maven cache on jdk setup (gitea actions) Build and Test / build (push) Failing after 22s Details	2026-09-29 01:02:24 +01:00
RuiFPB	69bf418f43	Set container image to use to run the pipeline Build and Test / build (push) Canceled after 10m40s Details	2026-09-29 00:51:56 +01:00
RuiFPB	540f0dff58	Add gitea action build pipeline	2026-09-29 00:46:42 +01:00
RuiFPB	17668e2c3c	Only run X11 resource reader if on Linux	2026-09-28 10:24:02 +01:00
RuiFPB	3353b8436c	Implement UI for the VIA/PIA	2026-09-26 19:47:15 +01:00
RuiFPB	e635d0a608	Add binary converter to Utils	2026-09-26 19:46:54 +01:00
RuiFPB	558af36cd5	Start implementation of the VIA6522 Only PA and PB implemented, not tested	2026-09-26 19:14:20 +01:00
RuiFPB	5fa6fa0fc0	Clean up imports on the Mike42 machine	2026-09-26 19:13:24 +01:00
RuiFPB	f152ed9df5	Fix scaling issues on Linux	2026-09-25 00:38:28 +01:00
RuiFPB	87217afa6e	Add Mike42 Machine Type	2026-09-25 00:37:52 +01:00
Retrograde	b9997e3edc	Use HTTPS instead of HTTP in Schema referencs in the Maven POM file. (#25 ) Use HTTPS instead of HTTP in Schema referencs in the Maven POM file. This fixes cvc-elt.1.a: Cannot find the declaration of element 'project'. errors when building fx from VS.code. Reviewed-on: https://codeberg.org/sethm/symon/pulls/25 Reviewed-by: Seth Morabito <sethm@noreply.codeberg.org>	2026-06-25 00:08:22 +02:00
Retrograde	45c8a69d7b	FlatLaf look-and-feel with better Dark mode support. (#23 ) This PR configures Symon to use the FlatLaf Swing look-and-feel, giving both a slightly more modern look but also much better support for Dark/Light UI modes. Additional small tweaks to make the UI more readable in both Dark/Light modes. Detection of system theme also added, selecting the Dark/Light FlatLaf variant accordingly. Gets rid of need for the hardcoded Metal UI for text fields in StatusPanel workaround as well, as FlatLaf renders these small fields correctly. Reviewed-on: https://codeberg.org/sethm/symon/pulls/23 Reviewed-by: Seth Morabito <sethm@noreply.codeberg.org>	2026-06-24 23:13:23 +02:00
Retrograde	2e2163fefb	Added handling of -h/--help CLI option, to print out available options. (#22 ) Small CLI improvement: adding a -h / --help switch, to be able to get a printout of the available options. Reviewed-on: https://codeberg.org/sethm/symon/pulls/22 Reviewed-by: Seth Morabito <sethm@noreply.codeberg.org>	2026-06-24 20:45:51 +02:00
Seth Morabito	995b372f55	Update README with Codeberg links	2026-03-25 13:16:52 -07:00
Seth Morabito	47c87aac56	Update README for high-dpi	2025-04-13 11:38:33 -07:00
Seth Morabito	3a59dedc29	Update README and pom.xml for release 1.5.0	2025-03-30 15:28:32 -07:00
Seth Morabito	7268766cd6	Implement Step-Over functionality This change adds a new "Step Over" button, which is enabled when a "JSR" (Jump to Subroutine) instruction is encountered while stepping through execution one instruction at a time. Pressing "Step Over" will continue running instructions until a corresponding "RTS" (Return from Subroutine) is encountered. While stepping over a subroutine, the call stack depth is tracked in an attempt to halt only when the correct RTS is encountered. In other words, it should skip over other subroutines nested inside the call you want to step over: ``` JSR A # Step over here... ... JSR B ... RTS # Returns from 'B', doesn't halt ... RTS # Returns from 'A', halts after return ``` Implements feature request #18.	2025-03-30 15:18:00 -07:00
Seth Morabito	2284535b7f	Fix #17 : Correct disassembly	2025-03-15 15:46:50 -07:00
Seth Morabito	963526621d	Maven build update - Bump to version 1.5.0-dev - Update dependencies - Fix broken Symon homepage URL - Fix maven xsd URL	2025-02-13 16:36:50 -08:00
Seth Morabito	c317544e7b	Address IntelliJ warnings This commit addresses a large number of IntelliJ warnings that have been left hanging around for far too long.	2025-02-13 16:05:42 -08:00
Seth Morabito	ecd4bbbd9a	README formatting fix	2023-11-18 10:50:07 -08:00
Seth Morabito	a537328852	Minor README update	2023-11-18 10:46:55 -08:00
Seth Morabito	4975fca506	Missed a README update for v1.4.0	2023-11-11 08:20:49 -08:00