1
0
mirror of https://github.com/sethm/symon.git synced 2024-06-15 08:29:27 +00:00
Commit Graph

192 Commits

Author SHA1 Message Date
Seth Morabito
40c5397ed8 Faster refresh of memory window 2014-07-06 12:17:39 -07:00
Seth Morabito
1bc8eda38d ACIA interrupt handling 2014-01-26 01:25:12 -08:00
Seth Morabito
76dcbd712a IRQ and NMI handling at CPU level. 2014-01-25 20:45:39 -08:00
Seth Morabito
b6cc480919 Add NMI flag to CPU 2014-01-25 20:02:17 -08:00
Seth Morabito
0c5035fc56 Add interrupt flag to CPU 2014-01-25 19:53:53 -08:00
Seth Morabito
4a510b635e README updates, CRTC tests.
- Added more CRTC information to the README file.
- Added unit tests for the CRTC.
- Implemented register read for cursor position in the CRTC.
- Bundling a new version of jterminal that has correct backspace
  behavior.
2013-12-29 18:18:48 -08:00
Seth Morabito
070e9db813 Merge branch 'master' into crtc
Conflicts:
	src/main/java/com/loomcom/symon/Simulator.java
	src/main/java/com/loomcom/symon/devices/Device.java
	src/main/java/com/loomcom/symon/devices/Memory.java
2013-12-28 23:35:22 -08:00
Seth Morabito
3c68c63995 Additional refactoring 2013-12-28 23:14:21 -08:00
Seth Morabito
6dde766f5a Refactor of CRTC 2013-12-28 19:55:26 -08:00
Seth Morabito
e7e3c77e3f First pass at Video window 2013-12-27 21:40:28 -08:00
Max840
bc6b93e3fe Optimization of Bus.isComplete() 2013-12-26 17:25:52 -05:00
Max840
d8deca227f Create Device.size() 2013-12-24 15:35:56 -05:00
Max840
1c9c742477 Unit test updated with devices' start/end address 2013-12-23 23:38:38 -05:00
Max840
d1a05aeb2b Devices use start/end address 2013-12-23 23:31:51 -05:00
Seth Morabito
a5af522c5c Force no grid on memory window 2013-03-30 22:27:33 -07:00
Seth Morabito
6a50476bfe Step Count and Memory Window enhancements
Introduces several changes requested by Mario Keller. The simulator now has a variable step count that can be selected by a drop-down box on the main window. This change also displays ASCII characters in the Memory window.
2013-03-30 21:28:52 -07:00
Jay Sissom
429fec97b2 Fix disassembled opcode display on trace log for zero page,X and zero page,Y addressing modes. 2013-03-04 22:10:25 -05:00
Seth Morabito
4ccb7bec97 Tooltip Text and Minor Enhancements
- Added tooltip text to status panel.
- Memory is no longer cleared on reset.
- Console can now receive key-strokes even while the simulator is
  stopped (for single-stepping programs that require interaction)
- Updated screenshots with bug-fixed version.
2013-01-12 11:41:32 -08:00
Seth Morabito
34fb8940ae Fix swapped labels on status pane
The labels for the X and Y registers were swapped on the status pane.
How embarrassing!
2013-01-05 14:26:16 -08:00
Seth Morabito
da8250778e Bug Fixes and Copyright Date Change
The simulator now passes Klaus Dormann's 6502 Functional Test suite for
the first time.

Bug Fixes:

- PHP was not correctly setting the Break bit on the stack copy of the
  processor status, so subsequent PLA's would not set the Break status
  flag.

- The CPU had swapped NMI and IRQ reset vectors, so RTI was failing.

- BRK was pushing PC + 2 onto the stack, instead of PC + 1

- (Zero Page,X) addressing mode did not correctly wrap on zero page
  boundaries.

- The instruction table used for disassembly had addressing modes
  of LDA $B9 and $BD reversed. This did not affect behavior, only
  disassembly of these instructions.

Other:

- Updated copyright date for 2013.

- Started migrating old JUnit 3 style tests to JUnit 4 annotations.
2013-01-01 17:03:16 -08:00
Seth Morabito
61b342ff01 Readme Update and Memory Window Look-and-Feel 2012-12-30 23:01:33 -08:00
Seth Morabito
3636e78435 Cleanup and Bug Fixes
- Fixed a bug that left View menu items checked after the associated
  windows closed.

- Cleaned up UI init code for several components.
2012-12-30 12:14:30 -08:00
Seth Morabito
933b09827a Cleanup and Javadoc 2012-12-30 11:27:10 -08:00
Seth Morabito
3d620711a9 Fixing imports. 2012-12-29 22:53:01 -08:00
Seth Morabito
f7c5c3b763 Memory Window, Minor Bugfixes
Adds a new view that displays a single page of memory (user selectable)
and allows direct editing of memory contents.

