sim: cris: migrate to standard uintXX_t types

Move off the sim-specific unsignedXX types and to the standard uintXX_t
types that C11 provides.

1 files changed, 12 insertions, 12 deletions

diff --git a/sim/cris/dv-cris.c b/sim/cris/dv-cris.c
index 472af0e..1143465 100644
--- a/sim/cris/dv-cris.c
+++ b/sim/cris/dv-cris.c
@@ -88,7 +88,7 @@ static const struct hw_port_descriptor cris_ports[] =
 
 struct cris_vec_tr
  {
-   unsigned32 portval, vec;
+   uint32_t portval, vec;
  };
 
 enum cris_multiple_ints
@@ -101,10 +101,10 @@ enum cris_multiple_ints
 struct cris_hw
  {
    struct hw_event *pending_handler;
-   unsigned32 pending_vector;
+   uint32_t pending_vector;
    struct cris_vec_tr *int_to_vec;
    enum cris_multiple_ints multi_int_action;
-   unsigned32 multiple_int_vector;
+   uint32_t multiple_int_vector;
  };
 
 /* An event function, calling the actual CPU-model-specific
@@ -136,9 +136,9 @@ deliver_cris_interrupt (struct hw *me, void *data)
       time we get here, until a new time is seen (supposedly unstuck
       re-delivery).  (Fixing in SIM/GDB source will hopefully then
       also be easier, having a tangible test-case.)  */
-   static signed64 last_events_time = 0;
-   static signed64 delta = 1;
-   signed64 this_events_time = hw_event_queue_time (me);
+   static int64_t last_events_time = 0;
+   static int64_t delta = 1;
+   int64_t this_events_time = hw_event_queue_time (me);
 
    if (this_events_time == last_events_time)
      delta++;
@@ -164,7 +164,7 @@ cris_port_event (struct hw *me,
 		 int intparam)
 {
   struct cris_hw *crishw = hw_data (me);
-  unsigned32 vec;
+  uint32_t vec;
 
   /* A few placeholders; only the INT port is implemented.  */
   switch (my_port)
@@ -194,7 +194,7 @@ cris_port_event (struct hw *me,
       vec = crishw->int_to_vec[i].vec;
     }
   else
-    vec = (unsigned32) intparam;
+    vec = (uint32_t) intparam;
 
   if (crishw->pending_vector != 0)
     {
@@ -245,8 +245,8 @@ cris_finish (struct hw *me)
   vec_for_int = hw_find_property (me, "vec-for-int");
   if (vec_for_int != NULL)
     {
-      unsigned32 vecsize;
-      unsigned32 i;
+      uint32_t vecsize;
+      uint32_t i;
 
       if (hw_property_type (vec_for_int) != array_property)
 	hw_abort (me, "property \"vec-for-int\" has the wrong type");
@@ -272,8 +272,8 @@ cris_finish (struct hw *me)
 	      || vec_sc < 0)
 	    hw_abort (me, "no valid vector translation pair %u", i);
 
-	  crishw->int_to_vec[i].portval = (unsigned32) portval_sc;
-	  crishw->int_to_vec[i].vec = (unsigned32) vec_sc;
+	  crishw->int_to_vec[i].portval = (uint32_t) portval_sc;
+	  crishw->int_to_vec[i].vec = (uint32_t) vec_sc;
 	}
 
       crishw->int_to_vec[i].portval = 0;