aboutsummaryrefslogtreecommitdiffstats
path: root/meta-microblaze/recipes-devtools/binutils/binutils/0053-gdb-Fix-microblaze-target-compilation.patch
blob: af0e326889ee98589a4c3ccf3c7bebb85d65576f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
From efa3750ffda1ae16caf071b8b8ea31f752a3324a Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@kernel.crashing.org>
Date: Mon, 7 Dec 2020 12:03:25 -0600
Subject: [PATCH] gdb: Fix microblaze target compilation

Add microblaze-linux-nat.c to configure.nat

Transition microblaze-linux-nat.c to use the new gdb C++ style functions.

Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
---
 gdb/configure.nat          |  5 ++
 gdb/microblaze-linux-nat.c | 96 ++++++++++++++------------------------
 gdb/microblaze-tdep.h      |  3 ++
 3 files changed, 43 insertions(+), 61 deletions(-)

diff --git a/gdb/configure.nat b/gdb/configure.nat
index 6ea2583495..1fba80f6c9 100644
--- a/gdb/configure.nat
+++ b/gdb/configure.nat
@@ -261,6 +261,11 @@ case ${gdb_host} in
 		# Host: Motorola m68k running GNU/Linux.
 		NATDEPFILES="${NATDEPFILES} m68k-linux-nat.o"
 		;;
+	    microblaze)
+		# Host: Microblaze running GNU/Linux.
+		NATDEPFILES="${NATDEPFILES} microblaze-linux-nat.o"
+		NAT_CDEPS=
+		;;
 	    mips)
 		# Host: Linux/MIPS
 		NATDEPFILES="${NATDEPFILES} linux-nat-trad.o \
diff --git a/gdb/microblaze-linux-nat.c b/gdb/microblaze-linux-nat.c
index e9b8c9c522..bac4697e1e 100644
--- a/gdb/microblaze-linux-nat.c
+++ b/gdb/microblaze-linux-nat.c
@@ -36,13 +36,14 @@
 #include "dwarf2-frame.h"
 #include "osabi.h"
 
-#include "gdb_assert.h"
-#include "gdb_string.h"
+#include "gdbsupport/gdb_assert.h"
+#include <string.h>
 #include "target-descriptions.h"
 #include "opcodes/microblaze-opcm.h"
 #include "opcodes/microblaze-dis.h"
 
 #include "linux-nat.h"
+#include "linux-tdep.h"
 #include "target-descriptions.h"
 
 #include <sys/user.h>
@@ -61,22 +62,17 @@
 /* Defines ps_err_e, struct ps_prochandle.  */
 #include "gdb_proc_service.h"
 
-/* On GNU/Linux, threads are implemented as pseudo-processes, in which
-   case we may be tracing more than one process at a time.  In that
-   case, inferior_ptid will contain the main process ID and the
-   individual thread (process) ID.  get_thread_id () is used to get
-   the thread id if it's available, and the process id otherwise.  */
-
-int
-get_thread_id (ptid_t ptid)
+class microblaze_linux_nat_target final : public linux_nat_target
 {
-  int tid = TIDGET (ptid);
-  if (0 == tid)
-    tid = PIDGET (ptid);
-  return tid;
-}
+public:
+  /* Add our register access methods.  */
+  void fetch_registers (struct regcache *, int) override;
+  void store_registers (struct regcache *, int) override;
+
+  const struct target_desc *read_description () override;
+};
 
-#define GET_THREAD_ID(PTID)	get_thread_id (PTID)
+static microblaze_linux_nat_target the_microblaze_linux_nat_target;
 
 /* Non-zero if our kernel may support the PTRACE_GETREGS and
    PTRACE_SETREGS requests, for reading and writing the
@@ -88,7 +84,6 @@ static int
 microblaze_register_u_addr (struct gdbarch *gdbarch, int regno)
 {
   int u_addr = -1;
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
   /* NOTE: cagney/2003-11-25: This is the word size used by the ptrace
      interface, and not the wordsize of the program's ABI.  */
   int wordsize = sizeof (long);