Also fixes several minor bugs, including one that prevented the status
pane from updating after each manual step.
2012-12-29 22:47:23 -08:00
Seth Morabito
0215e2e3d8 Cleaner simulator startup and run-loop exiting
- If a default ROM image ("rom.bin") isn't available at startup, the
  simulator will now create and load a 16KB R/W memory at the ROM
  location, so resets will work even without a ROM loaded.

- Cleaned up the way simulator UI state is updated when the run loop
  exits.
2012-12-10 21:53:01 -08:00
Seth Morabito
f70ce22259 Trace Log View menu item
Makes the "Trace Log" menu item in the "View Menu" a radio button menu
item, so it is checked / unchecked appropriately.
2012-12-09 21:15:19 -08:00
Seth Morabito
807a43ce6f Faster byte and word to hex string
I was alarmed to discover just how slow `String.format()` is for doing
integer to hex conversions. Now that a trace window has been added to
Symon, it became especially clear that I needed a more efficient way to
handle it.

I looked into using `Integer.toHexString()`, but I would have had to
wrap it to do zero-padding, so I decided to just bite the bullet and do
my own with a lookup table. The implementation in `HexUtil` is just as
fast as `Integer.toHexString()`, but also zero-pads appropriately.
Combined with Java's `+` String concatenation, it seems perfectly
adequate.

For yet better performance with the trace window, it would make a lot of
sense to special-case stepping so that it just pops the top line off the
log, and appends to the bottom, rather than re-stringifying the entire
trace log each time. This will be a future enhancement.
2012-12-09 21:02:11 -08:00
Seth Morabito
bc3de80892 Execution Trace Log
Introduces an execution trace window that will keep track of the most
recent 10000 execution steps. I'm not entirely happy with the
implementation, yet.
2012-12-09 17:04:31 -08:00
Seth Morabito
38a4458aff New UI layout, ROM loading, Font selection
- The UI layout has changed, and will likely change again in the future.

- Symon can now re-load ROM images from the File menu, under "Load ROM..."

- Font size can be changed under the "View" menu
2012-12-05 23:19:34 -08:00
Seth Morabito
a7d9239ef1 Keep a reference to the ROM memory image after load 2012-11-25 23:08:09 -08:00
Seth Morabito
2ebdd254b3 Work In Progress: CPU behavior, UI changes
This is something of a "Work in Progress" checkpoint of several features
that are all half baked:

1. Allow loading of 16KB ROM files at address $C000 at run-time, not
   just at startup. See the "Load ROM..." File menu item.

2. Introduces the notion of "CPU Behaviors", so the core 6502 CPU
   implementation can match the behavior of either an early NMOS 6502, late
   NMOS 6502, or CMOS 65C02. Very little of this is actually implemented so
   far.

3. Adds a completely bogus implementation of the 6522 VIA (it
   does absolutely nothing right now).

4. Changes the address of the ACIA in the simulated system to match a
   real hardware implementation I put together.
2012-11-25 22:49:21 -08:00
Seth Morabito
795ccfde5d CPU bug fixes and Simulator enhancements.
Bug Fixes:

- Fixed several bugs in the CPU that caused processor status flags to
  be set incorrectly.  Instructions affected were: STA, STX, STY, CMP,
  CPX, CPY, BIT.

- Made some internal-use-only methods on the CPU class private.

- Fixed incorrect disassembly of (Indirect,X) and (Indirect),Y
  instructions. Although this didn't affect behavior, it certainly
  caused me some confusion in debugging.

- Added missing "BCS" instruction to instruction table.

Enhancements:

- Now includes a full version of Lee Davison's Enhanced 6502 BASIC
  bundled as source code and a ROM image. Get that REAL COMPUTER
  EXPERIENCE!(tm)

- If a file named "rom.bin" exists in the same directory where the
  simulator is executed, it will be loaded at addresses $d000-$ffff.

- Gave the CPU an idle loop to make simulated timing a little more
  realistic (but this is still an area needing major improvement)

- Changed the CPU's toString() method to give better debugging output.

- Added a small typeahead buffer to the Console.

- Better exception messaging.

Misc:

- Bumped version to 0.5, updated README.
2012-10-21 20:05:05 -07:00
Seth Morabito
c1caf8c6b4 Timing and UI enhancements.
This change introduces simulated baud rates in the ACIA. Baud rate is controlled just as in the real 6551, by writing to the ACIA's control register. Baud rates between 50 and 19,200 baud are selectable. A baud rate of 0 has special meaning, and turns off all simulated baud rate delays (on a real 6551, this means to use an external clock instead of the internal baud rate generator)

