Apple-2-SW
/
Applerm-II
mirror of https://github.com/toyoshim/Applerm-II.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bug fix: op7e ROR did not store result 

- also fp should be saved as 32bit register
This commit is contained in:
Takashi Toyoshima 2014-12-08 03:38:58 +09:00
parent 47d7fb8749
commit faacc4ea52
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
6502.S
View File

@ -1214,6 +1214,7 @@ op7d: // ADC - Absolute, X
op7e: // ROR - Absolute, X
_fromAbsoluteIndexed RX
_ror
_toAddr
_decode
op81: // STA - (Indirect, X)

6
ftest.c
View File

@ -17,7 +17,7 @@ void prn(int c) {
void cpu6502_dump(uint32_t pc, uint32_t a, uint32_t x, uint32_t y,
uint32_t sp, uint32_t sr) {
uint8_t fp;
uint32_t fp;
__asm__("movs %0, r12": "=r"(fp));
fprintf(stderr, "*** dump *** PC=$%04x A=$%02x X=$%02x Y=$%02x SP=$%02x "
"NV-B_DIZC=%d%d-%d_%d%d%d%d\n",
@ -34,7 +34,7 @@ void cpu6502_dump(uint32_t pc, uint32_t a, uint32_t x, uint32_t y,
}
uint8_t cpu6502_load(uint16_t addr) {
uint8_t fp;
uint32_t fp;
uint8_t result = 0;
__asm__("movs %0, r12": "=r"(fp));
result = mem[addr];
@ -45,7 +45,7 @@ uint8_t cpu6502_load(uint16_t addr) {
}
void cpu6502_store(uint16_t addr, uint8_t data) {
uint8_t fp;
uint32_t fp;
__asm__("movs %0, r12": "=r"(fp));
mem[addr] = data;
fprintf(stderr, "store $%04x <= $%02x\n", addr, data);

8
test.c
View File

@ -11,7 +11,7 @@ static uint32_t keyCount = 0;
static uint8_t last = 0x00;
void prn(int c) {
uint8_t fp;
uint32_t fp;
__asm__("movs %0, r12": "=r"(fp));
fprintf(stderr, "### $%02x ###\n", c);
fflush(stderr);
@ -20,7 +20,7 @@ void prn(int c) {
void cpu6502_dump(uint32_t pc, uint32_t a, uint32_t x, uint32_t y,
uint32_t sp, uint32_t sr) {
uint8_t fp;
uint32_t fp;
__asm__("movs %0, r12": "=r"(fp));
assert(pc < 0x10000);
assert(a < 0x100);
@ -37,7 +37,7 @@ void cpu6502_dump(uint32_t pc, uint32_t a, uint32_t x, uint32_t y,
}
uint8_t cpu6502_load(uint16_t addr) {
uint8_t fp;
uint32_t fp;
uint8_t result = 0;
__asm__("movs %0, r12": "=r"(fp));
if (0x0400 <= addr && addr <= 0x7ff) {
@ -83,7 +83,7 @@ uint8_t cpu6502_load(uint16_t addr) {
}
void cpu6502_store(uint16_t addr, uint8_t data) {
uint8_t fp;
uint32_t fp;
__asm__("movs %0, r12": "=r"(fp));
if (0x0400 <= addr && addr <= 0x7ff) {
// Fake text VRAM.