* sparc-dis.c: Use fprintf_func a few places where I forgot,

and double percent signs a few places.
This commit is contained in:
Jim Kingdon 1993-04-01 23:24:57 +00:00
parent 7dcc06649a
commit 3245e377e4
1 changed files with 35 additions and 32 deletions

View File

@ -340,55 +340,56 @@ print_insn_sparc (memaddr, info)
case 'k': case 'k':
print_address ((bfd_vma) (*info->print_address_func)
(memaddr ((bfd_vma) (memaddr
+ (((int) insn.disp14 << 18) >> 18) * 4), + (((int) insn.disp14 << 18) >> 18) * 4),
stream); info);
break; break;
case 'G': case 'G':
print_address ((bfd_vma) (*info->print_address_func)
(memaddr ((bfd_vma) (memaddr
/* We use only 19 of the 21 bits. */ /* We use only 19 of the 21 bits. */
+ (((int) insn.disp21 << 13) >> 13) * 4), + (((int) insn.disp21 << 13) >> 13) * 4),
stream); info);
break; break;
case '6': case '6':
case '7': case '7':
case '8': case '8':
case '9': case '9':
fprintf (stream, "fcc%c", *s - '6' + '0'); (*info->fprintf_func) (stream, "fcc%c", *s - '6' + '0');
break; break;
case 'z': case 'z':
fputs ("icc", stream); (*info->fprintf_func) (stream, "icc");
break; break;
case 'Z': case 'Z':
fputs ("xcc", stream); (*info->fprintf_func) (stream, "xcc");
break; break;
case 'E': case 'E':
fputs ("%ccr", stream); (*info->fprintf_func) (stream, "%%ccr");
break; break;
case 's': case 's':
fputs ("%fprs", stream); (*info->fprintf_func) (stream, "%%fprs");
break; break;
#endif /* NO_V9 */ #endif /* NO_V9 */
case 'M': case 'M':
fprintf(stream, "%%asr%d", insn.rs1); (*info->fprintf_func) (stream, "%%asr%d", insn.rs1);
break; break;
case 'm': case 'm':
fprintf(stream, "%%asr%d", insn.rd); (*info->fprintf_func) (stream, "%%asr%d", insn.rd);
break; break;
case 'L': case 'L':
print_address ((bfd_vma) memaddr + insn.disp30 * 4, (*info->print_address_func)
stream); ((bfd_vma) memaddr + insn.disp30 * 4,
info);
break; break;
case 'l': case 'l':
@ -401,10 +402,10 @@ print_insn_sparc (memaddr, info)
else else
/* We cannot trust the compiler to sign-extend /* We cannot trust the compiler to sign-extend
when extracting the bitfield, hence the shifts. */ when extracting the bitfield, hence the shifts. */
print_address ((bfd_vma) (*info->print_address_func)
(memaddr ((bfd_vma) (memaddr
+ (((int) insn.disp22 << 10) >> 10) * 4), + (((int) insn.disp22 << 10) >> 10) * 4),
stream); info);
break; break;
case 'A': case 'A':
@ -412,35 +413,35 @@ print_insn_sparc (memaddr, info)
break; break;
case 'C': case 'C':
(*info->fprintf_func) (stream, "%csr"); (*info->fprintf_func) (stream, "%%csr");
break; break;
case 'F': case 'F':
(*info->fprintf_func) (stream, "%fsr"); (*info->fprintf_func) (stream, "%%fsr");
break; break;
case 'p': case 'p':
(*info->fprintf_func) (stream, "%psr"); (*info->fprintf_func) (stream, "%%psr");
break; break;
case 'q': case 'q':
(*info->fprintf_func) (stream, "%fq"); (*info->fprintf_func) (stream, "%%fq");
break; break;
case 'Q': case 'Q':
(*info->fprintf_func) (stream, "%cq"); (*info->fprintf_func) (stream, "%%cq");
break; break;
case 't': case 't':
(*info->fprintf_func) (stream, "%tbr"); (*info->fprintf_func) (stream, "%%tbr");
break; break;
case 'w': case 'w':
(*info->fprintf_func) (stream, "%wim"); (*info->fprintf_func) (stream, "%%wim");
break; break;
case 'y': case 'y':
(*info->fprintf_func) (stream, "%y"); (*info->fprintf_func) (stream, "%%y");
break; break;
} }
} }
@ -490,8 +491,10 @@ print_insn_sparc (memaddr, info)
(*info->fprintf_func) (stream, "\t! "); (*info->fprintf_func) (stream, "\t! ");
/* We cannot trust the compiler to sign-extend /* We cannot trust the compiler to sign-extend
when extracting the bitfield, hence the shifts. */ when extracting the bitfield, hence the shifts. */
print_address (((int) prev_insn.imm22 << 10) (*info->print_address_func)
| (insn.imm13 << 19) >> 19, stream); (((int) prev_insn.imm22 << 10)
| (insn.imm13 << 19) >> 19,
info);
} }
} }
} }