A busy-wait loop between steps in the simulator control program has also been added. This uses the high-resolution 'System.nanoTime()' call to wait a specific number of nanoseconds before continuing. Symon now waits at least 1uS between clock cycles, trying to approach a real 1MHz 6502 in performance. It is far from perfect, but it's better than it was.

 Also refactored the status panel to use a BoxLayout, and DRY-up some of the code.
2012-10-14 17:56:19 -07:00
Seth Morabito
c214cc9b43 Fixes and enhancements.
- Added ability to change inner border width of console window.
- Fixed a nasty bug that prevented key press handling.
- Reset now clears the accumulator and index registers.
2012-10-14 00:25:03 -07:00
Seth Morabito
e012d97bb3 Added clarifying curly braces. 2012-10-12 14:34:18 -07:00
Seth Morabito
365809459c Finally handling key presses in the console! (Took long enough, huh?) Added a dead simple console echo example program in 6502 assembly, as well. 2012-10-11 16:08:04 -07:00
Seth Morabito
ed36690e9e Checkpoint of my Swing UI refactoring. Usable for output-only programs, but only barely. 2012-05-28 22:18:35 -07:00
Seth Morabito
a1d07bf223 First work toward moving to a Swing UI for the simulator. 2012-04-22 20:49:18 -07:00
Seth J. Morabito
00ab8cd9ff Simulator is just about ready for real-world testing now. Added a simulated
MOS6551 ACIA at address $C000 which does buffered input and output via the
console. Updated the README with a bit more documentation, and bumped the
version number to 0.1 because I'm impatient.
2010-01-20 18:19:39 -08:00
Seth Morabito
596d05e398 Clearer help output (I hope). Fixed an off-by-one bug in doLoad. 2010-01-17 21:12:24 -08:00
Seth J. Morabito
3d4500cbff Removed Profiler. It may return in a future release. 2010-01-16 22:22:24 -08:00
Seth Morabito
e157f4a972 More cleanup of the monitor. Added binary file load command. 2010-01-16 21:17:37 -08:00
sethm
a3e57274a2 - Major overhaul of the Simulator control class (where 'main' lives).
- Removed the CommandParser class entirely, as the weird dependency between
  Simulator and CommandParser never made me comfortable.
- Added a Command inner class to Simulator that handles some of the
  command line tokenizing.
2010-01-16 19:22:22 -08:00
Seth Morabito
5c7a98df86 Playing around with the command parser and the Simulator class. Safe to ignore. 2010-01-16 08:56:34 +00:00
Seth Morabito
f174f0312f * Correct implementation of Indirect Indexed and Indexed Indirect addressing modes.
* Unit tests for Indirect Indexed and Indexed Indirect.
* Updated copyright dates.
* Started moving to JUnit 4.
2010-01-15 08:20:03 +00:00
Seth Morabito
d858a50f1b - Updated Cobertura Maven plugin to version 2.3 (threadsafe)
- Finished refactor of instruction argument address decoding.
  Much DRYer now (but could still be DRYer yet).
2010-01-10 02:28:55 -08:00
sethm
4104d6212e Added Indirect X Mode Tests 2010-01-10 01:18:45 -08:00
Seth J. Morabito
ac88786df7 - Continued refactoring of address decoding.
- Device read and write may now throw MemoryAccessException, and appropriate
  throws clauses have been added throughout the code.
