From d85cdfabd5786958c709d586792a49860b4397ae Mon Sep 17 00:00:00 2001 From: Jason Thorpe Date: Thu, 9 May 2002 23:11:30 +0000 Subject: [PATCH] * vax-dis.c (print_insn_arg): Pass the insn info to print_insn_mode. (print_insn_mode): Print some basic info about floating point values. --- opcodes/ChangeLog | 5 +++++ opcodes/vax-dis.c | 42 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index b8887914ee0..9db7dec8ee9 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2002-04-28 Jason Thorpe + + * vax-dis.c (print_insn_arg): Pass the insn info to print_insn_mode. + (print_insn_mode): Print some basic info about floating point values. + 2002-05-09 Anton Blanchard * ppc-opc.c: Add "tlbiel" for POWER4. diff --git a/opcodes/vax-dis.c b/opcodes/vax-dis.c index db39bfadb0a..a97d4cd2578 100644 --- a/opcodes/vax-dis.c +++ b/opcodes/vax-dis.c @@ -1,5 +1,5 @@ /* Print VAX instructions. - Copyright 1995, 1998, 2000, 2001 Free Software Foundation, Inc. + Copyright 1995, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. Contributed by Pauline Middelink This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ static int fetch_data PARAMS ((struct disassemble_info *, bfd_byte *)); static int print_insn_arg PARAMS ((const char *, unsigned char *, bfd_vma, disassemble_info *)); static int print_insn_mode - PARAMS ((int, unsigned char *, bfd_vma, disassemble_info *)); + PARAMS ((const char *, int, unsigned char *, bfd_vma, disassemble_info *)); static char *reg_names[] = @@ -223,11 +223,12 @@ print_insn_arg (d, p0, addr, info) return p - p0; } - return print_insn_mode (arg_len, p0, addr, info); + return print_insn_mode (d, arg_len, p0, addr, info); } static int -print_insn_mode (size, p0, addr, info) +print_insn_mode (d, size, p0, addr, info) + const char *d; int size; unsigned char *p0; bfd_vma addr; /* PC for this arg to be relative to */ @@ -245,10 +246,13 @@ print_insn_mode (size, p0, addr, info) case 0x10: case 0x20: case 0x30: /* literal mode $number */ - (*info->fprintf_func) (info->stream, "$0x%x", mode); + if (d[1] == 'd' || d[1] == 'f' || d[1] == 'g' || d[1] == 'h') + (*info->fprintf_func) (info->stream, "$0x%x [%c-float]", mode, d[1]); + else + (*info->fprintf_func) (info->stream, "$0x%x", mode); break; case 0x40: /* index: base-addr[Rn] */ - p += print_insn_mode (size, p0 + 1, addr + 1, info); + p += print_insn_mode (d, size, p0 + 1, addr + 1, info); (*info->fprintf_func) (info->stream, "[%s]", reg_names[reg]); break; case 0x50: /* register: Rn */ @@ -267,8 +271,30 @@ print_insn_mode (size, p0, addr, info) FETCH_DATA (info, p + size); (*info->fprintf_func) (info->stream, "$0x"); - for (i = 0; i < size; i++) - (*info->fprintf_func) (info->stream, "%02x", p[size - i - 1]); + if (d[1] == 'd' || d[1] == 'f' || d[1] == 'g' || d[1] == 'h') + { + int float_word; + + float_word = p[0] | (p[1] << 8); + if ((d[1] == 'd' || d[1] == 'f') + && (float_word & 0xff80) == 0x8000) + { + (*info->fprintf_func) (info->stream, "[invalid %c-float]", + d[1]); + } + else + { + for (i = 0; i < size; i++) + (*info->fprintf_func) (info->stream, "%02x", + p[size - i - 1]); + (*info->fprintf_func) (info->stream, " [%c-float]", d[1]); + } + } + else + { + for (i = 0; i < size; i++) + (*info->fprintf_func) (info->stream, "%02x", p[size - i - 1]); + } p += size; } else -- 2.30.2