diff --git a/tests/unit/endian.h b/tests/unit/endian.h deleted file mode 100644 index b42da241..00000000 --- a/tests/unit/endian.h +++ /dev/null @@ -1,78 +0,0 @@ -// Copy fron boost 1.43.0 - -// Copyright 2005 Caleb Epstein -// Copyright 2006 John Maddock -// Distributed under the Boost Software License, Version 1.0. (See accompany- -// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -/* - * Copyright (c) 1997 - * Silicon Graphics Computer Systems, Inc. - * - * Permission to use, copy, modify, distribute and sell this software - * and its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and - * that both that copyright notice and this permission notice appear - * in supporting documentation. Silicon Graphics makes no - * representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied warranty. - */ - -/* - * Copyright notice reproduced from , from - * which this code was originally taken. - * - * Modified by Caleb Epstein to use with GNU libc and to - * defined the BOOST_ENDIAN macro. - */ - -#ifndef BOOST_DETAIL_ENDIAN_HPP -#define BOOST_DETAIL_ENDIAN_HPP - -// GNU libc offers the helpful header which defines -// __BYTE_ORDER - -#if defined(__GLIBC__) -#include -#if (__BYTE_ORDER == __LITTLE_ENDIAN) -#define BOOST_LITTLE_ENDIAN -#elif (__BYTE_ORDER == __BIG_ENDIAN) -#define BOOST_BIG_ENDIAN -#elif (__BYTE_ORDER == __PDP_ENDIAN) -#define BOOST_PDP_ENDIAN -#else -// Failsafe -#define BOOST_LITTLE_ENDIAN -#endif -#define BOOST_BYTE_ORDER __BYTE_ORDER -#elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) -#define BOOST_BIG_ENDIAN -#define BOOST_BYTE_ORDER 4321 -#elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN) -#define BOOST_LITTLE_ENDIAN -#define BOOST_BYTE_ORDER 1234 -// https://developer.arm.com/documentation/dui0491/i/Compiler-specific-Features/Predefined-macros -#elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || \ - defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || \ - defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || \ - defined(__s390__) || defined(__ARMEB__) || defined(__AARCH64EB__) || \ - defined(__BIG_ENDIAN) || defined(__ARM_BIG_ENDIAN) -#define BOOST_BIG_ENDIAN -#define BOOST_BYTE_ORDER 4321 -#elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || \ - defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || \ - defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || \ - defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || \ - defined(_M_X64) || defined(__bfin__) || defined(__ARMEL__) || \ - defined(__AARCH64EL__) || defined(__arm64__) || defined(__arm__) -#define BOOST_LITTLE_ENDIAN -#define BOOST_BYTE_ORDER 1234 -#else - -// Failsafe -#define BOOST_LITTLE_ENDIAN -#define BOOST_BYTE_ORDER 1234 - -#endif - -#endif diff --git a/tests/unit/unicorn_test.h b/tests/unit/unicorn_test.h index cf9ff6f1..ac09843f 100644 --- a/tests/unit/unicorn_test.h +++ b/tests/unit/unicorn_test.h @@ -5,7 +5,7 @@ #include #include #include "acutest.h" -#include "endian.h" +#include "config-host.h" // Copied from glibc-2.29 @@ -41,16 +41,16 @@ */ #define OK(stat) uc_assert_err(UC_ERR_OK, stat) -#ifdef BOOST_LITTLE_ENDIAN -#define LEINT32(x) (x) -#define LEINT64(x) (x) -#define BEINT32(x) (bswap_32(x)) -#define BEINT64(x) (bswap_64(x)) -#else +#ifdef BOOST_BIG_ENDIAN #define LEINT32(x) (bswap_32(x)) #define LEINT64(x) (bswap_64(x)) #define BEINT32(x) (x) #define BEINT64(x) (x) +#else +#define LEINT32(x) (x) +#define LEINT64(x) (x) +#define BEINT32(x) (bswap_32(x)) +#define BEINT64(x) (bswap_64(x)) #endif #endif /* UNICORN_TEST_H */