PowerPC64 .branch_lt address

[binutils-gdb.git] / sim / common / dv-pal.c

diff --git a/sim/common/dv-pal.c b/sim/common/dv-pal.c
index 97f01c8c0d4bf3b3b1a636f33382ad360de6f15e..5f42fdab75b0ce2023f7921e79dcfdb8dda56619 100644 (file)
--- a/sim/common/dv-pal.c
+++ b/sim/common/dv-pal.c
@@ -1,6 +1,6 @@
 /* The common simulator framework for GDB, the GNU Debugger.
 
-   Copyright 2002-2015 Free Software Foundation, Inc.
+   Copyright 2002-2022 Free Software Foundation, Inc.
 
    Contributed by Andrew Cagney and Red Hat.
 
@@ -19,7 +19,16 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
 
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "sim-main.h"
 #include "hw-main.h"
 #include "sim-io.h"
 
@@ -27,21 +36,6 @@
    its immediate domain */
 #include "hw-tree.h"
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
 /* DEVICE
 
 
@@ -187,8 +181,8 @@ typedef struct _hw_pal_console_buffer {
 
 typedef struct _hw_pal_counter {
   struct hw_event *handler;
-  signed64 start;
-  unsigned32 delta;
+  int64_t start;
+  uint32_t delta;
   int periodic_p;
 } hw_pal_counter;
 
@@ -243,10 +237,10 @@ do_counter_read (struct hw *me,
                 hw_pal_device *pal,
                 const char *reg,
                 hw_pal_counter *counter,
-                unsigned32 *word,
+                uint32_t *word,
                 unsigned nr_bytes)
 {
-  unsigned32 val;
+  uint32_t val;
   if (nr_bytes != 4)
     hw_abort (me, "%s - bad read size must be 4 bytes", reg);
   val = counter->delta;
@@ -259,10 +253,10 @@ do_counter_value (struct hw *me,
                  hw_pal_device *pal,
                  const char *reg,
                  hw_pal_counter *counter,
-                 unsigned32 *word,
+                 uint32_t *word,
                  unsigned nr_bytes)
 {
-  unsigned32 val;
+  uint32_t val;
   if (nr_bytes != 4)
     hw_abort (me, "%s - bad read size must be 4 bytes", reg);
   if (counter->delta != 0)
@@ -279,7 +273,7 @@ do_counter_write (struct hw *me,
                  hw_pal_device *pal,
                  const char *reg,
                  hw_pal_counter *counter,
-                 const unsigned32 *word,
+                 const uint32_t *word,
                  unsigned nr_bytes)
 {
   if (nr_bytes != 4)
@@ -349,11 +343,7 @@ hw_pal_io_read_buffer (struct hw *me,
     {
 
     case hw_pal_cpu_nr_register:
-#ifdef CPU_INDEX
       *byte = CPU_INDEX (hw_system_cpu (me));
-#else
-      *byte = 0;
-#endif
       HW_TRACE ((me, "read - cpu-nr %d\n", *byte));
       break;