Changeset 7cc6ac0 in buchla-emu

Timestamp:

08/05/2017 05:07:26 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

5fa5369

Parents:

c3f113d

Message:

Successfully attached GDB.

Files:

• .gitignore (modified) (1 diff)
• Makefile (modified) (2 diffs)
• emu/all.h (modified) (2 diffs)
• emu/cpu.c (modified) (1 diff)
• emu/gdb.c (added)
• emu/main.c (modified) (2 diffs)
• emu/sdl.c (modified) (1 diff)

.gitignore

@@ -1 +1 @@
 bios.abs
+bios.elf
 midas.abs
+midas.elf
 
 build

Makefile

@@ -109 +109 @@
 
 EMU_C :=                main.c cpu.c vid.c fpu.c tim.c lcd.c ser.c mid.c fdd.c snd.c \
-                                led.c kbd.c sdl.c
+                                led.c kbd.c sdl.c gdb.c
 EMU_O :=                $(EMU_C:.c=.o)
 EMU_OP :=               $(EMU_O:%=build/%)
@@ -128 +128 @@
 
 run:                    buchla buchla.disk
-                                ./buchla
+                                ./buchla ${EMU_OPTS}
 
 val:                    buchla buchla.disk
                                 valgrind --leak-resolution=high --track-fds=yes --leak-check=full \
-                                --show-reachable=yes --suppressions=misc/buchla.supp ./buchla
+                                --show-reachable=yes --suppressions=misc/buchla.supp \
+                                ./buchla ${EMU_OPTS}
 
 clean:

emu/all.h

@@ -48 +48 @@
 
 extern int32_t sdl_verbose;
+extern int32_t gdb_verbose;
 extern int32_t cpu_verbose;
 extern int32_t fpu_verbose;
@@ -68 +69 @@
 extern void sdl_quit(void);
 extern void sdl_loop(void);
+
+extern void gdb_init(void);
+extern void gdb_quit(void);
+extern void gdb_loop(void);
+extern void gdb_inst(void);
 
 extern SDL_mutex *cpu_mutex;

emu/cpu.c

@@ -470 +470 @@
 static void inst_cb(void)
 {
+        gdb_inst();
+
         uint32_t pc = m68k_get_reg(NULL, M68K_REG_PC);
         uint32_t op = m68k_read_memory_16(pc);

emu/main.c

@@ -25 +25 @@
 static verb_flag_t verb_flags[] = {
         { "sdl", &sdl_verbose },
+        { "gdb", &gdb_verbose },
         { "cpu", &cpu_verbose },
         { "fpu", &fpu_verbose },
@@ -128 +129 @@
 }
 
+static int32_t gdb_thread(void *data)
+{
+        (void)data;
+
+        gdb_loop();
+        return 0;
+}
+
 int32_t main(int32_t argc, char *argv[])
 {
         parse_args(argc, argv);
         sdl_init();
+        gdb_init();
         cpu_init();
 
         SDL_AtomicSet(&run, 1);
-        SDL_Thread *thr = SDL_CreateThread(cpu_thread, "cpu", NULL);
+        SDL_Thread *thr_cpu = SDL_CreateThread(cpu_thread, "cpu", NULL);
 
-        if (thr == NULL) {
+        if (thr_cpu == NULL) {
+                fail("SDL_CreateThread() failed: %s", SDL_GetError());
+        }
+
+        SDL_Thread *thr_gdb = SDL_CreateThread(gdb_thread, "gdb", NULL);
+
+        if (thr_gdb == NULL) {
                 fail("SDL_CreateThread() failed: %s", SDL_GetError());
         }
 
         sdl_loop();
-        SDL_WaitThread(thr, NULL);
+
+        SDL_WaitThread(thr_cpu, NULL);
+        SDL_WaitThread(thr_gdb, NULL);
 
         cpu_quit();
+        gdb_quit();
         sdl_quit();
         return 0;

emu/sdl.c

@@ -18 +18 @@
 #include <all.h>
 
-int32_t sdl_verbose = false;
+int32_t sdl_verbose = 0;
 
 #define ver(...) _ver(sdl_verbose, 0, __VA_ARGS__)