コミット: 0203aae90733aec52af26bf9eef230a1e73cb5f8 - exorsim6801 (git)

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

コミットメタ情報

• リビジョン: 0203aae90733aec52af26bf9eef230a1e73cb5f8 (tree)
• 日時: 2020-11-05 22:20:15
• 作者: Joel Matthew Rees <joel.rees@gmai...>
• コミッター: Joel Matthew Rees

ログメッセージ

cleaning up the output of make (not CFLAGS -Wall)

変更サマリ

• modified: asm6800.c
• modified: exor.c
• add: exorsim.h
• modified: exorterm.c
• modified: mdos.c
• modified: mon.c
• modified: sim6800.c
• modified: sim6800.h
• modified: unasm6800.c

差分

--- a/asm6800.c
+++ b/asm6800.c
@@ -19,7 +19,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "asm6800.h"
+#include "utils.h"	/* JMR20201103 */
 
 /* Fixup types */
 

--- a/exor.c
+++ b/exor.c
@@ -24,10 +24,13 @@
 #include <fcntl.h>
 #include <sys/poll.h>
 #include <signal.h>
+#include <unistd.h>	/* JMR20201103 */
 
 #include "sim6800.h"
+#include "unasm6800.h"	/* JMR202021103 */
 #include "exor.h"
 #include "exorterm.h"
+#include "utils.h"	/* JMR20201103 */
 
 /* Options */
 

--- /dev/null
+++ b/exorsim.h
@@ -0,0 +1,22 @@
+/*	Configurations for Joseph H. Allen's Exorsim
+ *	This file copyright 2020 Joel Matthew Rees
+ *
+ * This is free software; you can redistribute it and/or modify it under the 
+ * terms of the GNU General Public License as published by the Free Software 
+ * Foundation; either version 1, or (at your option) any later version.  
+ *
+ * It is distributed in the hope that it will be useful, but WITHOUT ANY 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more 
+ * details.  
+ * 
+ * You should have received a copy of the GNU General Public License along with 
+ * this software; see the file COPYING.  If not, write to the Free Software Foundation, 
+ * 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+/* #define SIM6800 0x6800 */
+#define SIM6801 0x6801
+
+

--- a/exorterm.c
+++ b/exorterm.c
@@ -21,7 +21,10 @@
 #include <string.h>
 #include <fcntl.h>
 #include <sys/poll.h>
+#include <unistd.h>	/* JMR20201103 */
+
 #include "exorterm.h"
+#include "utils.h"	/* JMR20201103 */
 
 /* State of real terminal */
 

--- a/mdos.c
+++ b/mdos.c
@@ -559,6 +559,9 @@ int del_file(int rib_sector)
         return 0;
 }
 
+/* Defined below in this file: (JMR20201103) */
+int find_file(char *filename, int *type, int del);
+
 /* Delete file name */
 
 int rm(char *name)

--- a/mon.c
+++ b/mon.c
@@ -22,9 +22,11 @@
 #include <fcntl.h>
 #include <sys/poll.h>
 #include <signal.h>
+#include <unistd.h>	/* JMR20201105 */
 
 #include "utils.h"
 #include "asm6800.h"
+#include "unasm6800.h"	/* JMR20201105 */
 #include "sim6800.h"
 #include "exor.h"
 
@@ -176,11 +178,11 @@ int b_cmd(char *p)
 {
         int val;
         if (!*p) {
-                brk = 0;
+                hasbrk = 0;	/* JMR20201103 */
                 printf("Breakpoint cleared\n");
         } else if (parse_hex(&p, &val)) {
                 brk_addr = val;
-                brk = 1;
+                hasbrk = 1;	/* JMR20201103 */
                 printf("Breakpoint set at %4.4X\n", brk_addr);
         } else
                 huh();
@@ -333,7 +335,9 @@ int u_cmd(char *p)
                 int target;
                 int x;
                 for (x = 0; x != 22; ++x) {
-                        unasm_line(mem, &addr, buf, &target, 1);
+			unsigned short saddr = (unsigned short) addr;	/* JMR20201105 hidden endian issues */
+                        unasm_line(mem, &saddr, buf, &target, 1);	/* JMR20201105 */
+			addr = saddr;	/* JMR20201105 ugly hack, let Joe figure it out. */
                         fprintf(mon_out, "%s\n", buf);
                 }
                 last_u = addr;

--- a/sim6800.c
+++ b/sim6800.c
@@ -16,10 +16,15 @@
  * 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+/*	Modifications for 6801 copyright 2020 Joel Matthew Rees
+*/
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "exorsim.h"	/* JMR20201103 */
 #include "exor.h"
 #include "unasm6800.h"
 #include "asm6800.h"
@@ -46,7 +51,8 @@ unsigned char i_flag; /* 1=masked, 0=enabled */
 unsigned char h_flag;
 
 /* Breakpoint */
-int brk;
+/* int brk; */
+int hasbrk;	/* JMR20201103: 'brk' conflicts with unistd library. */
 unsigned short brk_addr;
 
 /* Trace buffer */
@@ -693,8 +699,8 @@ void sim(void)
 		t->ea = 0;
 		t->data = 0;
 
-		if (brk && brk_addr == pc || stop) {
-		        if (brk && brk_addr == pc)
+		if (hasbrk && brk_addr == pc || stop) {	/* JMR20201103 */
+		        if (hasbrk && brk_addr == pc)	/* JMR20201103 */
         		        printf("\r\nBreakpoint!\n");
 		        monitor();
                         t->pc = pc;

--- a/sim6800.h
+++ b/sim6800.h
@@ -7,7 +7,8 @@ extern int reset;
 extern int abrt;
 extern int sp_stop;
 
-extern int brk;
+/* extern int brk; */
+extern int hasbrk;	/* JMR20201103 'brk' conflicts with unistd library. */
 extern unsigned short brk_addr;
 
 /* CPU registers */
@@ -31,6 +32,8 @@ void write_flags(unsigned char f);
 
 void sim(void);
 
+void simulated(unsigned short addr); /* For exor.c, JMR20201103 */
+
 /* Dump trace buffer */
 void show_traces(int n);
 

--- a/unasm6800.c
+++ b/unasm6800.c
@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include "unasm6800.h"
+#include "utils.h"	/* JMR20201103 */
 
 struct fact *swi_facts;
 int targets[65536];
@@ -53,7 +54,8 @@ void parse_facts(FILE *f)
 		if (buf[0] && buf[strlen(buf)-1]=='\r')
 			buf[strlen(buf)-1] = 0;
 		p = buf;
-		unsigned short addr;
+		/*		unsigned short addr; */
+		int addr;	/* JMR20201103 parse_hex() wants an int pointer. */
 		char keyword[100];
 		int len;
 		char label[100];