2001-02-06 Kazu Hirata <kazu@hxi.com>

	* elf-m10200.c: Fix formatting.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9d03c56e2ab4b1028c3afd43fee677ad89f54c82..60b19c35eaea1ad9df25f4eb12e862d4f974c420 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-06  Kazu Hirata  <kazu@hxi.com>
+
+       * elf-m10200.c: Fix formatting.
+

 2001-02-04  Nick Clifton  <nickc@redhat.com>
 
        * elf32-v850.c (v850_elf_reloc): Do not convert reloc addend to PC
 2001-02-04  Nick Clifton  <nickc@redhat.com>
 
        * elf32-v850.c (v850_elf_reloc): Do not convert reloc addend to PC

diff --git a/bfd/elf-m10200.c b/bfd/elf-m10200.c
index 0053e0e0452b8c7bdb2998ed00d5709866914736..b6aea659444ee756ab8ee81948b167a856026154 100644 (file)
--- a/bfd/elf-m10200.c
+++ b/bfd/elf-m10200.c
@@ -1,5 +1,5 @@
 /* Matsushita 10200 specific support for 32-bit ELF
 /* Matsushita 10200 specific support for 32-bit ELF

-   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc.

 
 This file is part of BFD, the Binary File Descriptor library.
 
 
 This file is part of BFD, the Binary File Descriptor library.
 


@@ -35,8 +35,7 @@ static boolean mn10200_elf_symbol_address_p
    does absolutely nothing.  */
 #define USE_RELA
 
    does absolutely nothing.  */
 #define USE_RELA
 

-enum reloc_type
-{
+enum reloc_type {

   R_MN10200_NONE = 0,
   R_MN10200_32,
   R_MN10200_16,
   R_MN10200_NONE = 0,
   R_MN10200_32,
   R_MN10200_16,


@@ -48,8 +47,7 @@ enum reloc_type
   R_MN10200_MAX
 };
 
   R_MN10200_MAX
 };
 

-static reloc_howto_type elf_mn10200_howto_table[] =
-{
+static reloc_howto_type elf_mn10200_howto_table[] = {

   /* Dummy relocation.  Does nothing.  */
   HOWTO (R_MN10200_NONE,
         0,
   /* Dummy relocation.  Does nothing.  */
   HOWTO (R_MN10200_NONE,
         0,


@@ -165,20 +163,18 @@ static reloc_howto_type elf_mn10200_howto_table[] =
         true),
 };
 
         true),
 };
 

-struct mn10200_reloc_map
-{
+struct mn10200_reloc_map {

   bfd_reloc_code_real_type bfd_reloc_val;
   unsigned char elf_reloc_val;
 };
 
   bfd_reloc_code_real_type bfd_reloc_val;
   unsigned char elf_reloc_val;
 };
 

-static const struct mn10200_reloc_map mn10200_reloc_map[] =
-{
-  { BFD_RELOC_NONE, R_MN10200_NONE, },
-  { BFD_RELOC_32, R_MN10200_32, },
-  { BFD_RELOC_16, R_MN10200_16, },
-  { BFD_RELOC_8, R_MN10200_8, },
-  { BFD_RELOC_24, R_MN10200_24, },
-  { BFD_RELOC_8_PCREL, R_MN10200_PCREL8, },
+static const struct mn10200_reloc_map mn10200_reloc_map[] = {
+  { BFD_RELOC_NONE    , R_MN10200_NONE   , },
+  { BFD_RELOC_32      , R_MN10200_32     , },
+  { BFD_RELOC_16      , R_MN10200_16     , },
+  { BFD_RELOC_8       , R_MN10200_8      , },
+  { BFD_RELOC_24      , R_MN10200_24     , },
+  { BFD_RELOC_8_PCREL , R_MN10200_PCREL8 , },

   { BFD_RELOC_16_PCREL, R_MN10200_PCREL16, },
   { BFD_RELOC_24_PCREL, R_MN10200_PCREL24, },
 };
   { BFD_RELOC_16_PCREL, R_MN10200_PCREL16, },
   { BFD_RELOC_24_PCREL, R_MN10200_PCREL24, },
 };


