sim: drop -DTRACE from configure

[deliverable/binutils-gdb.git] / sim / common / hw-base.c

diff --git a/sim/common/hw-base.c b/sim/common/hw-base.c
index 364dc4d955ee494e16616ec21556fac9bd97ff61..4928eb24ad85c7b5a2f9de4d7f4490df1ce2f0b6 100644 (file)
--- a/sim/common/hw-base.c
+++ b/sim/common/hw-base.c
@@ -1,6 +1,6 @@
 /* The common simulator framework for GDB, the GNU Debugger.
 
-   Copyright 2002, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright 2002-2015 Free Software Foundation, Inc.
 
    Contributed by Andrew Cagney and Red Hat.
 
@@ -40,7 +40,8 @@
 
 #include "hw-config.h"
 
-struct hw_base_data {
+struct hw_base_data
+{
   int finished_p;
   const struct hw_descriptor *descriptor;
   hw_delete_callback *to_delete;
@@ -80,14 +81,16 @@ generic_hw_unit_decode (struct hw *bus,
            return -1;
          unit++;
        }
-      if (nr_cells < max_nr_cells) {
-       /* shift everything to correct position */
-       int i;
-       for (i = 1; i <= nr_cells; i++)
-         phys->cells[max_nr_cells - i] = phys->cells[nr_cells - i];
-       for (i = 0; i < (max_nr_cells - nr_cells); i++)
-         phys->cells[i] = 0;
-      }
+      if (nr_cells < max_nr_cells)
+       {
+         /* shift everything to correct position */
+         int i;
+
+         for (i = 1; i <= nr_cells; i++)
+           phys->cells[max_nr_cells - i] = phys->cells[nr_cells - i];
+         for (i = 0; i < (max_nr_cells - nr_cells); i++)
+           phys->cells[i] = 0;
+       }
       phys->nr_cells = max_nr_cells;
       return max_nr_cells;
   }
@@ -111,28 +114,29 @@ generic_hw_unit_encode (struct hw *bus,
   /* don't output anything if empty */
   if (phys->nr_cells == 0)
     {
-      strcpy(pos, "");
+      strcpy (pos, "");
       len = 0;
     }
   else if (i == phys->nr_cells)
     {
       /* all zero */
-      strcpy(pos, "0");
+      strcpy (pos, "0");
       len = 1;
     }
   else
     {
       for (; i < phys->nr_cells; i++)
        {
-         if (pos != buf) {
-           strcat(pos, ",");
-           pos = strchr(pos, '\0');
-         }
+         if (pos != buf)
+           {
+             strcat (pos, ",");
+             pos = strchr (pos, '\0');
+           }
          if (phys->cells[i] < 10)
            sprintf (pos, "%ld", (unsigned long)phys->cells[i]);
          else
            sprintf (pos, "0x%lx", (unsigned long)phys->cells[i]);
-         pos = strchr(pos, '\0');
+         pos = strchr (pos, '\0');
        }
       len = pos - buf;
     }
@@ -313,7 +317,7 @@ full_name_of_hw (struct hw *leaf,
       strcat (buf, hw_name (leaf));
       strcat (buf, unit);
     }
-  
+
   /* return it usefully */
   if (buf == full_name)
     buf = hw_strdup (leaf, full_name);
@@ -362,7 +366,7 @@ hw_create (struct sim_state *sd,
        root = root->parent_of_hw;
       hw->root_of_hw = root;
     }
-  
+
   /* a unique identifier for the device on the parents bus */
   if (parent != NULL)
     {
@@ -424,7 +428,7 @@ hw_create (struct sim_state *sd,
   create_hw_event_data (hw);
   create_hw_handle_data (hw);
   create_hw_instance_data (hw);
-  
+
   return hw;
 }
 
@@ -461,7 +465,7 @@ hw_finish (struct hw *me)
           && hw_find_property (hw_root (me), "global-trace?") != NULL
           && hw_find_boolean_property (hw_root (me), "global-trace?"))
     me->trace_of_hw_p = 1;
-    
+
 
   /* Allow the real device to override any methods */
   me->base_of_hw->descriptor->to_finish (me);