1
0
mirror of https://github.com/mre/mos6502.git synced 2024-11-25 02:33:26 +00:00
Commit Graph

264 Commits

Author SHA1 Message Date
Andrew Keeton
a80c98b000 Merge pull request #26 from amw-zero/ark-beq
Implement BEQ instruction
2014-11-06 19:51:54 -05:00
Andrew Keeton
a0ad2d47be Add BEQ to execute_instruction(). 2014-11-06 19:50:35 -05:00
Andrew Keeton
8febc74788 Add branch_if_equal(). 2014-11-06 19:49:54 -05:00
Andrew Keeton
c9ed9e1720 Add branch_if_equal_test(). 2014-11-06 19:48:48 -05:00
Andrew Keeton
d42922a788 Merge pull request #25 from amw-zero/ark-bcs
Implement BCS instruction
2014-11-06 19:42:42 -05:00
Andrew Keeton
59168cbbe4 Add BCS to execute_instruction(). 2014-11-06 19:42:08 -05:00
Andrew Keeton
da6a28f639 Add branch_if_carry_set(). 2014-11-06 19:39:46 -05:00
Andrew Keeton
eb5c3f3c2a Add branch_if_carry_set_test(). 2014-11-06 19:38:56 -05:00
Andrew Keeton
8c0e4949a9 Merge pull request #24 from amw-zero/ark-bcc
Implement BCC instruction
2014-11-06 19:35:50 -05:00
Andrew Keeton
7a4515b375 Add BCC to execute_instruction. 2014-11-06 19:35:07 -05:00
Andrew Keeton
be7539d6c9 Add branch_if_carry_clear(). 2014-11-06 19:32:15 -05:00
Andrew Keeton
ecb3f07459 Add branch_if_carry_clear_test(). 2014-11-06 19:30:05 -05:00
Andrew Keeton
690907f1c4 Merge pull request #23 from amw-zero/ark-and
Implement AND instruction
2014-11-06 19:19:35 -05:00
Andrew Keeton
c9f59dca60 Add AND to execute_instruction. 2014-11-06 19:17:38 -05:00
Andrew Keeton
198ddc3131 Fix and_test(). 2014-11-06 19:13:42 -05:00
Andrew Keeton
413d063f82 Add and(). 2014-11-06 19:07:54 -05:00
Andrew Keeton
5e0d151f12 Add and_test(). 2014-11-06 18:58:09 -05:00
Johannes Muenzel
6807b78a83 Merge pull request #22 from typelist/master
Implement ASL, PHA, PHP, PLA, PLP, ROL, ROR
2014-11-02 21:59:07 -05:00
Johannes Muenzel
99abf0aa53 Implement rest of shifts/rotates, and push/pull for accumulator and flags 2014-11-02 21:56:02 -05:00
Johannes Muenzel
40fe0a2ad4 Merge pull request #21 from typelist/master
Implement LSR, INC, INX, INY
2014-11-02 15:45:23 -05:00
Johannes Muenzel
b7e4125fcd Implement LSR, INC, INX, INY 2014-11-02 15:40:34 -05:00
Johannes Muenzel
fe9610e3d8 Merge pull request #20 from typelist/master
Implement SBC (subtract-with-carry) and flag instructions CLC, CLD, CLI, CLV, SEC, SED, SEI
2014-11-02 14:27:45 -05:00
Johannes Muenzel
8545ea5597 Implement subtract-with-carry and flag setting and clearing instructions 2014-11-02 14:23:38 -05:00
Johannes Muenzel
06a0367fd6 Merge pull request #19 from typelist/master
Implement bit test instruction BIT
2014-10-25 19:44:55 -04:00
Johannes Muenzel
32b1fa5f4b implement BIT 2014-10-25 19:39:36 -04:00
Johannes Muenzel
acc31f9858 Merge pull request #18 from typelist/master
Implement transfer instructions TAX+TXA, TAY+TYA, TSX+TXS
2014-10-25 19:11:45 -04:00
Johannes Muenzel
a5534ac375 Implement transfer instructions. 2014-10-25 19:04:52 -04:00
Johannes Muenzel
5f20fb7442 Use debug! macro 2014-10-25 18:42:48 -04:00
Johannes Muenzel
ec960dba40 Remove unneeded 'pub' directives 2014-10-25 18:40:20 -04:00
Johannes Muenzel
4f3e6eaba5 Merge pull request #17 from typelist/master
Implement store instructions STA, STX, STY
2014-10-25 18:36:56 -04:00
Johannes Muenzel
20abdc9ff6 Implement store instructions STA, STX, STY 2014-10-25 18:30:05 -04:00
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