From 48e711e103f6b38247298b7a08c26022482433c6 Mon Sep 17 00:00:00 2001 From: Sylvio Alves Date: Wed, 21 Dec 2022 14:09:03 -0300 Subject: [PATCH 1/2] overlays: xtensa_espressif_esp32s3: gdb: update xtensa-config.c This commit updates the `xtensa_tdep` global variable definition in the GDB `xtensa-config.c` to use the new type introduced in GDB 12.1. Signed-off-by: Sylvio Alves --- .../xtensa_espressif_esp32s3/gdb/gdb/xtensa-config.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/overlays/xtensa_espressif_esp32s3/gdb/gdb/xtensa-config.c b/overlays/xtensa_espressif_esp32s3/gdb/gdb/xtensa-config.c index bee2bca2..bc742f05 100644 --- a/overlays/xtensa_espressif_esp32s3/gdb/gdb/xtensa-config.c +++ b/overlays/xtensa_espressif_esp32s3/gdb/gdb/xtensa-config.c @@ -119,7 +119,7 @@ const xtensa_mask_t xtensa_mask42 = { 4, xtensa_submask42 }; /* Register map. */ -xtensa_register_t rmap[] = +static xtensa_register_t rmap[] = { /* idx ofs bi sz al targno flags cp typ group name */ XTREG( 0, 0,32, 4, 4,0x0020,0x0006,-2, 9,0x2100,pc, 0,0,0,0,0,0) @@ -493,9 +493,4 @@ xtensa_register_t rmap[] = XTREG_END }; - - -#ifdef XTENSA_CONFIG_INSTANTIATE -XTENSA_CONFIG_INSTANTIATE(rmap,16) -#endif - +xtensa_gdbarch_tdep xtensa_tdep (rmap); From 4339722b79d06f529f5821dea4b18879628268de Mon Sep 17 00:00:00 2001 From: Sylvio Alves Date: Wed, 21 Dec 2022 14:13:21 -0300 Subject: [PATCH 2/2] overlays: xtensa_espressif_esp32s3: gdb: rename xtensa-xtregs file 'xtensa-xtregs.c` file has been renamed to `xtensa-xtregs.cc` to meet GDB specs. Signed-off-by: Sylvio Alves --- .../gdb/gdb/gdbserver/{xtensa-xtregs.c => xtensa-xtregs.cc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename overlays/xtensa_espressif_esp32s3/gdb/gdb/gdbserver/{xtensa-xtregs.c => xtensa-xtregs.cc} (100%) diff --git a/overlays/xtensa_espressif_esp32s3/gdb/gdb/gdbserver/xtensa-xtregs.c b/overlays/xtensa_espressif_esp32s3/gdb/gdb/gdbserver/xtensa-xtregs.cc similarity index 100% rename from overlays/xtensa_espressif_esp32s3/gdb/gdb/gdbserver/xtensa-xtregs.c rename to overlays/xtensa_espressif_esp32s3/gdb/gdb/gdbserver/xtensa-xtregs.cc