Changeset 149c3e0 in buchla-emu for emu

Timestamp:

08/05/2017 08:48:28 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

29618fe

Parents:

5fa5369

Message:

Resuming, Ctrl-C, breakpoints look OK.

Location:

emu

Files:

• all.h (modified) (1 diff)
• cpu.c (modified) (1 diff)
• gdb.c (modified) (12 diffs)

emu/all.h

@@ -73 +73 @@
 extern void gdb_quit(void);
 extern void gdb_loop(void);
-extern void gdb_inst(void);
+extern void gdb_inst(bool bp);
 
 extern SDL_mutex *cpu_mutex;

emu/cpu.c

@@ -494 +494 @@
 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);
+
+        gdb_inst(op == 0x4e4f);
 
         if (op == 0x4e4d) {

emu/gdb.c

@@ -39 +39 @@
 #define LOCK_REQ 1
 #define LOCK_ACK 2
+#define LOCK_BP 3
 
 typedef enum {
@@ -97 +98 @@
 }
 
-void gdb_inst(void)
+void gdb_inst(bool bp)
 {
         ver3("gdb inst");
 
-        if (SDL_AtomicGet(&lock) == LOCK_NONE) {
+        if (!bp && SDL_AtomicGet(&lock) == LOCK_NONE) {
                 return;
         }
@@ -107 +108 @@
         if (SDL_UnlockMutex(cpu_mutex) < 0) {
                 fail("SDL_UnlockMutex() failed: %s", SDL_GetError());
+        }
+
+        if (bp) {
+                ver2("-> lock bp");
+                SDL_AtomicSet(&lock, LOCK_BP);
+
+                while (SDL_AtomicGet(&lock) != LOCK_REQ) {
+                        SDL_Delay(100);
+                }
         }
 
@@ -124 +134 @@
 }
 
+static void wait_cpu(void)
+{
+        while (SDL_AtomicGet(&lock) != LOCK_ACK) {
+                SDL_Delay(100);
+        }
+
+        ver2("<- lock ack");
+}
+
 static void stop_cpu(void)
 {
@@ -129 +148 @@
         SDL_AtomicSet(&lock, LOCK_REQ);
 
-        while (SDL_AtomicGet(&lock) != LOCK_ACK) {
-                SDL_Delay(100);
-        }
-
-        ver2("<- lock ack");
+        wait_cpu();
 }
 
@@ -140 +155 @@
         ver2("-> lock none");
         SDL_AtomicSet(&lock, LOCK_NONE);
-}
-
-static void step_cpu(void)
-{
-        ver2("-> lock req");
-        SDL_AtomicSet(&lock, LOCK_REQ);
-}
-
-static void wait_cpu(void)
-{
-        while (SDL_AtomicGet(&lock) != LOCK_ACK) {
-                SDL_Delay(100);
-        }
-
-        ver2("<- lock ack");
 }
 
@@ -215 +215 @@
 
         cont_cpu();
-        wait_cpu();
-
-        // 0x05 = SIGTRAP
-        return RES_DAT("S05", 3);
+
+        return RES_OK;
 }
 
@@ -227 +225 @@
         }
 
-        step_cpu();
-        wait_cpu();
+        stop_cpu();
 
         // 0x05 = SIGTRAP
@@ -455 +452 @@
         }
 
+        if (res.out == NULL) {
+                return RES_OK;
+        }
+
         static const uint8_t *hex = (uint8_t *)"0123456789abcdef";
         static uint8_t buf[SZ_BUF];
@@ -487 +488 @@
 
         ver3("input %c st %d n %d", byte, (int32_t)state, n_buf);
+
+        if (state == STATE_HEAD && byte == 0x03) {
+                stop_cpu();
+                state = STATE_ACK;
+                return RES_DAT("$S05#b8", 7);
+        }
 
         switch (state) {
@@ -552 +559 @@
                 }
 
+                if (res.out == NULL) {
+                        state = STATE_HEAD;
+                        return RES_OK;
+                }
+
                 state = STATE_ACK;
                 return RES_DAT(res.out, res.n_out);
@@ -588 +600 @@
 
         while (SDL_AtomicGet(&run) != 0) {
-                int32_t n_act = SDLNet_CheckSockets(set, 250);
+                int32_t n_act = SDLNet_CheckSockets(set, 100);
 
                 if (n_act < 0) {
                         fail("SDLNet_CheckSockets() failed: %s", SDLNet_GetError());
+                }
+
+                if (SDL_AtomicGet(&lock) == LOCK_BP) {
+                        ver2("<- lock bp");
+                        stop_cpu();
+                        state = STATE_ACK;
+
+                        if (SDLNet_TCP_Send(con, "$S05#b8", 7) != 7) {
+                                err("connection error");
+                                con_close(con);
+                                con = NULL;
+                                continue;
+                        }
+
+                        continue;
                 }