2000-02-16 Fernando Nasser <fnasser@totem.to.cygnus.com>

[deliverable/binutils-gdb.git] / opcodes / tic30-dis.c

diff --git a/opcodes/tic30-dis.c b/opcodes/tic30-dis.c
index 3a7cafe0131bb60dbac01dfb4fe25720170cb3fd..5ccf893f2f2f4c44db11cc2498a9633bab059a8f 100644 (file)
--- a/opcodes/tic30-dis.c
+++ b/opcodes/tic30-dis.c
@@ -1,5 +1,5 @@
 /* Disassembly routines for TMS320C30 architecture
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
    Contributed by Steven Haworth (steve@pm.cse.rmit.edu.au)
 
    This program is free software; you can redistribute it and/or modify
@@ -19,8 +19,7 @@
 
 #include <errno.h>
 #include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include "sysdep.h"
 #include "dis-asm.h"
 #include "opcode/tic30.h"
 
@@ -370,7 +369,7 @@ print_par_insn (info, insn_word, insn)
      unsigned long insn_word;
      struct instruction *insn;
 {
-  int i;
+  size_t i, len;
   char *name1, *name2;
   char operand[2][3][13] =
   {
@@ -388,7 +387,9 @@ print_par_insn (info, insn_word, insn)
   /* Parse out the names of each of the parallel instructions from the
      q_insn1_insn2 format. */
   name1 = (char *) strdup (insn->ptm->name + 2);
-  for (i = 0; i < strlen (name1); i++)
+  name2 = "";
+  len = strlen (name1);
+  for (i = 0; i < len; i++)
     {
       if (name1[i] == '_')
        {
@@ -545,23 +546,25 @@ print_branch (info, insn_word, insn)
                      operand[1][0] ? ',' : ' ',
                      operand[1][0] ? operand[1] : "");
   /* Print destination of branch in relation to current symbol. */
-  if (print_label && info->symbol)
+  if (print_label && info->symbols)
     {
+      asymbol *sym = *info->symbols;
+
       if ((insn->tm->opcode_modifier == PCRel) && (insn_word & PCRel))
        {
-         address = (_pc + 1 + (short) address) - ((info->symbol->section->vma + info->symbol->value) / 4);
+         address = (_pc + 1 + (short) address) - ((sym->section->vma + sym->value) / 4);
          /* Check for delayed instruction, if so adjust destination. */
          if (insn_word & 0x00200000)
            address += 2;
        }
       else
        {
-         address -= ((info->symbol->section->vma + info->symbol->value) / 4);
+         address -= ((sym->section->vma + sym->value) / 4);
        }
       if (address == 0)
-       info->fprintf_func (info->stream, " <%s>", info->symbol->name);
+       info->fprintf_func (info->stream, " <%s>", sym->name);
       else
-       info->fprintf_func (info->stream, " <%s %c %d>", info->symbol->name,
+       info->fprintf_func (info->stream, " <%s %c %d>", sym->name,
                            ((short) address < 0) ? '-' : '+',
                            abs (address));
     }
@@ -609,8 +612,11 @@ get_indirect_operand (fragment, size, buffer)
              }
            else
              {
-               int i, bufcnt;
-               for (i = 0, bufcnt = 0; i < strlen (current_ind->syntax); i++, bufcnt++)
+               size_t i, len;
+               int bufcnt;
+               
+               len = strlen (current_ind->syntax);
+               for (i = 0, bufcnt = 0; i < len; i++, bufcnt++)
                  {
                    buffer[bufcnt] = current_ind->syntax[i];
                    if (buffer[bufcnt - 1] == 'a' && buffer[bufcnt] == 'r')