empathicqubit/cc65
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #407 from IrgendwerA8/sim65_fix

Browse source 
Fixed addressing error for TSB/TSR and enabled tests again.
This commit is contained in:
Oliver Schmidt 2017-03-21 11:21:48 +01:00 • committed by GitHub
commit fe59626953
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/sim65/6502.c
View file

@ -470,7 +470,7 @@ static void OPC_65SC02_0C (void)
unsigned Addr; unsigned Addr;
unsigned char Val; unsigned char Val;
Cycles = 6; Cycles = 6;
Addr = MemReadByte (Regs.PC+1); Addr = MemReadWord (Regs.PC+1);
Val = MemReadByte (Addr); Val = MemReadByte (Addr);
SET_ZF ((Val & Regs.AC) == 0); SET_ZF ((Val & Regs.AC) == 0);
MemWriteByte (Addr, (unsigned char) (Val | Regs.AC)); MemWriteByte (Addr, (unsigned char) (Val | Regs.AC));
@ -604,7 +604,7 @@ static void OPC_65SC02_1C (void)
unsigned Addr; unsigned Addr;
unsigned char Val; unsigned char Val;
Cycles = 6; Cycles = 6;
Addr = MemReadByte (Regs.PC+1); Addr = MemReadWord (Regs.PC+1);
Val = MemReadByte (Addr); Val = MemReadByte (Addr);
SET_ZF ((Val & Regs.AC) == 0); SET_ZF ((Val & Regs.AC) == 0);
MemWriteByte (Addr, (unsigned char) (Val & ~Regs.AC)); MemWriteByte (Addr, (unsigned char) (Val & ~Regs.AC));

7
test/val/Makefile
View file

@ -39,13 +39,6 @@ SOURCES := $(wildcard *.c)
TESTS := $(foreach option,$(OPTIONS),$(SOURCES:%.c=$(WORKDIR)/%.$(option).6502.prg)) TESTS := $(foreach option,$(OPTIONS),$(SOURCES:%.c=$(WORKDIR)/%.$(option).6502.prg))
TESTS += $(foreach option,$(OPTIONS),$(SOURCES:%.c=$(WORKDIR)/%.$(option).65c02.prg)) TESTS += $(foreach option,$(OPTIONS),$(SOURCES:%.c=$(WORKDIR)/%.$(option).65c02.prg))
# FIXME: These tests fail when built with optimizations for the 65c02
TESTS := $(filter-out $(WORKDIR)/compare7.O%.65c02.prg,$(TESTS))
TESTS := $(filter-out $(WORKDIR)/compare8.O%.65c02.prg,$(TESTS))
TESTS := $(filter-out $(WORKDIR)/compare9.O%.65c02.prg,$(TESTS))
TESTS := $(filter-out $(WORKDIR)/compare10.O%.65c02.prg,$(TESTS))
TESTS := $(filter-out $(WORKDIR)/or1.O%.65c02.prg,$(TESTS))
all: $(TESTS) all: $(TESTS)
$(WORKDIR): $(WORKDIR):