Changeset 1973 for binutils/trunk/opcodes/nds32-dis.c

Timestamp:

Feb 6, 2017, 1:00:00 PM (8 years ago)

Author:

Silvan Scherrer

Message:

binutils: update trunk to version 2.27

Location:

binutils/trunk

Files:

• . (modified) (1 prop)
• opcodes/nds32-dis.c (modified) (8 diffs)

binutils/trunk/opcodes/nds32-dis.c ¶

@@ -1 +1 @@
 /* NDS32-specific support for 32-bit ELF.
-   Copyright (C) 2012-2014 Free Software Foundation, Inc.
+   Copyright (C) 2012-2016 Free Software Foundation, Inc.
    Contributed by Andes Technology Corporation.
 
@@ -156 +156 @@
         int_value = __GF (insn, pfd->bitpos, pfd->bitsize) << pfd->shift;
 
-      if (int_value < 0)
+      if (int_value < 10)
         func (stream, "#%d", int_value);
       else
@@ -270 +270 @@
         func (stream, "%s", opc->opcode);
       else
-        func (stream, "%s ", opc->opcode);
+        func (stream, "%s\t", opc->opcode);
     }
 
@@ -281 +281 @@
         case '&':
           pstr_src++;
-          /* compare with operand_fields[].name.  */
+          /* Compare with operand_fields[].name.  */
           pstr_tmp = &tmp_string[0];
           while (*pstr_src)
@@ -305 +305 @@
             }
 
-          /* for insn-16.  */
+          /* For insn-16.  */
           if (parse_mode & NDS32_PARSE_INSN16)
             {
@@ -374 +374 @@
                   else if (pfd->hw_res == HW_INT)
                     {
-                      if (int_value < 0)
+                      if (int_value < 10)
                         func (stream, "#%d", int_value);
                       else
                         func (stream, "#0x%x", int_value);
                     }
-                  else          /* if(pfd->hw_res == HW_UINT).  */
-                    func (stream, "#0x%x", int_value);
+                  else /* if (pfd->hw_res == HW_UINT).  */
+                    {
+                      if (int_value < 10)
+                        func (stream, "#%u", int_value);
+                      else
+                        func (stream, "#0x%x", int_value);
+                    }
                 }
 
@@ -492 +497 @@
               else if (pfd->hw_res == HW_INT)
                 {
-                  if (int_value < 0)
+                  if (int_value < 10)
                     func (stream, "#%d", int_value);
                   else
                     func (stream, "#0x%x", int_value);
                 }
-              else              /* if(pfd->hw_res == HW_UINT).  */
+              else /* if (pfd->hw_res == HW_UINT).  */
                 {
-                  func (stream, "#0x%x", int_value);
+                  if (int_value < 10)
+                    func (stream, "#%u", int_value);
+                  else
+                    func (stream, "#0x%x", int_value);
                 }
             }
@@ -509 +517 @@
           break;
 
+        case ',':
+          func (stream, ", ");
+          pstr_src++;
+          break;
+          
+        case '+':
+          func (stream, " + ");
+          pstr_src++;
+          break;
+          
+        case '<':
+          if (pstr_src[1] == '<')
+            {
+              func (stream, " << ");
+              pstr_src += 2;
+            }
+          else
+            {
+              func (stream, " <");
+              pstr_src++;
+            }
+          break;
+          
         default:
           func (stream, "%c", *pstr_src++);
           break;
-        }                       /* switch (*pstr_src).  */
-
-    }                           /* while (*pstr_src).  */
-  return;
+        }
+    }
 }