@@ -105,18 +100,16 @@ microblaze_register_u_addr (struct gdbarch *gdbarch, int regno)
 static void
 fetch_register (struct regcache *regcache, int tid, int regno)
 {
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+  struct gdbarch *gdbarch = regcache->arch ();
   /* This isn't really an address.  But ptrace thinks of it as one.  */
   CORE_ADDR regaddr = microblaze_register_u_addr (gdbarch, regno);
   int bytes_transferred;
-  unsigned int offset;         /* Offset of registers within the u area.  */
-  char buf[MAX_REGISTER_SIZE];
+  char buf[MICROBLAZE_MAX_REGISTER_SIZE];
 
   if (regaddr == -1)
   {
     memset (buf, '\0', register_size (gdbarch, regno));   /* Supply zeroes */
-    regcache_raw_supply (regcache, regno, buf);
+    regcache->raw_supply (regno, buf);
     return;
   }
 
@@ -149,14 +142,14 @@ fetch_register (struct regcache *regcache, int tid, int regno)
   {
     /* Little-endian values are always found at the left end of the
        bytes transferred.  */
-    regcache_raw_supply (regcache, regno, buf);
+    regcache->raw_supply (regno, buf);
   }
   else if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)
   {
     /* Big-endian values are found at the right end of the bytes
        transferred.  */
     size_t padding = (bytes_transferred - register_size (gdbarch, regno));
-    regcache_raw_supply (regcache, regno, buf + padding);
+    regcache->raw_supply (regno, buf + padding);
   }
   else
     internal_error (__FILE__, __LINE__,
@@ -175,8 +168,6 @@ fetch_register (struct regcache *regcache, int tid, int regno)
 static int
 fetch_all_gp_regs (struct regcache *regcache, int tid)
 {
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
   gdb_gregset_t gregset;
 
   if (ptrace (PTRACE_GETREGS, tid, 0, (void *) &gregset) < 0)
@@ -204,8 +195,6 @@ fetch_all_gp_regs (struct regcache *regcache, int tid)
 static void
 fetch_gp_regs (struct regcache *regcache, int tid)
 {
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
   int i;
 
   if (have_ptrace_getsetregs)
@@ -223,13 +212,12 @@ fetch_gp_regs (struct regcache *regcache, int tid)
 static void
 store_register (const struct regcache *regcache, int tid, int regno)
 {
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+  struct gdbarch *gdbarch = regcache->arch ();
   /* This isn't really an address.  But ptrace thinks of it as one.  */
   CORE_ADDR regaddr = microblaze_register_u_addr (gdbarch, regno);
   int i;
   size_t bytes_to_transfer;
-  char buf[MAX_REGISTER_SIZE];
+  char buf[MICROBLAZE_MAX_REGISTER_SIZE];
 
   if (regaddr == -1)
     return;
@@ -242,13 +230,13 @@ store_register (const struct regcache *regcache, int tid, int regno)
   if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_LITTLE)
   {
     /* Little-endian values always sit at the left end of the buffer.  */
-    regcache_raw_collect (regcache, regno, buf);
+    regcache->raw_collect (regno, buf);
   }
   else if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)
   {
     /* Big-endian values sit at the right end of the buffer.  */
     size_t padding = (bytes_to_transfer - register_size (gdbarch, regno));
-    regcache_raw_collect (regcache, regno, buf + padding);
+    regcache->raw_collect (regno, buf + padding);
   }
 
   for (i = 0; i < bytes_to_transfer; i += sizeof (long))
@@ -281,8 +269,6 @@ store_register (const struct regcache *regcache, int tid, int regno)
 static int
 store_all_gp_regs (const struct regcache *regcache, int tid, int regno)
 {
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
   gdb_gregset_t gregset;
 
   if (ptrace (PTRACE_GETREGS, tid, 0, (void *) &gregset) < 0)
@@ -319,8 +305,6 @@ store_all_gp_regs (const struct regcache *regcache, int tid, int regno)
 static void
 store_gp_regs (const struct regcache *regcache, int tid, int regno)
 {
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
   int i;
 
   if (have_ptrace_getsetregs)
@@ -339,12 +323,12 @@ store_gp_regs (const struct regcache *regcache, int tid, int regno)
    regno == -1, otherwise fetch all general registers or all floating
    point registers depending upon the value of regno.  */
 
-static void
-microblaze_linux_fetch_inferior_registers (struct target_ops *ops,
-				    struct regcache *regcache, int regno)
+void
+microblaze_linux_nat_target::fetch_registers (struct regcache * regcache,
+                                              int regno)
 {
   /* Get the thread id for the ptrace call.  */
-  int tid = GET_THREAD_ID (inferior_ptid);
+  int tid = regcache->ptid ().lwp ();
 
   if (regno == -1)
     fetch_gp_regs (regcache, tid);
@@ -356,12 +340,12 @@ microblaze_linux_fetch_inferior_registers (struct target_ops *ops,
    regno == -1, otherwise store all general registers or all floating
    point registers depending upon the value of regno.  */
 
-static void
-microblaze_linux_store_inferior_registers (struct target_ops *ops,
-				    struct regcache *regcache, int regno)
+void
+microblaze_linux_nat_target::store_registers (struct regcache *regcache,
+                                              int regno)
 {
   /* Get the thread id for the ptrace call.  */
-  int tid = GET_THREAD_ID (inferior_ptid);
+  int tid = regcache->ptid ().lwp ();
 
   if (regno >= 0)
     store_register (regcache, tid, regno);
@@ -398,12 +382,12 @@ supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregsetp)
   /* FIXME. */
 }
 
-static const struct target_desc *
-microblaze_linux_read_description (struct target_ops *ops)
+const struct target_desc *
+microblaze_linux_nat_target::read_description ()
 {
-  CORE_ADDR microblaze_hwcap = 0;
+  CORE_ADDR microblaze_hwcap = linux_get_hwcap (this);
 
-  if (target_auxv_search (ops, AT_HWCAP, &microblaze_hwcap) != 1)
+  if (microblaze_hwcap != 1)
     return NULL;
 
   return NULL;
@@ -415,17 +399,7 @@ void _initialize_microblaze_linux_nat (void);
 void
 _initialize_microblaze_linux_nat (void)
 {
-  struct target_ops *t;
-
-  /* Fill in the generic GNU/Linux methods.  */
-  t = linux_target ();
-
-  /* Add our register access methods.  */
-  t->to_fetch_registers = microblaze_linux_fetch_inferior_registers;
-  t->to_store_registers = microblaze_linux_store_inferior_registers;
-
-  t->to_read_description = microblaze_linux_read_description;
-
   /* Register the target.  */
-  linux_nat_add_target (t);
+  linux_target = &the_microblaze_linux_nat_target;
+  add_inf_child_target (&the_microblaze_linux_nat_target);
 }
diff --git a/gdb/microblaze-tdep.h b/gdb/microblaze-tdep.h
index c0fc900733..c777d93a95 100644
--- a/gdb/microblaze-tdep.h
+++ b/gdb/microblaze-tdep.h
@@ -106,6 +106,9 @@ enum microblaze_regnum
   MICROBLAZE_NUM_REGS, MICROBLAZE_NUM_CORE_REGS = MICROBLAZE_NUM_REGS
 };
 
+/* Big enough to hold the size of the largest register in bytes.  */
+#define MICROBLAZE_MAX_REGISTER_SIZE   64
+
 struct microblaze_frame_cache
 {
   /* Base address.  */
-- 
2.17.1