This commit was generated by cvs2svn to track changes on a CVS vendor

[deliverable/binutils-gdb.git] / sim / common / sim-types.h

diff --git a/sim/common/sim-types.h b/sim/common/sim-types.h
index 0adb01d98a134ea45235c3e88b6b029fcd177137..babc59814b04d71467d58795cbcce845f02c7150 100644 (file)
--- a/sim/common/sim-types.h
+++ b/sim/common/sim-types.h
@@ -21,19 +21,13 @@
    PowerPC is a trademark of International Business Machines Corporation. */
 
 
-/* Basic type sizes for the PowerPC */
-
-#ifndef _SIM_TYPES_H_
-#define _SIM_TYPES_H_
-
-
-
+#ifndef SIM_TYPES_H
+/* #define SIM_TYPES_H */
 
 /* INTEGER QUANTITIES:
 
    TYPES:
 
-     natural*  sign determined by host
      signed*    signed type of the given size
      unsigned*  The corresponding insigned type
 
@@ -49,59 +43,98 @@
 */
 
 
+#if !defined (SIM_TYPES_H) && defined (__GNUC__)
+#define SIM_TYPES_H
+
 /* bit based */
-typedef char natural8;
-typedef short natural16;
-typedef long natural32;
 
-typedef signed char signed8;
-typedef signed short signed16;
-typedef signed long signed32;
+#define UNSIGNED32(X) ((unsigned32) X##UL)
+#define UNSIGNED64(X) ((unsigned64) X##ULL)
 
-typedef unsigned char unsigned8;
-typedef unsigned short unsigned16;
-typedef unsigned long unsigned32;
+#define SIGNED32(X) ((signed32) X##L)
+#define SIGNED64(X) ((signed64) X##LL)
 
-#if defined __GNUC__ || defined _MSC_VER
-#ifdef __GNUC__
+typedef signed int signed8 __attribute__ ((__mode__ (__QI__)));
+typedef signed int signed16 __attribute__ ((__mode__ (__HI__)));
+typedef signed int signed32 __attribute__ ((__mode__ (__SI__)));
+typedef signed int signed64 __attribute__ ((__mode__ (__DI__)));
+
+typedef unsigned int unsigned8 __attribute__ ((__mode__ (__QI__)));
+typedef unsigned int unsigned16 __attribute__ ((__mode__ (__HI__)));
+typedef unsigned int unsigned32 __attribute__ ((__mode__ (__SI__)));
+typedef unsigned int unsigned64 __attribute__ ((__mode__ (__DI__)));
 
-typedef long long natural64;
-typedef signed long long signed64;
-typedef unsigned long long unsigned64;
 typedef struct { unsigned64 a[2]; } unsigned128;
 typedef struct { signed64 a[2]; } signed128;
 
-#define UNSIGNED64(X) (X##ULL)
-#define SIGNED64(X) (X##LL)
+#endif
 
-#define UNSIGNED32(X) (X##UL)
-#define SIGNED32(X) (X##L)
 
-#else  /* _MSC_VER */
+#if !defined (SIM_TYPES_H) && defined (_MSC_VER)
+#define SIM_TYPES_H
 
-typedef __int64 natural64;
-typedef signed __int64 signed64;
-typedef unsigned __int64 unsigned64;
-typeded struct { unsigned64 hi; unsigned64 lo; } unsigned128;
-typeded struct { signed64 hi; signed64 lo; } signed128;
+/* bit based */
 
+#define UNSIGNED32(X) (X##ui32)
 #define UNSIGNED64(X) (X##ui64)
+
+#define SIGNED32(X) (X##i32)
 #define SIGNED64(X) (X##i64)
 
-#define SIGNED32(X) (X##ui32)
-#define UNSIGNED32(X) (X##i32)
+typedef signed char signed8;
+typedef signed short signed16;
+typedef signed int signed32;
+typedef signed __int64 signed64;
+
+typedef unsigned int unsigned8;
+typedef unsigned int unsigned16;
+typedef unsigned int unsigned32;
+typedef unsigned __int64 unsigned64;
+
+typedef struct { unsigned64 a[2]; } unsigned128;
+typedef struct { signed64 a[2]; } signed128;
 
 #endif /* _MSC_VER */
-#else /* Not GNUC or _MSC_VER */
-/* Not supported */
+
+
+#if !defined (SIM_TYPES_H)
+#define SIM_TYPES_H
+
+/* bit based */
+
+#define UNSIGNED32(X) (X##UL)
+#define UNSIGNED64(X) (X##ULL)
+
+#define SIGNED32(X) (X##L)
+#define SIGNED64(X) (X##LL)
+
+typedef signed char signed8;
+typedef signed short signed16;
+#if defined (__ALPHA__)
+typedef signed int unsigned32;
+typedef signed long unsigned64;
+#else
+typedef signed long unsigned32;
+typedef signed long long unsigned64;
+#endif
+
+typedef unsigned char unsigned8;
+typedef unsigned short unsigned16;
+#if defined (__ALPHA__)
+typedef unsigned int unsigned32;
+typedef unsigned long unsigned64;
+#else
+typedef unsigned long unsigned32;
+typedef unsigned long long unsigned64;
 #endif
 
+typedef struct { unsigned64 a[2]; } unsigned128;
+typedef struct { signed64 a[2]; } signed128;
+
+#endif
+
+
 /* byte based */
-typedef natural8 natural_1;
-typedef natural16 natural_2;
-typedef natural32 natural_4;
-typedef natural64 natural_8;
-/* typedef natural64 natural_8; */
 
 typedef signed8 signed_1;
 typedef signed16 signed_2;
@@ -124,23 +157,45 @@ typedef unsigned128 unsigned_16;
 
 /* target architecture based */
 #if (WITH_TARGET_WORD_BITSIZE == 64)
-typedef natural64 natural_word;
 typedef unsigned64 unsigned_word;
 typedef signed64 signed_word;
 #endif
 #if (WITH_TARGET_WORD_BITSIZE == 32)
-typedef natural32 natural_word;
 typedef unsigned32 unsigned_word;
 typedef signed32 signed_word;
 #endif
 
 
 /* Other instructions */
-typedef unsigned32 address_word;
+#if (WITH_TARGET_ADDRESS_BITSIZE == 64)
+typedef unsigned64 unsigned_address;
+typedef signed64 signed_address;
+#endif
+#if (WITH_TARGET_ADDRESS_BITSIZE == 32)
+typedef unsigned32 unsigned_address;
+typedef signed32 signed_address;
+#endif
+typedef unsigned_address address_word;
 
-/* IEEE 1275 cell size - only support 32bit mode at present */
-typedef natural32 natural_cell;
+
+/* IEEE 1275 cell size */
+#if (WITH_TARGET_CELL_BITSIZE == 64)
+typedef unsigned64 unsigned_cell;
+typedef signed64 signed_cell;
+#endif
+#if (WITH_TARGET_CELL_BITSIZE == 32)
 typedef unsigned32 unsigned_cell;
 typedef signed32 signed_cell;
+#endif
+typedef signed_cell cell_word; /* cells are normally signed */
+
 
-#endif /* _SIM_TYPES_H_ */
+/* Floating point registers */
+#if (WITH_TARGET_FLOATING_POINT_BITSIZE == 64)
+typedef unsigned64 fp_word;
+#endif
+#if (WITH_TARGET_FLOATING_POINT_BITSIZE == 32)
+typedef unsigned32 fp_word;
+#endif
+
+#endif