From b450dffa8b5b5a07fe0edaf77bb11a075e3ba567 Mon Sep 17 00:00:00 2001 From: Armando Date: Fri, 11 Aug 2023 11:41:05 +0800 Subject: [PATCH] fix(gdb): removed wrongly added esp32p4 files --- .../esp_gdbstub/esp32p4/gdbstub_esp32p4.c | 141 ------------------ .../esp32p4/gdbstub_target_config.h | 7 - 2 files changed, 148 deletions(-) delete mode 100644 components/esp_gdbstub/esp32p4/gdbstub_esp32p4.c delete mode 100644 components/esp_gdbstub/esp32p4/gdbstub_target_config.h diff --git a/components/esp_gdbstub/esp32p4/gdbstub_esp32p4.c b/components/esp_gdbstub/esp32p4/gdbstub_esp32p4.c deleted file mode 100644 index 63db86f4f2..0000000000 --- a/components/esp_gdbstub/esp32p4/gdbstub_esp32p4.c +++ /dev/null @@ -1,141 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - - -#include "soc/uart_periph.h" -#include "soc/gpio_periph.h" -#include "soc/soc.h" -#include "soc/usb_serial_jtag_struct.h" -#include "hal/usb_serial_jtag_ll.h" -#include "esp_gdbstub_common.h" -#include "sdkconfig.h" - -#define UART_NUM CONFIG_ESP_CONSOLE_UART_NUM - -#define GDBSTUB_MEM_REGION_COUNT 10 - -#define UART_REG_FIELD_LEN 0x84 - -typedef struct { - intptr_t lower; - intptr_t upper; -} mem_bound_t; - -static const mem_bound_t mem_region_table [GDBSTUB_MEM_REGION_COUNT] = -{ - {SOC_DROM_LOW, SOC_DROM_HIGH}, - {SOC_IROM_LOW, SOC_IROM_HIGH}, - {SOC_IRAM_LOW, SOC_IRAM_HIGH}, - {SOC_DRAM_LOW, SOC_DRAM_HIGH}, - {SOC_IROM_MASK_LOW, SOC_IROM_MASK_HIGH}, - {SOC_DROM_MASK_LOW, SOC_DROM_MASK_HIGH}, - {SOC_TCM_LOW, SOC_TCM_HIGH}, - {SOC_RTC_IRAM_LOW, SOC_RTC_IRAM_HIGH}, - // RTC DRAM and RTC DATA are identical with RTC IRAM, hence we skip them - // We shouldn't read the uart registers since it will disturb the debugging via UART, - // so skip UART part of the peripheral registers. - {DR_REG_UART_BASE + UART_REG_FIELD_LEN, SOC_PERIPHERAL_HIGH}, - {SOC_DEBUG_LOW, SOC_DEBUG_HIGH}, -}; - -static inline bool check_inside_valid_region(intptr_t addr) -{ - for (size_t i = 0; i < GDBSTUB_MEM_REGION_COUNT; i++) { - if (addr >= mem_region_table[i].lower && addr < mem_region_table[i].upper) { - return true; - } - } - - return false; -} - -void esp_gdbstub_target_init() -{ -} - -#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG - -int esp_gdbstub_getchar() -{ - uint8_t c; - //retry the read until we succeed - while (usb_serial_jtag_ll_read_rxfifo(&c, 1)==0) ; - return c; -} - -void esp_gdbstub_putchar(int c) -{ - uint8_t cc=c; - //retry the write until we succeed - while (usb_serial_jtag_ll_write_txfifo(&cc, 1)<1) ; -} - -void esp_gdbstub_flush() -{ - usb_serial_jtag_ll_txfifo_flush(); -} - - -#else - -//assume UART gdbstub channel - -int esp_gdbstub_getchar() -{ - while (REG_GET_FIELD(UART_STATUS_REG(UART_NUM), UART_RXFIFO_CNT) == 0) { - ; - } - return REG_READ(UART_FIFO_AHB_REG(UART_NUM)); -} - -void esp_gdbstub_putchar(int c) -{ - while (REG_GET_FIELD(UART_STATUS_REG(UART_NUM), UART_TXFIFO_CNT) >= 126) { - ; - } - REG_WRITE(UART_FIFO_AHB_REG(UART_NUM), c); -} - -void esp_gdbstub_flush() -{ - //not needed for uart -} - -#endif - -int esp_gdbstub_readmem(intptr_t addr) -{ - if (!check_inside_valid_region(addr)) { - /* see esp_cpu_configure_region_protection */ - return -1; - } - uint32_t val_aligned = *(uint32_t *)(addr & (~3)); - uint32_t shift = (addr & 3) * 8; - return (val_aligned >> shift) & 0xff; -} - -int esp_gdbstub_writemem(unsigned int addr, unsigned char data) -{ - if (!check_inside_valid_region(addr)) { - /* see esp_cpu_configure_region_protection */ - return -1; - } - - int *i = (int *)(addr & (~3)); - if ((addr & 3) == 0) { - *i = (*i & 0xffffff00) | (data << 0); - } - if ((addr & 3) == 1) { - *i = (*i & 0xffff00ff) | (data << 8); - } - if ((addr & 3) == 2) { - *i = (*i & 0xff00ffff) | (data << 16); - } - if ((addr & 3) == 3) { - *i = (*i & 0x00ffffff) | (data << 24); - } - return 0; -} diff --git a/components/esp_gdbstub/esp32p4/gdbstub_target_config.h b/components/esp_gdbstub/esp32p4/gdbstub_target_config.h deleted file mode 100644 index d2aa55b41e..0000000000 --- a/components/esp_gdbstub/esp32p4/gdbstub_target_config.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#pragma once