Merge pull request #74 from RinHizakura/gdbstub

Support GDB stub for remote debugging

Author: jserv

.gitmodules

@@ -2,3 +2,7 @@
     path = cnfa
     url = https://github.com/cntools/cnfa
     shallow = true
+[submodule "mini-gdbstub"]
+    path = mini-gdbstub
+    url = https://github.com/RinHizakura/mini-gdbstub
+    shallow = true

Makefile

@@ -105,6 +105,14 @@ OBJS := \
 
 deps := $(OBJS:%.o=.%.o.d)
 
+GDBSTUB_LIB := mini-gdbstub/build/libgdbstub.a
+LDFLAGS += $(GDBSTUB_LIB)
+mini-gdbstub/Makefile:
+	git submodule update --init $(dir $@)
+$(GDBSTUB_LIB): mini-gdbstub/Makefile
+	$(MAKE) -C $(dir $<)
+$(OBJS): $(GDBSTUB_LIB)
+
 $(BIN): $(OBJS)
 	$(VECHO) "  LD\t$@\n"
 	$(Q)$(CC) -o $@ $^ $(LDFLAGS)
@@ -152,6 +160,7 @@ build-image:
 
 clean:
 	$(Q)$(RM) $(BIN) $(OBJS) $(deps)
+	$(Q)$(MAKE) -C mini-gdbstub clean
 
 distclean: clean
 	$(Q)$(RM) riscv-harts.dtsi

device.h

@@ -355,9 +355,11 @@ bool virtio_snd_init(virtio_snd_state_t *vsnd);
 
 /* memory mapping */
 typedef struct {
+    bool debug;
     bool stopped;
     uint32_t *ram;
     uint32_t *disk;
+    vm_t vm;
     plic_state_t plic;
     u8250_state_t uart;
 #if SEMU_HAS(VIRTIONET)
@@ -376,4 +378,10 @@ typedef struct {
 #if SEMU_HAS(VIRTIOSND)
     virtio_snd_state_t vsnd;
 #endif
+
+    uint32_t peripheral_update_ctr;
+
+    /* The fields used for debug mode */
+    bool is_interrupted;
+    int curr_cpuid;
 } emu_state_t;