Merge branch 'master' of https://github.com/stardot/b-em

stardot · Jan 1, 2025 · ec15c27 · ec15c27
2 parents 9bd99ca + 4bd48c3
commit ec15c27
Show file tree

Hide file tree

Showing 18 changed files with 733 additions and 224 deletions.
diff --git a/roms/tube/CiscOS.rom b/roms/tube/CiscOS.rom
diff --git a/src/6502.c b/src/6502.c
@@ -4102,8 +4102,8 @@ void m65c02_exec(int slice)
                 case 0x02:
                         if (dbg_core6502)
                             debug_trap(&core6502_cpu_debug, debug_addr(oldpc), 1);
-                        else
-                            polltime(1);
+                        polltime(2);
+                        (void)readmem(pc++);
                         break;
 
                 case 0x04:      /*TSB zp */

diff --git a/src/6502tube.c b/src/6502tube.c
@@ -593,8 +593,8 @@ void tube_6502_exec()
                 case 0x02:
                         if (dbg_tube6502)
                             debug_trap(&tube6502_cpu_debug, oldtpc, 1);
-                        else
-                            polltime(1);
+                        polltime(2);
+                        readmem(pc++);
                         break;
 
                 case 0x04:      /*TSB zp */

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -108,6 +108,7 @@ b_em_SOURCES = \
 	tapenoise.c \
     pdp11/pdp11.c \
     pdp11/pdp11_debug.c \
+    textsave.c \
 	tube.c \
 	uef.c \
 	uservia.c \

diff --git a/src/b-em.h b/src/b-em.h
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
 
 #include "compat_wrappers.h"
 

diff --git a/src/debugger.c b/src/debugger.c
@@ -1751,16 +1751,20 @@ static void debug_trace_write(cpu_debug_t *cpu, uint32_t addr, FILE *fp)
         *(sym++) = '\0';
     }
 
-    fputs("\t", fp);
+    while(strlen(buf) < 52)
+      strcat(buf, " ");
+
     fputs(buf, fp);
-    *buf = ' ';
 
     const char **np = cpu->reg_names;
     const char *name;
     int r = 0;
     while ((name = *np++)) {
-        size_t len = cpu->reg_print(r++, buf + 1, sizeof buf - 1);
-        fwrite(buf, len + 1, 1, fp);
+        fputs(" ", fp);
+        fputs(name, fp);
+        fputs("=", fp);
+        size_t len = cpu->reg_print(r++, buf, sizeof buf);
+        fwrite(buf, len, 1, fp);
     }
 
     if (sym)