Apple-2-SW/Applerm-II
1
0
Fork 0
mirror of https://github.com/toyoshim/Applerm-II.git synced 2024-05-31 15:41:29 +00:00
Code Issues Projects Releases Wiki Activity

Bug fix: stack is hard :(

Browse Source 
SP should wrap correctly on push and pop
This commit is contained in:
Takashi Toyoshima 2014-12-08 02:43:05 +09:00
parent 9098230d7d
commit 77fa2964f1
4 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
6502.S
View File

@ -91,6 +91,11 @@
_stb _stb
mov r0, SP mov r0, SP
subs r0, r0, #1 subs r0, r0, #1
cmp r0, #0xff
bne 1f
lsls r0, r0, #1
adds r0, r0, #1
1:
mov SP, r0 mov SP, r0
.endm .endm
@ -101,30 +106,55 @@
_stb _stb
mov r0, SP mov r0, SP
subs r0, r0, #1 subs r0, r0, #1
cmp r0, #0xff
bne 1f
lsls r0, r0, #1
adds r0, r0, #1
1:
mov SP, r0
mov r1, \reg mov r1, \reg
_stb _stb
mov r0, SP mov r0, SP
subs r0, r0, #2 subs r0, r0, #1
cmp r0, #0xff
bne 1f
lsls r0, r0, #1
adds r0, r0, #1
1:
mov SP, r0 mov SP, r0
.endm .endm
.macro _popb .macro _popb
mov r0, SP mov r0, SP
adds r0, r0, #1 adds r0, r0, #1
lsrs r1, r0, #10
bcc 1f
lsrs r0, r0, #1
1:
mov SP, r0 mov SP, r0
_ldb _ldb
.endm .endm
.macro _popw .macro _popw
mov T0, SP mov r0, SP
adds r0, T0, #1 adds r0, r0, #1
lsrs r1, r0, #10
bcc 1f
lsrs r0, r0, #1
1:
mov SP, r0
_ldb _ldb
mov T1, r0 mov T0, r0
adds r0, T0, #2 mov r0, SP
adds r0, r0, #1
lsrs r1, r0, #10
bcc 1f
lsrs r0, r0, #1
1:
mov SP, r0 mov SP, r0
_ldb _ldb
lsls r0, r0, #8 lsls r0, r0, #8
adds r0, r0, T1 adds r0, r0, T0
.endm .endm
.macro _decode .macro _decode
@ -1271,10 +1301,11 @@ op99: // STA - Absolute, Y
_decode _decode
op9a: // TXS op9a: // TXS
_t RX, SP
movs r0, #1 movs r0, #1
lsls r0, r0, #8 lsls r0, r0, #8
add SP, SP, r0 add r0, RX, r0
mov SP, r0
adds PC, PC, #1
_decode _decode
op9d: // STA - Absolute, X op9d: // STA - Absolute, X

2
Makefile
View File

@ -54,7 +54,7 @@ run: $(APP).bin
$(LPC21ISP) -control -term -bin $(APP).bin $(SERIAL) $(SPEED) $(CLOCK) $(LPC21ISP) -control -term -bin $(APP).bin $(SERIAL) $(SPEED) $(CLOCK)
clean: clean:
rm -rf $(APP).bin $(APP) $(OBJS) test rm -rf $(APP).bin $(APP) $(OBJS) test ftest
# Use this build target to install required packages if you are on Ubuntu14.04. # Use this build target to install required packages if you are on Ubuntu14.04.
install-deps: install-deps:

13
ftest.c
View File

@ -1,3 +1,4 @@
#include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
@ -14,15 +15,21 @@ void prn(int c) {
__asm__("movs r12, %0":: "r"(fp)); __asm__("movs r12, %0":: "r"(fp));
} }
void cpu6502_dump( void cpu6502_dump(uint32_t pc, uint32_t a, uint32_t x, uint32_t y,
uint16_t pc, uint8_t a, uint8_t x, uint8_t y, uint8_t sp, uint8_t sr) { uint32_t sp, uint32_t sr) {
uint8_t fp; uint8_t fp;
__asm__("movs %0, r12": "=r"(fp)); __asm__("movs %0, r12": "=r"(fp));
fprintf(stderr, "*** dump *** PC=$%04x A=$%02x X=$%02x Y=$%02x SP=$%02x " fprintf(stderr, "*** dump *** PC=$%04x A=$%02x X=$%02x Y=$%02x SP=$%02x "
"NV-B_DIZC=%d%d-%d_%d%d%d%d\n", "NV-B_DIZC=%d%d-%d_%d%d%d%d\n",
pc, a, x, y, sp, (sr >> 7) & 1, (sr >> 6) & 1, (sr >> 4) & 1, pc, a, x, y, sp & 0xff, (sr >> 7) & 1, (sr >> 6) & 1, (sr >> 4) & 1,
(sr >> 3) & 1, (sr >> 2) & 1, (sr >> 1) & 1, sr & 1); (sr >> 3) & 1, (sr >> 2) & 1, (sr >> 1) & 1, sr & 1);
fflush(stderr); fflush(stderr);
assert(pc < 0x10000);
assert(a < 0x100);
assert(x < 0x100);
assert(y < 0x100);
assert(sr < 0x100);
assert(0x100 <= sp && sp < 0x200);
__asm__("movs r12, %0":: "r"(fp)); __asm__("movs r12, %0":: "r"(fp));
} }

2
test.c
View File

@ -28,7 +28,7 @@ void cpu6502_dump(uint32_t pc, uint32_t a, uint32_t x, uint32_t y,
assert(0x100 <= sp && sp < 0x200); assert(0x100 <= sp && sp < 0x200);
fprintf(stderr, "*** dump *** PC=$%04x A=$%02x X=$%02x Y=$%02x SP=$%02x " fprintf(stderr, "*** dump *** PC=$%04x A=$%02x X=$%02x Y=$%02x SP=$%02x "
"NV-B_DIZC=%d%d-%d_%d%d%d%d\n", "NV-B_DIZC=%d%d-%d_%d%d%d%d\n",
pc, a, x, y, sp, (sr >> 7) & 1, (sr >> 6) & 1, (sr >> 4) & 1, pc, a, x, y, sp & 0xff, (sr >> 7) & 1, (sr >> 6) & 1, (sr >> 4) & 1,
(sr >> 3) & 1, (sr >> 2) & 1, (sr >> 1) & 1, sr & 1); (sr >> 3) & 1, (sr >> 2) & 1, (sr >> 1) & 1, sr & 1);
fflush(stderr); fflush(stderr);
__asm__("movs r12, %0":: "r"(fp)); __asm__("movs r12, %0":: "r"(fp));