gdb: gdbserver: xtensa: make C0_NREGS available

Both gdb and gdbserver need this definition to properly work with call0
ABI. Make it available to both.

gdb/
2017-03-27  Max Filippov  <jcmvbkbc@gmail.com>

	* arch/xtensa.h (C0_NREGS): Add definition.
	* xtensa-tdep.c (C0_NREGS): Remove definition.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0490511..5687fad 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2017-03-27  Max Filippov  <jcmvbkbc@gmail.com>
 
+       * arch/xtensa.h (C0_NREGS): Add definition.
+       * xtensa-tdep.c (C0_NREGS): Remove definition.
+
+2017-03-27  Max Filippov  <jcmvbkbc@gmail.com>
+
        * xtensa-tdep.c (xtensa_scan_prologue, call0_analyze_prologue):
        Drop xtensa_default_isa initialization.
        (xtensa_gdbarch_init): Initialize xtensa_default_isa.

diff --git a/gdb/arch/xtensa.h b/gdb/arch/xtensa.h
index 2c328c8..63bbec6 100644 (file)
--- a/gdb/arch/xtensa.h
+++ b/gdb/arch/xtensa.h
@@ -43,4 +43,6 @@ typedef struct
 #define XTENSA_ELF_NGREG (sizeof (xtensa_elf_gregset_t) \
                          / sizeof (xtensa_elf_greg_t))
 
+#define C0_NREGS   16  /* Number of A-registers to track in call0 ABI.  */
+
 #endif

diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
index efbd5ab..0000155 100644 (file)
--- a/gdb/xtensa-tdep.c
+++ b/gdb/xtensa-tdep.c
@@ -942,7 +942,6 @@ typedef struct xtensa_windowed_frame_cache
 
 #define C0_MAXOPDS  3  /* Maximum number of operands for prologue
                           analysis.  */
-#define C0_NREGS   16  /* Number of A-registers to track.  */
 #define C0_CLESV   12  /* Callee-saved registers are here and up.  */
 #define C0_SP      1   /* Register used as SP.  */
 #define C0_FP     15   /* Register used as FP.  */