2010-01-09 16:53:04 -08:00
Seth Morabito
a01090a16e Part-way through the Great Refactoring of Instruction Decoding(tm) 2010-01-09 19:51:56 +00:00
Seth Morabito
ed943687bf Implemented Relative mode (branch) instructions and unit tests. Fixed
a bug in the instruction size table.
2009-01-07 18:26:11 -08:00
Seth Morabito
f21a0d76e9 Implemented Absolute,Y addressing mode and unit tests. 2009-01-07 16:50:36 -08:00
Seth Morabito
dccf73a6b7 Implemented instructions using the Absolute,X addressing mode. There's
light at the end of the tunnel now!
2008-12-29 21:47:19 -08:00
Seth Morabito
107aca7777 Implemented Zero Page,X, Zero Page,Y, and Indirect addressing mode instructions, along with unit tests. 2008-12-29 20:46:48 -08:00
Seth Morabito
4b28ab4808 Implemented Absolute addressing mode instructions. All unit tests pass. 2008-12-28 23:11:16 -08:00
Seth J. Morabito
24458da79e Implemented Accumulator mode instructions. Grouped all unimplemented (65C02 and 65816 only) instructions together in a single fall-through area of the instruction decoding switch statement. Added an unimpelmented instruction trap member variable. 2008-12-28 17:55:02 -08:00
Seth J. Morabito
c93a03d4f4 Improved README. Fixed typo in InstructionTable.java 2008-12-27 21:46:13 -08:00
Seth J. Morabito
8bcd8a4a75 Whitespace and indentation canonicalization. That's what I get for using two editors. 2008-12-27 21:09:47 -08:00
Seth J. Morabito
d54ad18b17 All zero page instructions implemented. Tests passing. 2008-12-27 20:59:10 -08:00
Seth J. Morabito
ecde55c6b8 Started on Zero Page opcodes and tests. 2008-12-27 13:01:07 -08:00
Seth J. Morabito
de0742f59f Started skeleton of Zero Page tests. 2008-12-27 09:59:49 -08:00
Seth J. Morabito
7766e76362 BCD is finally working. I thought that would never happen.
All Immediate Mode and Implied Mode opcodes have been implemented.  Next up, zero page!
2008-12-27 01:43:07 -08:00
Seth J. Morabito
06ed74e89c Fixed the BRK instruction. Added SBC and ADC in Binary Coded Decimal
mode.  More unit tests.
2008-12-26 02:13:11 -08:00
Seth J. Morabito
b46c4e1bec Finished implementing all implied mode instructions, with tests. 2008-12-23 16:36:09 -08:00
Seth J. Morabito
f012ba7775 More implied mode instructions implemented, with tests. 2008-12-23 16:06:09 -08:00
Seth J. Morabito
473b47e832 At long last, implemented BRK. Lots more unit tests for stack processing, as well. 2008-12-23 02:21:27 -08:00
Seth J. Morabito
46a5943736 Implemented set/clear flag instructions. More tests, but SBC is still BROKEN. 2008-12-20 02:00:45 -08:00
Seth J. Morabito
088b0823e1 More unit tests. SBC partially working, but I need to figure out what's going wrong. 2008-12-15 02:26:13 -08:00
Seth J. Morabito
1bd59b048b Some API changes, lots of test changes. 2008-12-14 23:43:04 -08:00
Seth J. Morabito
6443cacdb9 Implemented ADC 2008-12-14 01:54:53 -08:00
sethm
1c6c5fdaeb Implemented boolean immediate mode instructions. 2008-12-14 01:09:23 -08:00
Seth Morabito
3f74489757 Renamed project to "Symon". 2008-12-13 14:59:22 -08:00
Seth Morabito
9a6a256073 1. CPU now correctly sets Zero and Negative flags for LDA, LDX, and LDY
immediate mode instructions.

2. Added unit tests for LDA, LDX, LDY immediate mode instructions.
2008-12-13 01:53:15 -08:00
sethm
59e5572039 Process Status Register bits have been added. 2008-12-13 00:50:14 -08:00
Seth Morabito
7e36444193 Added stack functions. 2008-12-12 01:02:31 -08:00
Seth Morabito
6915331cca Added LDX, LDY immediate. 2008-12-12 00:45:55 -08:00
sethm
fb3db6b65f Our first test program is running! 2008-12-12 00:37:54 -08:00
sethm
7ccde7dc1b Reformatting 2008-12-11 21:47:41 -08:00
Seth Morabito
d18c1c7f82 Instruction Table interface. 2008-12-11 19:33:44 -08:00
Seth Morabito
8df561d292 Changed the CPU and Device interface a bit. 2008-12-11 17:22:39 -08:00
Seth J. Morabito
a54dbc323d Profiling. Made a new directory for exceptions. 2008-12-11 16:38:39 -08:00
Seth Morabito
6f678af3df Renamed AddressDecoder to Bus 2008-12-11 11:41:05 -08:00
Seth J. Morabito
0e212e71e5 Tests for AddressDecoder. Fixed a bug in isComplete(). 2008-12-10 19:57:38 -08:00
Seth Morabito
af7743b385 Much saner implementation of 'overlaps' method. 2008-12-08 22:12:28 -08:00
Seth J. Morabito
5bbd72d44e Unit testing. MemoryRange work. 2008-12-08 20:40:27 -08:00
Seth J. Morabito
061eeba85c There is already an existing project (albeit defunct) named j6502. Name changed to lm6502. 2008-12-08 14:28:44 -08:00
Seth J. Morabito
316d0feac6 Standardized tabs, indent, and whitespace. Finally! 2008-12-08 14:03:23 -08:00
Seth Morabito
e3300d3166 Lots of whitespace changes after importing the project into Eclipse 2008-12-06 14:39:54 -08:00
Seth Morabito
a6abc2cd23 Fleshing out some of the interface for the CPU, Simulator, and Devices. 2008-12-05 20:00:48 -08:00
Seth J. Morabito
0163ae47b4 Nicer prompt 2008-12-05 18:09:32 -08:00
Seth J. Morabito
a74322459a Command Parser. 2008-12-05 18:03:00 -08:00
Seth J. Morabito
7f31c4c950 Initial project creation 2008-12-05 16:44:33 -08:00