@@ -250,7 +246,7 @@ mn10200_elf_final_link_relocate (howto, input_bfd, output_bfd,
     case R_MN10200_16:
       value += addend;
 
     case R_MN10200_16:
       value += addend;
 

-      if ((long)value > 0x7fff || (long)value < -0x8000)
+      if ((long) value > 0x7fff || (long) value < -0x8000)

        return bfd_reloc_overflow;
 
       bfd_put_16 (input_bfd, value, hit_data);
        return bfd_reloc_overflow;
 
       bfd_put_16 (input_bfd, value, hit_data);


@@ -259,7 +255,7 @@ mn10200_elf_final_link_relocate (howto, input_bfd, output_bfd,
     case R_MN10200_8:
       value += addend;
 
     case R_MN10200_8:
       value += addend;
 

-      if ((long)value > 0x7f || (long)value < -0x80)
+      if ((long) value > 0x7f || (long) value < -0x80)

        return bfd_reloc_overflow;
 
       bfd_put_8 (input_bfd, value, hit_data);
        return bfd_reloc_overflow;
 
       bfd_put_8 (input_bfd, value, hit_data);


@@ -268,7 +264,7 @@ mn10200_elf_final_link_relocate (howto, input_bfd, output_bfd,
     case R_MN10200_24:
       value += addend;
 
     case R_MN10200_24:
       value += addend;
 

-      if ((long)value > 0x7fffff || (long)value < -0x800000)
+      if ((long) value > 0x7fffff || (long) value < -0x800000)

        return bfd_reloc_overflow;
 
       value &= 0xffffff;
        return bfd_reloc_overflow;
 
       value &= 0xffffff;


@@ -282,8 +278,8 @@ mn10200_elf_final_link_relocate (howto, input_bfd, output_bfd,
       value -= (offset + 1);
       value += addend;
 
       value -= (offset + 1);
       value += addend;
 

-      if ((long)value > 0xff || (long)value < -0x100)
-        return bfd_reloc_overflow;
+      if ((long) value > 0xff || (long) value < -0x100)
+       return bfd_reloc_overflow;

 
       bfd_put_8 (input_bfd, value, hit_data);
       return bfd_reloc_ok;
 
       bfd_put_8 (input_bfd, value, hit_data);
       return bfd_reloc_ok;


@@ -294,8 +290,8 @@ mn10200_elf_final_link_relocate (howto, input_bfd, output_bfd,
       value -= (offset + 2);
       value += addend;
 
       value -= (offset + 2);
       value += addend;
 

-      if ((long)value > 0xffff || (long)value < -0x10000)
-        return bfd_reloc_overflow;
+      if ((long) value > 0xffff || (long) value < -0x10000)
+       return bfd_reloc_overflow;

 
       bfd_put_16 (input_bfd, value, hit_data);
       return bfd_reloc_ok;
 
       bfd_put_16 (input_bfd, value, hit_data);
       return bfd_reloc_ok;


@@ -306,8 +302,8 @@ mn10200_elf_final_link_relocate (howto, input_bfd, output_bfd,
       value -= (offset + 3);
       value += addend;
 
       value -= (offset + 3);
       value += addend;
 

-      if ((long)value > 0xffffff || (long)value < -0x1000000)
-        return bfd_reloc_overflow;
+      if ((long) value > 0xffffff || (long) value < -0x1000000)
+       return bfd_reloc_overflow;

 
       value &= 0xffffff;
       value |= (bfd_get_32 (input_bfd, hit_data) & 0xff000000);
 
       value &= 0xffffff;
       value |= (bfd_get_32 (input_bfd, hit_data) & 0xff000000);


@@ -422,7 +418,7 @@ mn10200_elf_relocate_section (output_bfd, info, input_bfd, input_section,
       if (r != bfd_reloc_ok)
        {
          const char *name;
       if (r != bfd_reloc_ok)
        {
          const char *name;

-         const char *msg = (const char *)0;
+         const char *msg = (const char *) 0;

 
          if (h != NULL)
            name = h->root.root.string;
 
          if (h != NULL)
            name = h->root.root.string;


@@ -667,7 +663,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
          /* See if the value will fit in 16 bits, note the high value is
             0x7fff + 2 as the target will be two bytes closer if we are
             able to relax.  */
          /* See if the value will fit in 16 bits, note the high value is
             0x7fff + 2 as the target will be two bytes closer if we are
             able to relax.  */

-         if ((long)value < 0x8001 && (long)value > -0x8000)
+         if ((long) value < 0x8001 && (long) value > -0x8000)

            {
              unsigned char code;
 
            {
              unsigned char code;
 


@@ -725,7 +721,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
          /* See if the value will fit in 8 bits, note the high value is
             0x7f + 1 as the target will be one bytes closer if we are
             able to relax.  */
          /* See if the value will fit in 8 bits, note the high value is
             0x7f + 1 as the target will be one bytes closer if we are
             able to relax.  */

-         if ((long)value < 0x80 && (long)value > -0x80)
+         if ((long) value < 0x80 && (long) value > -0x80)

            {
              unsigned char code;
 
            {
              unsigned char code;
 


@@ -845,60 +841,60 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
          /* Reverse the condition of the first branch.  */
          switch (code)
            {
          /* Reverse the condition of the first branch.  */
          switch (code)
            {

-             case 0xfc:
-               code = 0xfd;
-               break;
-             case 0xfd:
-               code = 0xfc;
-               break;
-             case 0xfe:
-               code = 0xff;
-               break;
-             case 0xff:
-               code = 0xfe;
-               break;
-             case 0xe8:
-               code = 0xe9;
-               break;
-             case 0xe9:
-               code = 0xe8;
-               break;
-             case 0xe0:
-               code = 0xe2;
-               break;
-             case 0xe2:
-               code = 0xe0;
-               break;
-             case 0xe3:
-               code = 0xe1;
-               break;
-             case 0xe1:
-               code = 0xe3;
-               break;
-             case 0xe4:
-               code = 0xe6;
-               break;
-             case 0xe6:
-               code = 0xe4;
-               break;
-             case 0xe7:
-               code = 0xe5;
-               break;
-             case 0xe5:
-               code = 0xe7;
-               break;
-             case 0xec:
-               code = 0xed;
-               break;
-             case 0xed:
-               code = 0xec;
-               break;
-             case 0xee:
-               code = 0xef;
-               break;
-             case 0xef:
-               code = 0xee;
-               break;
+           case 0xfc:
+             code = 0xfd;
+             break;
+           case 0xfd:
+             code = 0xfc;
+             break;
+           case 0xfe:
+             code = 0xff;
+             break;
+           case 0xff:
+             code = 0xfe;
+             break;
+           case 0xe8:
+             code = 0xe9;
+             break;
+           case 0xe9:
+             code = 0xe8;
+             break;
+           case 0xe0:
+             code = 0xe2;
+             break;
+           case 0xe2:
+             code = 0xe0;
+             break;
+           case 0xe3:
+             code = 0xe1;
+             break;
+           case 0xe1:
+             code = 0xe3;
+             break;
+           case 0xe4:
+             code = 0xe6;
+             break;
+           case 0xe6:
+             code = 0xe4;
+             break;
+           case 0xe7:
+             code = 0xe5;
+             break;
+           case 0xe5:
+             code = 0xe7;
+             break;
+           case 0xec:
+             code = 0xed;
+             break;
+           case 0xed:
+             code = 0xec;
+             break;
+           case 0xee:
+             code = 0xef;
+             break;
+           case 0xef:
+             code = 0xee;
+             break;

            }
          bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
 
            }
          bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
 


@@ -929,7 +925,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
          /* See if the value will fit in 16 bits.
             We allow any 16bit match here.  We prune those we can't
             handle below.  */
          /* See if the value will fit in 16 bits.
             We allow any 16bit match here.  We prune those we can't
             handle below.  */

-         if ((long)value < 0x7fff && (long)value > -0x8000)
+         if ((long) value < 0x7fff && (long) value > -0x8000)

            {
              unsigned char code;
 
            {
              unsigned char code;
 


@@ -1072,20 +1068,20 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
                     move the value out of high mem and thus not fit
                     in a signed 16bit value.  */
                  if (((code & 0xfc) == 0x78
                     move the value out of high mem and thus not fit
                     in a signed 16bit value.  */
                  if (((code & 0xfc) == 0x78

-                       || (code & 0xfc) == 0x60
-                       || (code & 0xfc) == 0x64
-                       || (code & 0xfc) == 0x68
-                       || (code & 0xfc) == 0x6c
-                       || (code & 0xfc) == 0x80
-                       || (code & 0xfc) == 0xf0
-                       || (code & 0xfc) == 0x00
-                       || (code & 0xfc) == 0x10
-                       || (code & 0xfc) == 0xb0
-                       || (code & 0xfc) == 0x30
-                       || (code & 0xfc) == 0xa0
-                       || (code & 0xfc) == 0x20
-                       || (code & 0xfc) == 0x90)
-                      && (value & 0x8000) != 0)
+                      || (code & 0xfc) == 0x60
+                      || (code & 0xfc) == 0x64
+                      || (code & 0xfc) == 0x68
+                      || (code & 0xfc) == 0x6c
+                      || (code & 0xfc) == 0x80
+                      || (code & 0xfc) == 0xf0
+                      || (code & 0xfc) == 0x00
+                      || (code & 0xfc) == 0x10
+                      || (code & 0xfc) == 0xb0
+                      || (code & 0xfc) == 0x30
+                      || (code & 0xfc) == 0xa0
+                      || (code & 0xfc) == 0x20
+                      || (code & 0xfc) == 0x90)
+                     && (value & 0x8000) != 0)

                    continue;
 
                  /* Note that we've changed the reldection contents, etc.  */
                    continue;
 
                  /* Note that we've changed the reldection contents, etc.  */