Changed the LITTLE_ENDIAN and BIG_ENDIAN macros to ENDIAN_LITTLE and ENDIAN_BIG.

This will prevent them from conflicting with macros defined by the system
header files.
When autoconf comes, this will look a lot nicer.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6684 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
John Criswell
2003-06-11 19:44:51 +00:00
parent 028936ada1
commit a277ca84e0
2 changed files with 27 additions and 12 deletions

View File

@@ -4,10 +4,10 @@
// This file is important because different host OS's define different macros, // This file is important because different host OS's define different macros,
// which makes portability tough. This file exports the following definitions: // which makes portability tough. This file exports the following definitions:
// //
// LITTLE_ENDIAN: is #define'd if the host is little endian // ENDIAN_LITTLE : is #define'd if the host is little endian
// int64_t : is a typedef for the signed 64 bit system type // int64_t : is a typedef for the signed 64 bit system type
// uint64_t : is a typedef for the unsigned 64 bit system type // uint64_t : is a typedef for the unsigned 64 bit system type
// INT64_MAX : is a #define specifying the max value for int64_t's // INT64_MAX : is a #define specifying the max value for int64_t's
// //
// No library is required when using these functinons. // No library is required when using these functinons.
// //
@@ -44,11 +44,26 @@
# endif # endif
#endif #endif
#if (defined(LITTLE_ENDIAN) && defined(BIG_ENDIAN)) //
#error "Cannot define both LITTLE_ENDIAN and BIG_ENDIAN!" // Convert the information from the header files into our own local
// endian macros. We do this because various strange systems define both
// BIG_ENDIAN and LITTLE_ENDIAN, and we don't want to conflict with them.
//
// Don't worry; once we introduce autoconf, this will look a lot nicer.
//
#ifdef LITTLE_ENDIAN
#define ENDIAN_LITTLE
#endif #endif
#if (!defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN)) || !defined(INT64_MAX) #ifdef BIG_ENDIAN
#define ENDIAN_BIG
#endif
#if (defined(ENDIAN_LITTLE) && defined(ENDIAN_BIG))
#error "Cannot define both ENDIAN_LITTLE and ENDIAN_BIG!"
#endif
#if (!defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)) || !defined(INT64_MAX)
#error "include/Support/DataTypes.h could not determine endianness!" #error "include/Support/DataTypes.h could not determine endianness!"
#endif #endif

View File

@@ -23,7 +23,7 @@
static inline bool read(const unsigned char *&Buf, const unsigned char *EndBuf, static inline bool read(const unsigned char *&Buf, const unsigned char *EndBuf,
unsigned &Result) { unsigned &Result) {
if (Buf+4 > EndBuf) return true; if (Buf+4 > EndBuf) return true;
#ifdef LITTLE_ENDIAN #ifdef ENDIAN_LITTLE
Result = *(unsigned*)Buf; Result = *(unsigned*)Buf;
#else #else
Result = Buf[0] | (Buf[1] << 8) | (Buf[2] << 16) | (Buf[3] << 24); Result = Buf[0] | (Buf[1] << 8) | (Buf[2] << 16) | (Buf[3] << 24);
@@ -36,7 +36,7 @@ static inline bool read(const unsigned char *&Buf, const unsigned char *EndBuf,
uint64_t &Result) { uint64_t &Result) {
if (Buf+8 > EndBuf) return true; if (Buf+8 > EndBuf) return true;
#ifdef LITTLE_ENDIAN #ifdef ENDIAN_LITTLE
Result = *(uint64_t*)Buf; Result = *(uint64_t*)Buf;
#else #else
Result = Buf[0] | (Buf[1] << 8) | (Buf[2] << 16) | (Buf[3] << 24) | Result = Buf[0] | (Buf[1] << 8) | (Buf[2] << 16) | (Buf[3] << 24) |
@@ -136,7 +136,7 @@ static inline bool input_data(const unsigned char *&Buf,
unsigned char *Start = (unsigned char *)Ptr; unsigned char *Start = (unsigned char *)Ptr;
unsigned Amount = (unsigned char *)End - Start; unsigned Amount = (unsigned char *)End - Start;
if (Buf+Amount > EndBuf) return true; if (Buf+Amount > EndBuf) return true;
#ifdef LITTLE_ENDIAN #ifdef ENDIAN_LITTLE
std::copy(Buf, Buf+Amount, Start); std::copy(Buf, Buf+Amount, Start);
Buf += Amount; Buf += Amount;
#else #else
@@ -159,7 +159,7 @@ static inline bool input_data(const unsigned char *&Buf,
// //
static inline void output(unsigned i, std::deque<unsigned char> &Out, static inline void output(unsigned i, std::deque<unsigned char> &Out,
int pos = -1) { int pos = -1) {
#ifdef LITTLE_ENDIAN #ifdef ENDIAN_LITTLE
if (pos == -1) if (pos == -1)
Out.insert(Out.end(), (unsigned char*)&i, (unsigned char*)&i+4); Out.insert(Out.end(), (unsigned char*)&i, (unsigned char*)&i+4);
else else
@@ -257,7 +257,7 @@ static inline void output(const std::string &s, std::deque<unsigned char> &Out,
static inline void output_data(void *Ptr, void *End, static inline void output_data(void *Ptr, void *End,
std::deque<unsigned char> &Out, std::deque<unsigned char> &Out,
bool Align = false) { bool Align = false) {
#ifdef LITTLE_ENDIAN #ifdef ENDIAN_LITTLE
Out.insert(Out.end(), (unsigned char*)Ptr, (unsigned char*)End); Out.insert(Out.end(), (unsigned char*)Ptr, (unsigned char*)End);
#else #else
unsigned char *E = (unsigned char *)End; unsigned char *E = (unsigned char *)End;