Diff for /qemu/m68k-dis.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2018/04/24 16:47:37 version 1.1.1.3, 2018/04/24 16:50:59
Line 7 Line 7
   
 #include "dis-asm.h"  #include "dis-asm.h"
   
 /* **** foatformat.h from sourceware.org CVS 2005-08-14.  */  /* **** floatformat.h from sourceware.org CVS 2005-08-14.  */
 /* IEEE floating point support declarations, for GDB, the GNU Debugger.  /* IEEE floating point support declarations, for GDB, the GNU Debugger.
    Copyright 1991, 1994, 1995, 1997, 2000, 2003 Free Software Foundation, Inc.     Copyright 1991, 1994, 1995, 1997, 2000, 2003 Free Software Foundation, Inc.
   
Line 546  extern const int m68k_numopcodes, m68k_n Line 546  extern const int m68k_numopcodes, m68k_n
   
 /* Local function prototypes.  */  /* Local function prototypes.  */
   
 const char * const fpcr_names[] =  static const char * const fpcr_names[] =
 {  {
   "", "%fpiar", "%fpsr", "%fpiar/%fpsr", "%fpcr",    "", "%fpiar", "%fpsr", "%fpiar/%fpsr", "%fpcr",
   "%fpiar/%fpcr", "%fpsr/%fpcr", "%fpiar/%fpsr/%fpcr"    "%fpiar/%fpcr", "%fpsr/%fpcr", "%fpiar/%fpsr/%fpcr"
 };  };
   
 static char *const reg_names[] =  static const char *const reg_names[] =
 {  {
   "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7",    "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7",
   "%a0", "%a1", "%a2", "%a3", "%a4", "%a5", "%fp", "%sp",    "%a0", "%a1", "%a2", "%a3", "%a4", "%a5", "%fp", "%sp",
Line 561  static char *const reg_names[] = Line 561  static char *const reg_names[] =
   
 /* Name of register halves for MAC/EMAC.  /* Name of register halves for MAC/EMAC.
    Separate from reg_names since 'spu', 'fpl' look weird.  */     Separate from reg_names since 'spu', 'fpl' look weird.  */
 static char *const reg_half_names[] =  static const char *const reg_half_names[] =
 {  {
   "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7",    "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7",
   "%a0", "%a1", "%a2", "%a3", "%a4", "%a5", "%a6", "%a7",    "%a0", "%a1", "%a2", "%a3", "%a4", "%a5", "%a6", "%a7",
Line 991  print_indexed (int basereg, Line 991  print_indexed (int basereg,
                disassemble_info *info)                 disassemble_info *info)
 {  {
   int word;    int word;
   static char *const scales[] = { "", ":2", ":4", ":8" };    static const char *const scales[] = { "", ":2", ":4", ":8" };
   bfd_vma base_disp;    bfd_vma base_disp;
   bfd_vma outer_disp;    bfd_vma outer_disp;
   char buf[40];    char buf[40];
Line 1106  print_insn_arg (const char *d, Line 1106  print_insn_arg (const char *d,
     {      {
     case 'c':           /* Cache identifier.  */      case 'c':           /* Cache identifier.  */
       {        {
         static char *const cacheFieldName[] = { "nc", "dc", "ic", "bc" };          static const char *const cacheFieldName[] = { "nc", "dc", "ic", "bc" };
         val = fetch_arg (buffer, place, 2, info);          val = fetch_arg (buffer, place, 2, info);
         (*info->fprintf_func) (info->stream, cacheFieldName[val]);          (*info->fprintf_func) (info->stream, cacheFieldName[val]);
         break;          break;
Line 1157  print_insn_arg (const char *d, Line 1157  print_insn_arg (const char *d,
         /* FIXME: There's a problem here, different m68k processors call the          /* FIXME: There's a problem here, different m68k processors call the
            same address different names. This table can't get it right             same address different names. This table can't get it right
            because it doesn't know which processor it's disassembling for.  */             because it doesn't know which processor it's disassembling for.  */
         static const struct { char *name; int value; } names[]          static const struct { const char *name; int value; } names[]
           = {{"%sfc", 0x000}, {"%dfc", 0x001}, {"%cacr", 0x002},            = {{"%sfc", 0x000}, {"%dfc", 0x001}, {"%cacr", 0x002},
              {"%tc",  0x003}, {"%itt0",0x004}, {"%itt1", 0x005},               {"%tc",  0x003}, {"%itt0",0x004}, {"%itt1", 0x005},
              {"%dtt0",0x006}, {"%dtt1",0x007}, {"%buscr",0x008},               {"%dtt0",0x006}, {"%dtt1",0x007}, {"%buscr",0x008},
Line 1201  print_insn_arg (const char *d, Line 1201  print_insn_arg (const char *d,
     case 'M':      case 'M':
       if (place == 'h')        if (place == 'h')
         {          {
           static char *const scalefactor_name[] = { "<<", ">>" };            static const char *const scalefactor_name[] = { "<<", ">>" };
           val = fetch_arg (buffer, place, 1, info);            val = fetch_arg (buffer, place, 1, info);
           (*info->fprintf_func) (info->stream, scalefactor_name[val]);            (*info->fprintf_func) (info->stream, scalefactor_name[val]);
         }          }
Line 1633  print_insn_arg (const char *d, Line 1633  print_insn_arg (const char *d,
     case '3':      case '3':
       {        {
         int val = fetch_arg (buffer, place, 5, info);          int val = fetch_arg (buffer, place, 5, info);
         char *name = 0;          const char *name = 0;
   
         switch (val)          switch (val)
           {            {

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


unix.superglobalmegacorp.com