Merge pull request #407 from IrgendwerA8/sim65_fix

Fixed addressing error for TSB/TSR and enabled tests again.

diff --git a/src/sim65/6502.c b/src/sim65/6502.c
index 0320dd895da3785dc00bee2e58572b0ae270fa50..b870dd76d0587d982fdcdea187c3789f07ee770a 100644 (file)
--- a/src/sim65/6502.c
+++ b/src/sim65/6502.c
@@ -470,7 +470,7 @@ static void OPC_65SC02_0C (void)
     unsigned Addr;
     unsigned char Val;
     Cycles = 6;
-    Addr = MemReadByte (Regs.PC+1);
+    Addr = MemReadWord (Regs.PC+1);
     Val = MemReadByte (Addr);
     SET_ZF ((Val & Regs.AC) == 0);
     MemWriteByte (Addr, (unsigned char) (Val | Regs.AC));    
@@ -604,7 +604,7 @@ static void OPC_65SC02_1C (void)
     unsigned Addr;
     unsigned char Val;
     Cycles = 6;
-    Addr = MemReadByte (Regs.PC+1);
+    Addr = MemReadWord (Regs.PC+1);
     Val = MemReadByte (Addr);
     SET_ZF ((Val & Regs.AC) == 0);
     MemWriteByte (Addr, (unsigned char) (Val & ~Regs.AC));    

diff --git a/test/val/Makefile b/test/val/Makefile
index 1981b36fe3fef0c0c21297afd35bd744b971c05d..95522a93099e50e015669dc163ffedb52109031f 100644 (file)
--- a/test/val/Makefile
+++ b/test/val/Makefile
@@ -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).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)
 
 $(WORKDIR):