Commit: master - exorsim6801 (git)

Motorola M6800 (6800) Exorciser / SWTPC emulator plus 6801 instruction set emulation

Commit MetaInfo

• Revision: 92ef8a291a6240887b19ec9117ea774aba59ea9a (tree)
• Time: 2022-09-03 00:57:21
• Author: Joel Matthew Rees <joel.rees@gmai...>
• Commiter: Joel Matthew Rees

Log Message

Fixing the embarrassing CPX bug -- C flag, etc.

Change Summary

• modified: fig-forth6801_exorsim.68c
• modified: sim6800.c

Incremental Difference

--- a/fig-forth6801_exorsim.68c
+++ b/fig-forth6801_exorsim.68c
@@ -2482,7 +2482,13 @@ QUIT3	FDB	BRAN
 	FCC	4,ABORT
 	FCB	$D4
 	FDB	QUIT-7
-ABORT	FDB	DOCOL,SPSTOR,DEC,QSTACK,DRZERO,CR,PDOTQ
+ABORT	FDB	DOCOL,SPSTOR,DEC,QSTACK,DRZERO,CR
+*	FDB	CLITER
+*	FCB	$F1	; reset
+*	FDB	EMIT,CLITER
+*	FCB	$D2	; scroll mode
+*	FDB	EMIT
+	FDB	PDOTQ
 	FCB	8
 	FCC	"Forth-68"
 	FDB	FORTH,DEFIN

--- a/sim6800.c
+++ b/sim6800.c
@@ -326,7 +326,7 @@ void show_trace(int insn_no, struct trace_entry *t)
         					sprintf(buf3, "EA=%4.4X%s D=%4.4X", t->ea, buf_ea, t->data);
 					insn = (cputype == 0x6800) ? "???SUBD" : "SUBD";
 					break;
-				} case 0x8C: case 0x9C: case 0xAC: case 0xBC: /* CPX N,Z,V */ {
+				} case 0x8C: case 0x9C: case 0xAC: case 0xBC: /* CPX N,Z,V (, C -- 6801) */ {
 				        if (t->cc & 0x80)
         					sprintf(buf3, "EA=%4.4X%s D=%4.4X", t->ea, buf_ea, t->data);
 					insn = "CPX";
@@ -1016,7 +1016,8 @@ void sim(void)
 							v_flag = V(ix >> 8, w >> 8, f);
 						} else { /* assume 0x6801 compatible for now. */
 							n_flag = N_16(fw);
-							v_flag = V_16(ix, w, fw);
+							v_flag = V_16_SUB(ix, w, fw);
+							c_flag = C_16_SUB(ix, w, fw);
 						}
 						break;
 					} case 0x8D: /* BSR REL */ {