diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/0006-mips-dis.c-print_insn_micromips-Rename-local-variabl.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/0006-mips-dis.c-print_insn_micromips-Rename-local-variabl.patch | 634 |
1 files changed, 0 insertions, 634 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/0006-mips-dis.c-print_insn_micromips-Rename-local-variabl.patch b/meta/recipes-devtools/binutils/binutils/0006-mips-dis.c-print_insn_micromips-Rename-local-variabl.patch deleted file mode 100644 index 1baf1e839a..0000000000 --- a/meta/recipes-devtools/binutils/binutils/0006-mips-dis.c-print_insn_micromips-Rename-local-variabl.patch +++ /dev/null | |||
@@ -1,634 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | From f72b2c498bc98f42048a3bf7f7d7891db9cabcfc Mon Sep 17 00:00:00 2001 | ||
4 | From: Pierre Muller <muller@ics.u-strasbg.fr> | ||
5 | Date: Fri, 25 Nov 2011 16:57:32 +0000 | ||
6 | Subject: [PATCH 006/262] * mips-dis.c (print_insn_micromips): Rename | ||
7 | local variable iprintf to infprintf to | ||
8 | avoid shadow warning. | ||
9 | |||
10 | --- | ||
11 | opcodes/ChangeLog | 5 ++ | ||
12 | opcodes/mips-dis.c | 188 ++++++++++++++++++++++++++-------------------------- | ||
13 | 2 files changed, 99 insertions(+), 94 deletions(-) | ||
14 | |||
15 | 2011-11-25 Pierre Muller <muller@ics.u-strasbg.fr> | ||
16 | |||
17 | * mips-dis.c (print_insn_micromips): Rename local variable iprintf | ||
18 | to infprintf to avoid shadow warning. | ||
19 | |||
20 | diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c | ||
21 | index 4e18d8a..72285de 100644 | ||
22 | --- a/opcodes/mips-dis.c | ||
23 | +++ b/opcodes/mips-dis.c | ||
24 | @@ -2260,7 +2260,7 @@ print_insn_mips16 (bfd_vma memaddr, struct disassemble_info *info) | ||
25 | static int | ||
26 | print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
27 | { | ||
28 | - const fprintf_ftype iprintf = info->fprintf_func; | ||
29 | + const fprintf_ftype infprintf = info->fprintf_func; | ||
30 | const struct mips_opcode *op, *opend; | ||
31 | unsigned int lsb, msbd, msb; | ||
32 | void *is = info->stream; | ||
33 | @@ -2307,7 +2307,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
34 | status = (*info->read_memory_func) (memaddr + 2, buffer, 2, info); | ||
35 | if (status != 0) | ||
36 | { | ||
37 | - iprintf (is, "micromips 0x%x", higher); | ||
38 | + infprintf (is, "micromips 0x%x", higher); | ||
39 | (*info->memory_error_func) (status, memaddr + 2, info); | ||
40 | return -1; | ||
41 | } | ||
42 | @@ -2320,7 +2320,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
43 | status = (*info->read_memory_func) (memaddr + 4, buffer, 2, info); | ||
44 | if (status != 0) | ||
45 | { | ||
46 | - iprintf (is, "micromips 0x%x", higher); | ||
47 | + infprintf (is, "micromips 0x%x", higher); | ||
48 | (*info->memory_error_func) (status, memaddr + 4, info); | ||
49 | return -1; | ||
50 | } | ||
51 | @@ -2328,7 +2328,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
52 | insn = bfd_getb16 (buffer); | ||
53 | else | ||
54 | insn = bfd_getl16 (buffer); | ||
55 | - iprintf (is, "0x%x%04x (48-bit insn)", higher, insn); | ||
56 | + infprintf (is, "0x%x%04x (48-bit insn)", higher, insn); | ||
57 | |||
58 | info->insn_type = dis_noninsn; | ||
59 | return 6; | ||
60 | @@ -2341,7 +2341,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
61 | status = (*info->read_memory_func) (memaddr + 2, buffer, 2, info); | ||
62 | if (status != 0) | ||
63 | { | ||
64 | - iprintf (is, "micromips 0x%x", higher); | ||
65 | + infprintf (is, "micromips 0x%x", higher); | ||
66 | (*info->memory_error_func) (status, memaddr + 2, info); | ||
67 | return -1; | ||
68 | } | ||
69 | @@ -2371,9 +2371,9 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
70 | { | ||
71 | const char *s; | ||
72 | |||
73 | - iprintf (is, "%s", op->name); | ||
74 | + infprintf (is, "%s", op->name); | ||
75 | if (op->args[0] != '\0') | ||
76 | - iprintf (is, "\t"); | ||
77 | + infprintf (is, "\t"); | ||
78 | |||
79 | for (s = op->args; *s != '\0'; s++) | ||
80 | { | ||
81 | @@ -2382,37 +2382,37 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
82 | case ',': | ||
83 | case '(': | ||
84 | case ')': | ||
85 | - iprintf (is, "%c", *s); | ||
86 | + infprintf (is, "%c", *s); | ||
87 | break; | ||
88 | |||
89 | case '.': | ||
90 | delta = GET_OP (insn, OFFSET10); | ||
91 | if (delta & 0x200) | ||
92 | delta |= ~0x3ff; | ||
93 | - iprintf (is, "%d", delta); | ||
94 | + infprintf (is, "%d", delta); | ||
95 | break; | ||
96 | |||
97 | case '1': | ||
98 | - iprintf (is, "0x%lx", GET_OP (insn, STYPE)); | ||
99 | + infprintf (is, "0x%lx", GET_OP (insn, STYPE)); | ||
100 | break; | ||
101 | |||
102 | case '<': | ||
103 | - iprintf (is, "0x%lx", GET_OP (insn, SHAMT)); | ||
104 | + infprintf (is, "0x%lx", GET_OP (insn, SHAMT)); | ||
105 | break; | ||
106 | |||
107 | case '\\': | ||
108 | - iprintf (is, "0x%lx", GET_OP (insn, 3BITPOS)); | ||
109 | + infprintf (is, "0x%lx", GET_OP (insn, 3BITPOS)); | ||
110 | break; | ||
111 | |||
112 | case '|': | ||
113 | - iprintf (is, "0x%lx", GET_OP (insn, TRAP)); | ||
114 | + infprintf (is, "0x%lx", GET_OP (insn, TRAP)); | ||
115 | break; | ||
116 | |||
117 | case '~': | ||
118 | delta = GET_OP (insn, OFFSET12); | ||
119 | if (delta & 0x800) | ||
120 | delta |= ~0x7ff; | ||
121 | - iprintf (is, "%d", delta); | ||
122 | + infprintf (is, "%d", delta); | ||
123 | break; | ||
124 | |||
125 | case 'a': | ||
126 | @@ -2433,34 +2433,34 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
127 | case 'r': | ||
128 | case 's': | ||
129 | case 'v': | ||
130 | - iprintf (is, "%s", mips_gpr_names[GET_OP (insn, RS)]); | ||
131 | + infprintf (is, "%s", mips_gpr_names[GET_OP (insn, RS)]); | ||
132 | break; | ||
133 | |||
134 | case 'c': | ||
135 | - iprintf (is, "0x%lx", GET_OP (insn, CODE)); | ||
136 | + infprintf (is, "0x%lx", GET_OP (insn, CODE)); | ||
137 | break; | ||
138 | |||
139 | case 'd': | ||
140 | - iprintf (is, "%s", mips_gpr_names[GET_OP (insn, RD)]); | ||
141 | + infprintf (is, "%s", mips_gpr_names[GET_OP (insn, RD)]); | ||
142 | break; | ||
143 | |||
144 | case 'h': | ||
145 | - iprintf (is, "0x%lx", GET_OP (insn, PREFX)); | ||
146 | + infprintf (is, "0x%lx", GET_OP (insn, PREFX)); | ||
147 | break; | ||
148 | |||
149 | case 'i': | ||
150 | case 'u': | ||
151 | - iprintf (is, "0x%lx", GET_OP (insn, IMMEDIATE)); | ||
152 | + infprintf (is, "0x%lx", GET_OP (insn, IMMEDIATE)); | ||
153 | break; | ||
154 | |||
155 | case 'j': /* Same as i, but sign-extended. */ | ||
156 | case 'o': | ||
157 | delta = (GET_OP (insn, DELTA) ^ 0x8000) - 0x8000; | ||
158 | - iprintf (is, "%d", delta); | ||
159 | + infprintf (is, "%d", delta); | ||
160 | break; | ||
161 | |||
162 | case 'k': | ||
163 | - iprintf (is, "0x%x", GET_OP (insn, CACHE)); | ||
164 | + infprintf (is, "0x%x", GET_OP (insn, CACHE)); | ||
165 | break; | ||
166 | |||
167 | case 'n': | ||
168 | @@ -2472,26 +2472,26 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
169 | if (s_reg_encode != 0) | ||
170 | { | ||
171 | if (s_reg_encode == 1) | ||
172 | - iprintf (is, "%s", mips_gpr_names[16]); | ||
173 | + infprintf (is, "%s", mips_gpr_names[16]); | ||
174 | else if (s_reg_encode < 9) | ||
175 | - iprintf (is, "%s-%s", | ||
176 | + infprintf (is, "%s-%s", | ||
177 | mips_gpr_names[16], | ||
178 | mips_gpr_names[15 + s_reg_encode]); | ||
179 | else if (s_reg_encode == 9) | ||
180 | - iprintf (is, "%s-%s,%s", | ||
181 | + infprintf (is, "%s-%s,%s", | ||
182 | mips_gpr_names[16], | ||
183 | mips_gpr_names[23], | ||
184 | mips_gpr_names[30]); | ||
185 | else | ||
186 | - iprintf (is, "UNKNOWN"); | ||
187 | + infprintf (is, "UNKNOWN"); | ||
188 | } | ||
189 | |||
190 | if (immed & 0x10) /* For ra. */ | ||
191 | { | ||
192 | if (s_reg_encode == 0) | ||
193 | - iprintf (is, "%s", mips_gpr_names[31]); | ||
194 | + infprintf (is, "%s", mips_gpr_names[31]); | ||
195 | else | ||
196 | - iprintf (is, ",%s", mips_gpr_names[31]); | ||
197 | + infprintf (is, ",%s", mips_gpr_names[31]); | ||
198 | } | ||
199 | break; | ||
200 | } | ||
201 | @@ -2504,32 +2504,32 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
202 | break; | ||
203 | |||
204 | case 'q': | ||
205 | - iprintf (is, "0x%lx", GET_OP (insn, CODE2)); | ||
206 | + infprintf (is, "0x%lx", GET_OP (insn, CODE2)); | ||
207 | break; | ||
208 | |||
209 | case 't': | ||
210 | case 'w': | ||
211 | - iprintf (is, "%s", mips_gpr_names[GET_OP (insn, RT)]); | ||
212 | + infprintf (is, "%s", mips_gpr_names[GET_OP (insn, RT)]); | ||
213 | break; | ||
214 | |||
215 | case 'y': | ||
216 | - iprintf (is, "%s", mips_gpr_names[GET_OP (insn, RS3)]); | ||
217 | + infprintf (is, "%s", mips_gpr_names[GET_OP (insn, RS3)]); | ||
218 | break; | ||
219 | |||
220 | case 'z': | ||
221 | - iprintf (is, "%s", mips_gpr_names[0]); | ||
222 | + infprintf (is, "%s", mips_gpr_names[0]); | ||
223 | break; | ||
224 | |||
225 | case 'B': | ||
226 | - iprintf (is, "0x%lx", GET_OP (insn, CODE10)); | ||
227 | + infprintf (is, "0x%lx", GET_OP (insn, CODE10)); | ||
228 | break; | ||
229 | |||
230 | case 'C': | ||
231 | - iprintf (is, "0x%lx", GET_OP (insn, COPZ)); | ||
232 | + infprintf (is, "0x%lx", GET_OP (insn, COPZ)); | ||
233 | break; | ||
234 | |||
235 | case 'D': | ||
236 | - iprintf (is, "%s", mips_fpr_names[GET_OP (insn, FD)]); | ||
237 | + infprintf (is, "%s", mips_fpr_names[GET_OP (insn, FD)]); | ||
238 | break; | ||
239 | |||
240 | case 'E': | ||
241 | @@ -2540,7 +2540,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
242 | 'T' format. Therefore, until we gain understanding of | ||
243 | cp2 register names, we can simply print the register | ||
244 | numbers. */ | ||
245 | - iprintf (is, "$%ld", GET_OP (insn, RT)); | ||
246 | + infprintf (is, "$%ld", GET_OP (insn, RT)); | ||
247 | break; | ||
248 | |||
249 | case 'G': | ||
250 | @@ -2559,44 +2559,44 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
251 | case 0x000002fc: /* mtc0 */ | ||
252 | case 0x580000fc: /* dmfc0 */ | ||
253 | case 0x580002fc: /* dmtc0 */ | ||
254 | - iprintf (is, "%s", mips_cp0_names[GET_OP (insn, RS)]); | ||
255 | + infprintf (is, "%s", mips_cp0_names[GET_OP (insn, RS)]); | ||
256 | break; | ||
257 | default: | ||
258 | - iprintf (is, "$%ld", GET_OP (insn, RS)); | ||
259 | + infprintf (is, "$%ld", GET_OP (insn, RS)); | ||
260 | break; | ||
261 | } | ||
262 | break; | ||
263 | |||
264 | case 'H': | ||
265 | - iprintf (is, "%ld", GET_OP (insn, SEL)); | ||
266 | + infprintf (is, "%ld", GET_OP (insn, SEL)); | ||
267 | break; | ||
268 | |||
269 | case 'K': | ||
270 | - iprintf (is, "%s", mips_hwr_names[GET_OP (insn, RS)]); | ||
271 | + infprintf (is, "%s", mips_hwr_names[GET_OP (insn, RS)]); | ||
272 | break; | ||
273 | |||
274 | case 'M': | ||
275 | - iprintf (is, "$fcc%ld", GET_OP (insn, CCC)); | ||
276 | + infprintf (is, "$fcc%ld", GET_OP (insn, CCC)); | ||
277 | break; | ||
278 | |||
279 | case 'N': | ||
280 | - iprintf (is, | ||
281 | + infprintf (is, | ||
282 | (op->pinfo & (FP_D | FP_S)) != 0 | ||
283 | ? "$fcc%ld" : "$cc%ld", | ||
284 | GET_OP (insn, BCC)); | ||
285 | break; | ||
286 | |||
287 | case 'R': | ||
288 | - iprintf (is, "%s", mips_fpr_names[GET_OP (insn, FR)]); | ||
289 | + infprintf (is, "%s", mips_fpr_names[GET_OP (insn, FR)]); | ||
290 | break; | ||
291 | |||
292 | case 'S': | ||
293 | case 'V': | ||
294 | - iprintf (is, "%s", mips_fpr_names[GET_OP (insn, FS)]); | ||
295 | + infprintf (is, "%s", mips_fpr_names[GET_OP (insn, FS)]); | ||
296 | break; | ||
297 | |||
298 | case 'T': | ||
299 | - iprintf (is, "%s", mips_fpr_names[GET_OP (insn, FT)]); | ||
300 | + infprintf (is, "%s", mips_fpr_names[GET_OP (insn, FT)]); | ||
301 | break; | ||
302 | |||
303 | case '+': | ||
304 | @@ -2606,18 +2606,18 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
305 | { | ||
306 | case 'A': | ||
307 | lsb = GET_OP (insn, EXTLSB); | ||
308 | - iprintf (is, "0x%x", lsb); | ||
309 | + infprintf (is, "0x%x", lsb); | ||
310 | break; | ||
311 | |||
312 | case 'B': | ||
313 | msb = GET_OP (insn, INSMSB); | ||
314 | - iprintf (is, "0x%x", msb - lsb + 1); | ||
315 | + infprintf (is, "0x%x", msb - lsb + 1); | ||
316 | break; | ||
317 | |||
318 | case 'C': | ||
319 | case 'H': | ||
320 | msbd = GET_OP (insn, EXTMSBD); | ||
321 | - iprintf (is, "0x%x", msbd + 1); | ||
322 | + infprintf (is, "0x%x", msbd + 1); | ||
323 | break; | ||
324 | |||
325 | case 'D': | ||
326 | @@ -2637,30 +2637,30 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
327 | mips_cp0sel_names_len, | ||
328 | cp0reg, sel); | ||
329 | if (n != NULL) | ||
330 | - iprintf (is, "%s", n->name); | ||
331 | + infprintf (is, "%s", n->name); | ||
332 | else | ||
333 | - iprintf (is, "$%d,%d", cp0reg, sel); | ||
334 | + infprintf (is, "$%d,%d", cp0reg, sel); | ||
335 | break; | ||
336 | } | ||
337 | |||
338 | case 'E': | ||
339 | lsb = GET_OP (insn, EXTLSB) + 32; | ||
340 | - iprintf (is, "0x%x", lsb); | ||
341 | + infprintf (is, "0x%x", lsb); | ||
342 | break; | ||
343 | |||
344 | case 'F': | ||
345 | msb = GET_OP (insn, INSMSB) + 32; | ||
346 | - iprintf (is, "0x%x", msb - lsb + 1); | ||
347 | + infprintf (is, "0x%x", msb - lsb + 1); | ||
348 | break; | ||
349 | |||
350 | case 'G': | ||
351 | msbd = GET_OP (insn, EXTMSBD) + 32; | ||
352 | - iprintf (is, "0x%x", msbd + 1); | ||
353 | + infprintf (is, "0x%x", msbd + 1); | ||
354 | break; | ||
355 | |||
356 | default: | ||
357 | /* xgettext:c-format */ | ||
358 | - iprintf (is, | ||
359 | + infprintf (is, | ||
360 | _("# internal disassembler error, " | ||
361 | "unrecognized modifier (+%c)"), | ||
362 | *s); | ||
363 | @@ -2674,111 +2674,111 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
364 | switch (*s) | ||
365 | { | ||
366 | case 'a': /* global pointer. */ | ||
367 | - iprintf (is, "%s", mips_gpr_names[28]); | ||
368 | + infprintf (is, "%s", mips_gpr_names[28]); | ||
369 | break; | ||
370 | |||
371 | case 'b': | ||
372 | regno = micromips_to_32_reg_b_map[GET_OP (insn, MB)]; | ||
373 | - iprintf (is, "%s", mips_gpr_names[regno]); | ||
374 | + infprintf (is, "%s", mips_gpr_names[regno]); | ||
375 | break; | ||
376 | |||
377 | case 'c': | ||
378 | regno = micromips_to_32_reg_c_map[GET_OP (insn, MC)]; | ||
379 | - iprintf (is, "%s", mips_gpr_names[regno]); | ||
380 | + infprintf (is, "%s", mips_gpr_names[regno]); | ||
381 | break; | ||
382 | |||
383 | case 'd': | ||
384 | regno = micromips_to_32_reg_d_map[GET_OP (insn, MD)]; | ||
385 | - iprintf (is, "%s", mips_gpr_names[regno]); | ||
386 | + infprintf (is, "%s", mips_gpr_names[regno]); | ||
387 | break; | ||
388 | |||
389 | case 'e': | ||
390 | regno = micromips_to_32_reg_e_map[GET_OP (insn, ME)]; | ||
391 | - iprintf (is, "%s", mips_gpr_names[regno]); | ||
392 | + infprintf (is, "%s", mips_gpr_names[regno]); | ||
393 | break; | ||
394 | |||
395 | case 'f': | ||
396 | /* Save lastregno for "mt" to print out later. */ | ||
397 | lastregno = micromips_to_32_reg_f_map[GET_OP (insn, MF)]; | ||
398 | - iprintf (is, "%s", mips_gpr_names[lastregno]); | ||
399 | + infprintf (is, "%s", mips_gpr_names[lastregno]); | ||
400 | break; | ||
401 | |||
402 | case 'g': | ||
403 | regno = micromips_to_32_reg_g_map[GET_OP (insn, MG)]; | ||
404 | - iprintf (is, "%s", mips_gpr_names[regno]); | ||
405 | + infprintf (is, "%s", mips_gpr_names[regno]); | ||
406 | break; | ||
407 | |||
408 | case 'h': | ||
409 | regno = micromips_to_32_reg_h_map[GET_OP (insn, MH)]; | ||
410 | - iprintf (is, "%s", mips_gpr_names[regno]); | ||
411 | + infprintf (is, "%s", mips_gpr_names[regno]); | ||
412 | break; | ||
413 | |||
414 | case 'i': | ||
415 | regno = micromips_to_32_reg_i_map[GET_OP (insn, MI)]; | ||
416 | - iprintf (is, "%s", mips_gpr_names[regno]); | ||
417 | + infprintf (is, "%s", mips_gpr_names[regno]); | ||
418 | break; | ||
419 | |||
420 | case 'j': | ||
421 | - iprintf (is, "%s", mips_gpr_names[GET_OP (insn, MJ)]); | ||
422 | + infprintf (is, "%s", mips_gpr_names[GET_OP (insn, MJ)]); | ||
423 | break; | ||
424 | |||
425 | case 'l': | ||
426 | regno = micromips_to_32_reg_l_map[GET_OP (insn, ML)]; | ||
427 | - iprintf (is, "%s", mips_gpr_names[regno]); | ||
428 | + infprintf (is, "%s", mips_gpr_names[regno]); | ||
429 | break; | ||
430 | |||
431 | case 'm': | ||
432 | regno = micromips_to_32_reg_m_map[GET_OP (insn, MM)]; | ||
433 | - iprintf (is, "%s", mips_gpr_names[regno]); | ||
434 | + infprintf (is, "%s", mips_gpr_names[regno]); | ||
435 | break; | ||
436 | |||
437 | case 'n': | ||
438 | regno = micromips_to_32_reg_n_map[GET_OP (insn, MN)]; | ||
439 | - iprintf (is, "%s", mips_gpr_names[regno]); | ||
440 | + infprintf (is, "%s", mips_gpr_names[regno]); | ||
441 | break; | ||
442 | |||
443 | case 'p': | ||
444 | /* Save lastregno for "mt" to print out later. */ | ||
445 | lastregno = GET_OP (insn, MP); | ||
446 | - iprintf (is, "%s", mips_gpr_names[lastregno]); | ||
447 | + infprintf (is, "%s", mips_gpr_names[lastregno]); | ||
448 | break; | ||
449 | |||
450 | case 'q': | ||
451 | regno = micromips_to_32_reg_q_map[GET_OP (insn, MQ)]; | ||
452 | - iprintf (is, "%s", mips_gpr_names[regno]); | ||
453 | + infprintf (is, "%s", mips_gpr_names[regno]); | ||
454 | break; | ||
455 | |||
456 | case 'r': /* program counter. */ | ||
457 | - iprintf (is, "$pc"); | ||
458 | + infprintf (is, "$pc"); | ||
459 | break; | ||
460 | |||
461 | case 's': /* stack pointer. */ | ||
462 | lastregno = 29; | ||
463 | - iprintf (is, "%s", mips_gpr_names[29]); | ||
464 | + infprintf (is, "%s", mips_gpr_names[29]); | ||
465 | break; | ||
466 | |||
467 | case 't': | ||
468 | - iprintf (is, "%s", mips_gpr_names[lastregno]); | ||
469 | + infprintf (is, "%s", mips_gpr_names[lastregno]); | ||
470 | break; | ||
471 | |||
472 | case 'z': /* $0. */ | ||
473 | - iprintf (is, "%s", mips_gpr_names[0]); | ||
474 | + infprintf (is, "%s", mips_gpr_names[0]); | ||
475 | break; | ||
476 | |||
477 | case 'A': | ||
478 | /* Sign-extend the immediate. */ | ||
479 | immed = ((GET_OP (insn, IMMA) ^ 0x40) - 0x40) << 2; | ||
480 | - iprintf (is, "%d", immed); | ||
481 | + infprintf (is, "%d", immed); | ||
482 | break; | ||
483 | |||
484 | case 'B': | ||
485 | immed = micromips_imm_b_map[GET_OP (insn, IMMB)]; | ||
486 | - iprintf (is, "%d", immed); | ||
487 | + infprintf (is, "%d", immed); | ||
488 | break; | ||
489 | |||
490 | case 'C': | ||
491 | immed = micromips_imm_c_map[GET_OP (insn, IMMC)]; | ||
492 | - iprintf (is, "0x%lx", immed); | ||
493 | + infprintf (is, "0x%lx", immed); | ||
494 | break; | ||
495 | |||
496 | case 'D': | ||
497 | @@ -2797,50 +2797,50 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
498 | |||
499 | case 'F': | ||
500 | immed = GET_OP (insn, IMMF); | ||
501 | - iprintf (is, "0x%x", immed); | ||
502 | + infprintf (is, "0x%x", immed); | ||
503 | break; | ||
504 | |||
505 | case 'G': | ||
506 | immed = (insn >> MICROMIPSOP_SH_IMMG) + 1; | ||
507 | immed = (immed & MICROMIPSOP_MASK_IMMG) - 1; | ||
508 | - iprintf (is, "%d", immed); | ||
509 | + infprintf (is, "%d", immed); | ||
510 | break; | ||
511 | |||
512 | case 'H': | ||
513 | immed = GET_OP (insn, IMMH) << 1; | ||
514 | - iprintf (is, "%d", immed); | ||
515 | + infprintf (is, "%d", immed); | ||
516 | break; | ||
517 | |||
518 | case 'I': | ||
519 | immed = (insn >> MICROMIPSOP_SH_IMMI) + 1; | ||
520 | immed = (immed & MICROMIPSOP_MASK_IMMI) - 1; | ||
521 | - iprintf (is, "%d", immed); | ||
522 | + infprintf (is, "%d", immed); | ||
523 | break; | ||
524 | |||
525 | case 'J': | ||
526 | immed = GET_OP (insn, IMMJ) << 2; | ||
527 | - iprintf (is, "%d", immed); | ||
528 | + infprintf (is, "%d", immed); | ||
529 | break; | ||
530 | |||
531 | case 'L': | ||
532 | immed = GET_OP (insn, IMML); | ||
533 | - iprintf (is, "%d", immed); | ||
534 | + infprintf (is, "%d", immed); | ||
535 | break; | ||
536 | |||
537 | case 'M': | ||
538 | immed = (insn >> MICROMIPSOP_SH_IMMM) - 1; | ||
539 | immed = (immed & MICROMIPSOP_MASK_IMMM) + 1; | ||
540 | - iprintf (is, "%d", immed); | ||
541 | + infprintf (is, "%d", immed); | ||
542 | break; | ||
543 | |||
544 | case 'N': | ||
545 | immed = GET_OP (insn, IMMN); | ||
546 | if (immed == 0) | ||
547 | - iprintf (is, "%s,%s", | ||
548 | + infprintf (is, "%s,%s", | ||
549 | mips_gpr_names[16], | ||
550 | mips_gpr_names[31]); | ||
551 | else | ||
552 | - iprintf (is, "%s-%s,%s", | ||
553 | + infprintf (is, "%s-%s,%s", | ||
554 | mips_gpr_names[16], | ||
555 | mips_gpr_names[16 + immed], | ||
556 | mips_gpr_names[31]); | ||
557 | @@ -2848,35 +2848,35 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
558 | |||
559 | case 'O': | ||
560 | immed = GET_OP (insn, IMMO); | ||
561 | - iprintf (is, "0x%x", immed); | ||
562 | + infprintf (is, "0x%x", immed); | ||
563 | break; | ||
564 | |||
565 | case 'P': | ||
566 | immed = GET_OP (insn, IMMP) << 2; | ||
567 | - iprintf (is, "%d", immed); | ||
568 | + infprintf (is, "%d", immed); | ||
569 | break; | ||
570 | |||
571 | case 'Q': | ||
572 | /* Sign-extend the immediate. */ | ||
573 | immed = (GET_OP (insn, IMMQ) ^ 0x400000) - 0x400000; | ||
574 | immed <<= 2; | ||
575 | - iprintf (is, "%d", immed); | ||
576 | + infprintf (is, "%d", immed); | ||
577 | break; | ||
578 | |||
579 | case 'U': | ||
580 | immed = GET_OP (insn, IMMU) << 2; | ||
581 | - iprintf (is, "%d", immed); | ||
582 | + infprintf (is, "%d", immed); | ||
583 | break; | ||
584 | |||
585 | case 'W': | ||
586 | immed = GET_OP (insn, IMMW) << 2; | ||
587 | - iprintf (is, "%d", immed); | ||
588 | + infprintf (is, "%d", immed); | ||
589 | break; | ||
590 | |||
591 | case 'X': | ||
592 | /* Sign-extend the immediate. */ | ||
593 | immed = (GET_OP (insn, IMMX) ^ 0x8) - 0x8; | ||
594 | - iprintf (is, "%d", immed); | ||
595 | + infprintf (is, "%d", immed); | ||
596 | break; | ||
597 | |||
598 | case 'Y': | ||
599 | @@ -2885,12 +2885,12 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
600 | if (immed >= -2 && immed <= 1) | ||
601 | immed ^= 0x100; | ||
602 | immed = immed << 2; | ||
603 | - iprintf (is, "%d", immed); | ||
604 | + infprintf (is, "%d", immed); | ||
605 | break; | ||
606 | |||
607 | default: | ||
608 | /* xgettext:c-format */ | ||
609 | - iprintf (is, | ||
610 | + infprintf (is, | ||
611 | _("# internal disassembler error, " | ||
612 | "unrecognized modifier (m%c)"), | ||
613 | *s); | ||
614 | @@ -2900,7 +2900,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
615 | |||
616 | default: | ||
617 | /* xgettext:c-format */ | ||
618 | - iprintf (is, | ||
619 | + infprintf (is, | ||
620 | _("# internal disassembler error, " | ||
621 | "unrecognized modifier (%c)"), | ||
622 | *s); | ||
623 | @@ -2937,7 +2937,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info) | ||
624 | } | ||
625 | #undef GET_OP | ||
626 | |||
627 | - iprintf (is, "0x%x", insn); | ||
628 | + infprintf (is, "0x%x", insn); | ||
629 | info->insn_type = dis_noninsn; | ||
630 | |||
631 | return length; | ||
632 | -- | ||
633 | 1.7.9.5 | ||
634 | |||