1
0
mirror of https://github.com/mre/mos6502.git synced 2024-11-28 07:49:19 +00:00
Commit Graph

83 Commits

Author SHA1 Message Date
Johannes Muenzel
36843cce70 Merge pull request #16 from typelist/jam-bmi
Implement the BMI instruction
2014-10-25 17:19:09 -04:00
Johannes Muenzel
85aa092944 Merge remote-tracking branch 'alex/ark-bmi' into jam-bmi
Conflicts:
	src/machine.rs
2014-10-25 17:13:40 -04:00
Johannes Muenzel
69371da03b Merge pull request #14 from amw-zero/ark-dec
Implement the DEC instruction
2014-10-25 17:07:11 -04:00
Johannes Muenzel
067fb9b646 Merge pull request #15 from amw-zero/ark-jmp
Implement the JMP instruction
2014-10-25 17:06:53 -04:00
Andrew Keeton
1c1353127a Implement JMP instruction. 2014-10-19 21:37:43 -04:00
Andrew Keeton
2a78062b12 Implement the DEC instruction. 2014-10-19 21:20:19 -04:00
Andrew Keeton
6d7388c779 Merge pull request #11 from amw-zero/decrement-x
DEX instruction
2014-10-19 20:45:43 -04:00
Andrew Keeton
f113890bf5 Merge pull request #12 from amw-zero/ark-i32-address
Change implementation of AddressDiff from u16 to i32
2014-10-16 22:17:58 -04:00
Andrew Keeton
2f25c490da Fix build. 2014-10-16 22:12:43 -04:00
Andrew Keeton
96f5f15d82 Fix build. 2014-10-16 22:11:17 -04:00
Andrew Keeton
8759b15d9e branch_fi_minus_test() passes. 2014-10-16 22:11:17 -04:00
Andrew Keeton
d70915ad0f Compile tests. 2014-10-16 22:11:16 -04:00
Andrew Keeton
71d15f9d08 Add BMI implementation. Untested 2014-10-16 22:11:16 -04:00
Andrew Keeton
6941a29352 Fix build. 2014-10-16 22:06:30 -04:00
Andrew Keeton
bc1687c247 Make Address take i32 so relative addresses work. 2014-10-16 21:24:18 -04:00
Alex Weisberger
446c5ca3af Remove duplicate test from weird merge pull idk 2014-10-16 20:18:03 -04:00
Alex Weisberger
4fa49d4899 pull in the remote version of decrement-x branch? So I can push to it? I have no idea what I'm doing 2014-10-16 20:09:37 -04:00
Alex Weisberger
dd1d52ae24 Rebase onto master to pick up compiler errors and use load_x_register to simplify impl of dec_x. Because load_x_register sets the zero and negative status flags already 2014-10-16 20:05:41 -04:00
Alex Weisberger
8fd38026aa beef up test 2014-10-16 19:54:31 -04:00
Alex Weisberger
d132f040f2 DEX instruction and test 2014-10-16 19:54:31 -04:00
Alex Weisberger
34cd5edd44 compiler fixes, static -> const 2014-10-16 18:50:45 -04:00
Johannes Muenzel
a8b8fa12d4 Merge pull request #10 from amw-zero/bitflag_warnings
Remove numerous warnings from bitflags! expanding to non-uppercase static constants.
2014-10-08 22:22:07 -04:00
Alex Weisberger
6321266179 Remove numerous warnings from bitflags! expanding to non-uppercase static constants. 2014-10-08 00:07:43 -04:00
Alex Weisberger
702129ddeb beef up test 2014-10-07 23:56:27 -04:00
Alex Weisberger
52280a9646 DEX instruction and test 2014-10-07 23:52:38 -04:00
Alex Weisberger
db3ae89745 add org files 2014-10-07 23:51:30 -04:00
Johannes Muenzel
70db1564a4 Change g_opcodes to OPCODES (style warning) 2014-10-07 00:07:09 -04:00
amw-zero
48b0c90c43 Merge pull request #9 from typelist/big-old-table
Orthogonal AddressingMode handling; implement all addressing modes for ADC, LDA, LDX, LDY
2014-10-06 17:48:23 -04:00
Johannes Muenzel
7556071edb Use log! macro instead of println! so we have the option of running without noise 2014-10-04 17:47:32 -04:00
Johannes Muenzel
dae32caada Some cleanup. Enable experimental 'if let' Rust language feature 2014-10-04 16:47:42 -04:00
Johannes Muenzel
7adc2bbcb4 Use a table to look up the meaning of opcodes. Use common code for addressing modes. 2014-10-04 16:33:42 -04:00
amw-zero
b0ff12ac33 Merge pull request #7 from amw-zero/controller2
Controller2
2014-10-02 17:38:06 -04:00
Alex Weisberger
59132d0d8d Formatting 2014-10-01 18:43:57 -04:00
Alex Weisberger
9940517c3b program 2 adc instructions 2014-10-01 18:42:52 -04:00
Alex Weisberger
3563f6362c get immediate operand when opcode is ADC Immediate 2014-10-01 18:40:58 -04:00
Alex Weisberger
3e2fecec8f properly inc PC 2014-10-01 18:38:07 -04:00
Alex Weisberger
f590b2d90c program loading 2014-10-01 18:19:28 -04:00
Alex Weisberger
f2a47f4b00 Show impl for machine 2014-10-01 18:07:57 -04:00
Alex Weisberger
be65550525 fetch, decode, execute loop 2014-10-01 18:02:45 -04:00
amw-zero
54fd9aa72f Merge pull request #6 from amw-zero/test-pr-branch
Update work for me in notes
2014-10-01 17:41:46 -04:00
Alex Weisberger
aefdfe3f0f Update work for me in notes 2014-10-01 17:40:20 -04:00
amw-zero
b1f219c03b Merge pull request #5 from typelist/foo2
Amend folder structure and Cargo.toml; add bitflags! implementation of registers::Status
2014-10-01 17:32:43 -04:00
Johannes Muenzel
12f9b21bd0 Move files around to match the usual structure more 2014-10-01 00:17:33 -04:00
amw-zero
d201bb4b61 Merge pull request #4 from akeeton/merge-jm
Merge Johannes' changes into mine
2014-09-30 15:54:36 -04:00
Andrew Keeton
2675725a3d Remove Cargo.toml. 2014-09-28 21:15:25 -04:00
Andrew Keeton
97fa21380f Remove src directory. 2014-09-28 21:13:02 -04:00
Andrew Keeton
87262b0dca Integrate Instruction. 2014-09-28 21:12:06 -04:00
Andrew Keeton
53fce602b3 Integrate AddressingMode. 2014-09-28 21:07:13 -04:00
Andrew Keeton
203bfa6244 Integrate IRQ. 2014-09-28 21:06:12 -04:00
Andrew Keeton
f7cf02fb9e Integrate AddressDiff. 2014-09-28 20:59:09 -04:00