diff --git a/LICENSE b/LICENSE index 3022cd8..a627761 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,26 @@ -The code in the methods r6502::instructions::ADC and r6502::instructions::SDC +Copyright 2024 Joseph R. Pollack + +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. + +----------------------------- + +The code in the methods r6502::instructions::ADC and r6502::instructions::SDC in the file src\r6502\instructions.rs is adapted from code written by javidx9 (David Barr) and is subject to the following license: License (OLC-3) diff --git a/README.md b/README.md new file mode 100644 index 0000000..5128b3d --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +# RE6502 + +RE6502 is an emulator for the 6502 cpu written in rust. The project comes with a very basic virtual machine for testing (it just has simple I/O functionality) as well as some test programs (find these in simple_test_machine/programs). The test programs can be built with the win2c64 (or lin2c64, or mac2c64) assembler which can be found here: https://www.aartbik.com/retro.php. Theoretically any 6502 assembler should work but win2c64 is the one I've been using for testing. + +# Building diff --git a/simple_test_machine/README.md b/simple_test_machine/README.md new file mode 100644 index 0000000..d2f8168 --- /dev/null +++ b/simple_test_machine/README.md @@ -0,0 +1,8 @@ + +# The Simple Test Machine + + +# Running the Simple Test Machine + + +# Assembling Programs for the Simple Test Machine \ No newline at end of file diff --git a/todo/todo.todo b/todo/todo.todo index 7d01d65..ad4d56b 100644 --- a/todo/todo.todo +++ b/todo/todo.todo @@ -11,7 +11,8 @@ General: ☐ Debug data lookup for instructions Test Machine: - ☐ Implement basic input + ✔ Refactor the OutputConsole and InputConsole into a single Console struct @done(24-07-03 18:39) + ✔ Implement basic input @done(24-07-03 18:39) ✔ Hello world program @done(24-01-19 17:09) ✔ Load and run a given program binary @done(24-01-22 17:08)