Commit 2a521f6

authored

Merge pull request #74 from RinHizakura/gdbstub

Support GDB stub for remote debugging

2 parents b2e2de7 + ae260eb commit 2a521f6Copy full SHA for 2a521f6

File tree

+242

-77

lines changed

+242

-77

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,3 +2,7 @@`
`2`	`2`	`path = cnfa`
`3`	`3`	`url = https://github.com/cntools/cnfa`
`4`	`4`	`shallow = true`
	`5`	`+[submodule "mini-gdbstub"]`
	`6`	`+ path = mini-gdbstub`
	`7`	`+ url = https://github.com/RinHizakura/mini-gdbstub`
	`8`	`+ shallow = true`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,14 @@ OBJS := \`
`105`	`105`
`106`	`106`	`deps := $(OBJS:%.o=.%.o.d)`
`107`	`107`
	`108`	`+GDBSTUB_LIB := mini-gdbstub/build/libgdbstub.a`
	`109`	`+LDFLAGS += $(GDBSTUB_LIB)`
	`110`	`+mini-gdbstub/Makefile:`
	`111`	`+ git submodule update --init $(dir $@)`
	`112`	`+$(GDBSTUB_LIB): mini-gdbstub/Makefile`
	`113`	`+ $(MAKE) -C $(dir $<)`
	`114`	`+$(OBJS): $(GDBSTUB_LIB)`
	`115`	`+`
`108`	`116`	`$(BIN): $(OBJS)`
`109`	`117`	`$(VECHO) " LD\t$@\n"`
`110`	`118`	`$(Q)$(CC) -o $@ $^ $(LDFLAGS)`
`@@ -152,6 +160,7 @@ build-image:`
`152`	`160`
`153`	`161`	`clean:`
`154`	`162`	`$(Q)$(RM) $(BIN) $(OBJS) $(deps)`
	`163`	`+ $(Q)$(MAKE) -C mini-gdbstub clean`
`155`	`164`
`156`	`165`	`distclean: clean`
`157`	`166`	`$(Q)$(RM) riscv-harts.dtsi`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -355,9 +355,11 @@ bool virtio_snd_init(virtio_snd_state_t *vsnd);`
`355`	`355`
`356`	`356`	`/* memory mapping */`
`357`	`357`	`typedef struct {`
	`358`	`+ bool debug;`
`358`	`359`	`bool stopped;`
`359`	`360`	`uint32_t *ram;`
`360`	`361`	`uint32_t *disk;`
	`362`	`+ vm_t vm;`
`361`	`363`	`plic_state_t plic;`
`362`	`364`	`u8250_state_t uart;`
`363`	`365`	`#if SEMU_HAS(VIRTIONET)`
`@@ -376,4 +378,10 @@ typedef struct {`
`376`	`378`	`#if SEMU_HAS(VIRTIOSND)`
`377`	`379`	`virtio_snd_state_t vsnd;`
`378`	`380`	`#endif`
	`381`	`+`
	`382`	`+ uint32_t peripheral_update_ctr;`
	`383`	`+`
	`384`	`+ /* The fields used for debug mode */`
	`385`	`+ bool is_interrupted;`
	`386`	`+ int curr_cpuid;`
`379`	`387`	`} emu_state_t;`

Comments

(0)