Commit: 890713b8fea67eee6c3c28e4d96bd001ed5de826 - exorsim6801 (git)

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

Commit MetaInfo

• Revision: 890713b8fea67eee6c3c28e4d96bd001ed5de826 (tree)
• Zeit: 2020-11-08 21:59:44
• Autor: Joel Matthew Rees <joel.rees@gmai...>
• Commiter: Joel Matthew Rees

Log Message

partially debugged sim6800.c, fig Forth needs to start over.

Ändern Zusammenfassung

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

Diff

--- a/fig-forth6801_exorsim.68c
+++ b/fig-forth6801_exorsim.68c
@@ -1,5 +1,7 @@
 *	OPT PRT
 
+	OPT 6801
+
 * fig-FORTH FOR 6801
 * ASSEMBLY SOURCE LISTING
 
@@ -920,17 +922,19 @@ USLASH	FDB	*+2
 	LDA A	#17
 	PSH A
 	TSX
-	LDA A	3,X
-	LDA B	4,X
-USL1	CMP A	1,X
+	LDD	3,X
+USL1	CMPD	1,X
+yo!
+
+	BCC	USL3
+	CMP A	1,X
 	BHI	USL3
 	BCS	USL2
 	CMP B	2,X
 	BCC	USL3
 USL2	CLC
 	BRA	USL4
-USL3	SUB B	2,X
-	SBC A	1,X
+USL3	SUBD	1,X
 	SEC
 USL4	ROL	6,X
 	ROL	5,X

--- a/sim6800.c
+++ b/sim6800.c
@@ -217,7 +217,11 @@ void show_trace(int insn_no, struct trace_entry *t)
         sprintf(buf + strlen(buf), "%2.2X ", t->insn[0]);
 
 	if (t->insn[0] & 0x80) {
+#ifdef SIM6801
+		if ( ((t->insn[0] & 0x0F) < 0x0C) && ((t->insn[0] & 0x0F) != 0x03 ) ) {
+#else
 		if ((t->insn[0] & 0x0F) < 0x0C) {
+#endif /* def SIM6801 */
 			if (t->insn[0] & 0x40) {
 				sprintf(operand, "B");
 			} else {
@@ -257,7 +261,12 @@ void show_trace(int insn_no, struct trace_entry *t)
 					insn = "SBC";
 					break;
 				}
-#ifndef SIM6801
+#ifdef SIM6801
+				  case 0x03: /* ACCMD should never get here at run time. */ {
+					insn = "";
+					break;
+				}
+#else
 				  case 0x03: /* ??? */ {
 					goto invalid;
 					break;
@@ -850,7 +859,11 @@ void sim(void)
 		opcode = fetch();
 
 		if (opcode & 0x80) {
+#ifdef SIM6801
+			if ( ((opcode & 0x0F) < 0x0C) && ((opcode & 0x0F) != 0x03) ) {
+#else
 			if ((opcode & 0x0F) < 0x0C) {
+#endif /* def SIM6801 */
 				/* Get operand A */
 				if (opcode & 0x40) {
 					a = accb;