X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fcommon%2Fsim-endian.c;h=8b3ec9e43228aefabbbc1cff038f84ee102b89db;hb=a435742a7fb32f6320ce0e6074e2500e28378104;hp=3a32986c05f45bb6baebdf8c74cc6b12c1ecebc2;hpb=f2de7dfd8cf1ffd6edc7ed650e709c7fa4488da1;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/common/sim-endian.c b/sim/common/sim-endian.c
index 3a32986c05..8b3ec9e432 100644
--- a/sim/common/sim-endian.c
+++ b/sim/common/sim-endian.c
@@ -1,35 +1,37 @@
-/*  This file is part of the program psim.
+/* The common simulator framework for GDB, the GNU Debugger.
 
-    Copyright (C) 1994-1995, Andrew Cagney <cagney@highland.com.au>
+   Copyright 2002-2020 Free Software Foundation, Inc.
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+   Contributed by Andrew Cagney and Red Hat.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
- 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
-    */
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #ifndef _SIM_ENDIAN_C_
 #define _SIM_ENDIAN_C_
 
 #include "sim-basics.h"
+#include "sim-assert.h"
 
 
 #if !defined(_SWAP_1)
 #define _SWAP_1(SET,RAW) SET (RAW)
 #endif
 
-#if !defined(_SWAP_2) && (WITH_HOST_BYTE_ORDER == LITTLE_ENDIAN) && defined(htons)
+#if !defined(_SWAP_2) && (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE) && defined(htons)
 #define _SWAP_2(SET,RAW) SET htons (RAW)
 #endif
 
@@ -37,7 +39,7 @@
 #define _SWAP_2(SET,RAW) SET (((RAW) >> 8) | ((RAW) << 8))
 #endif
 
-#if !defined(_SWAP_4) && (WITH_HOST_BYTE_ORDER == LITTLE_ENDIAN) && defined(htonl)
+#if !defined(_SWAP_4) && (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE) && defined(htonl)
 #define _SWAP_4(SET,RAW) SET htonl (RAW)
 #endif
 
@@ -54,6 +56,17 @@
   SET out.dword;
 #endif
 
+#ifndef _SWAP_16
+#define _SWAP_16(SET,RAW) \
+  union { unsigned_16 word; unsigned_4 words[4]; } in, out; \
+  in.word = (RAW); \
+  _SWAP_4 (out.words[0] =, in.words[3]); \
+  _SWAP_4 (out.words[1] =, in.words[2]); \
+  _SWAP_4 (out.words[2] =, in.words[1]); \
+  _SWAP_4 (out.words[3] =, in.words[0]); \
+  SET out.word;
+#endif
+
 
 #define N 1
 #include "sim-n-endian.h"
@@ -71,4 +84,45 @@
 #include "sim-n-endian.h"
 #undef N
 
+#define N 16
+#include "sim-n-endian.h"
+#undef N
+
+
+INLINE_SIM_ENDIAN\
+(unsigned_8)
+sim_endian_split_16 (unsigned_16 word, int w)
+{
+  if (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
+    {
+      return word.a[1 - w];
+    }
+  else
+    {
+      return word.a[w];
+    }
+}
+
+
+INLINE_SIM_ENDIAN\
+(unsigned_16)
+sim_endian_join_16 (unsigned_8 h, unsigned_8 l)
+
+{
+  unsigned_16 word;
+  if (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
+    {
+      word.a[0] = l;
+      word.a[1] = h;
+    }
+  else
+    {
+      word.a[0] = h;
+      word.a[1] = l;
+    }
+  return word;
+}
+
+
+
 #endif /* _SIM_ENDIAN_C_ */