esp_gdbstub: refactor code

components/esp_gdbstub/src/port/riscv/gdbstub_riscv.c

@@ -0,0 +1,81 @@
+/*
+ * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <string.h>
+#include "esp_gdbstub.h"
+#include "esp_gdbstub_common.h"
+#include "sdkconfig.h"
+
+static inline void init_regfile(esp_gdbstub_gdb_regfile_t *dst)
+{
+    memset(dst, 0, sizeof(*dst));
+}
+
+void esp_gdbstub_frame_to_regfile(const esp_gdbstub_frame_t *frame, esp_gdbstub_gdb_regfile_t *dst)
+{
+    init_regfile(dst);
+    dst->pc = frame->mepc;
+
+    // We omit register x0 here since it's the zero register and always hard-wired to 0.
+    // See The RISC-V Instruction Set Manual Volume I: Unprivileged ISA Document Version 20191213 for more details.
+    memcpy(&(dst->x[1]), &frame->ra, sizeof(uint32_t) * 31);
+}
+
+#ifdef CONFIG_ESP_GDBSTUB_SUPPORT_TASKS
+
+/* Represents FreeRTOS TCB structure */
+typedef struct {
+    uint8_t *top_of_stack;
+    /* Other members aren't needed */
+} dummy_tcb_t;
+
+
+void esp_gdbstub_tcb_to_regfile(TaskHandle_t tcb, esp_gdbstub_gdb_regfile_t *dst)
+{
+    const dummy_tcb_t *dummy_tcb = (const dummy_tcb_t *) tcb;
+
+    const RvExcFrame *frame = (RvExcFrame *) dummy_tcb->top_of_stack;
+    esp_gdbstub_frame_to_regfile(frame, dst);
+}
+
+#endif // CONFIG_ESP_GDBSTUB_SUPPORT_TASKS
+
+int esp_gdbstub_get_signal(const esp_gdbstub_frame_t *frame)
+{
+    return 5; // SIGTRAP, see IDF-2490
+}
+
+void _xt_gdbstub_int(void *frame)
+{
+}
+
+void esp_gdbstub_init_dports()
+{
+}
+
+void esp_gdbstub_stall_other_cpus_start()
+{
+}
+
+void esp_gdbstub_stall_other_cpus_end()
+{
+}
+
+void esp_gdbstub_clear_step()
+{
+}
+
+void esp_gdbstub_do_step()
+{
+}
+
+void esp_gdbstub_trigger_cpu(void)
+{
+}
+
+void esp_gdbstub_set_register(esp_gdbstub_frame_t *frame, uint32_t reg_index, uint32_t value)
+{
+}

components/esp_gdbstub/src/port/riscv/include/esp_gdbstub_arch.h

@@ -0,0 +1,36 @@
+/*
+ * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+#include <stdint.h>
+#include "riscv/rvruntime-frames.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef RvExcFrame esp_gdbstub_frame_t;
+
+/* GDB regfile structure, configuration dependent */
+typedef struct {
+    uint32_t x[32];
+    uint32_t pc;
+} esp_gdbstub_gdb_regfile_t;
+
+
+// Amount of HW breakpoints used in GDB
+#ifndef GDB_BP_SIZE
+#define GDB_BP_SIZE 2
+#endif  // GDB_BP_SIZE
+
+// Amount of HW watchpoints used in GDB
+#ifndef GDB_WP_SIZE
+#define GDB_WP_SIZE 2
+#endif  // GDB_WP_SIZE
+
+#ifdef __cplusplus
+}
+#endif

components/esp_gdbstub/src/port/riscv/include/esp_gdbstub_memory_regions.h

@@ -0,0 +1,41 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "esp_gdbstub_memory_regions_common.h"
+#include "soc/soc.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static inline bool __is_valid_memory_region(intptr_t addr)
+{
+    return (addr >= SOC_DROM_LOW && addr < SOC_DROM_HIGH) ||
+           (addr >= SOC_IROM_LOW && addr < SOC_IROM_HIGH) ||
+           (addr >= SOC_IRAM_LOW && addr < SOC_IRAM_HIGH) ||
+           (addr >= SOC_DRAM_LOW && addr < SOC_DRAM_HIGH) ||
+           (addr >= SOC_IROM_MASK_LOW && addr < SOC_IROM_MASK_HIGH) ||
+           (addr >= SOC_DROM_MASK_LOW && addr < SOC_DROM_MASK_HIGH) ||
+#if defined(SOC_RTC_IRAM_LOW) && defined(SOC_RTC_IRAM_HIGH)
+           (addr >= SOC_RTC_IRAM_LOW && addr < SOC_RTC_IRAM_HIGH) ||
+           /* RTC DRAM and RTC DATA are identical with RTC IRAM, hence we skip them */
+#endif
+           (addr >= SOC_PERIPHERAL_LOW && addr < SOC_PERIPHERAL_HIGH) ||
+           (addr >= SOC_DEBUG_LOW && addr < SOC_DEBUG_HIGH);
+}
+
+static inline bool is_valid_memory_region(intptr_t addr)
+{
+    /* We shouldn't read transport registers since it will disturb the debugging.  */
+    return (!is_transport_memory_region(addr)) && __is_valid_memory_region(addr);
+}
+
+#ifdef __cplusplus
+}
+#endif