lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:unicorn-engine/unicorn into dev

Browse Source
This commit is contained in:
Nguyen Anh Quynh
2022-12-07 01:36:58 +08:00
parent 9dc001d686 5625102285
commit 1f2da9c717
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -45,7 +45,7 @@ set(CMAKE_C_STANDARD 11)
set(UNICORN_VERSION_MAJOR 2) set(UNICORN_VERSION_MAJOR 2)
set(UNICORN_VERSION_MINOR 0) set(UNICORN_VERSION_MINOR 0)
set(UNICORN_VERSION_PATCH 0) set(UNICORN_VERSION_PATCH 1)
include(bundle_static.cmake) include(bundle_static.cmake)

2
bindings/python/setup.py
View File

@@ -29,7 +29,7 @@ SRC_DIR = os.path.join(ROOT_DIR, 'src')
UC_DIR = SRC_DIR if os.path.exists(SRC_DIR) else os.path.join(ROOT_DIR, '../..') UC_DIR = SRC_DIR if os.path.exists(SRC_DIR) else os.path.join(ROOT_DIR, '../..')
BUILD_DIR = os.path.join(UC_DIR, 'build_python') BUILD_DIR = os.path.join(UC_DIR, 'build_python')
VERSION = "2.0.1" VERSION = "2.0.1.post1"
if SYSTEM == 'darwin': if SYSTEM == 'darwin':
LIBRARY_FILE = "libunicorn.2.dylib" LIBRARY_FILE = "libunicorn.2.dylib"

2
bindings/python/unicorn/__init__.py
View File

@@ -1,4 +1,4 @@
# Unicorn Python bindings, by Nguyen Anh Quynnh <aquynh@gmail.com> # Unicorn Python bindings, by Nguyen Anh Quynnh <aquynh@gmail.com>
from . import arm_const, arm64_const, mips_const, sparc_const, m68k_const, x86_const from . import arm_const, arm64_const, mips_const, sparc_const, m68k_const, x86_const, riscv_const
from .unicorn_const import * from .unicorn_const import *
from .unicorn import Uc, uc_version, uc_arch_supported, version_bind, debug, UcError, __version__ from .unicorn import Uc, uc_version, uc_arch_supported, version_bind, debug, UcError, __version__

19
tests/unit/endian.h
View File

@@ -41,7 +41,8 @@
# elif (__BYTE_ORDER == __PDP_ENDIAN) # elif (__BYTE_ORDER == __PDP_ENDIAN)
# define BOOST_PDP_ENDIAN # define BOOST_PDP_ENDIAN
# else # else
# error Unknown machine endianness detected. // Failsafe
# define BOOST_LITTLE_ENDIAN
# endif # endif
# define BOOST_BYTE_ORDER __BYTE_ORDER # define BOOST_BYTE_ORDER __BYTE_ORDER
#elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN) #elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN)
@@ -50,11 +51,14 @@
#elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN) #elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
# define BOOST_LITTLE_ENDIAN # define BOOST_LITTLE_ENDIAN
# define BOOST_BYTE_ORDER 1234 # define BOOST_BYTE_ORDER 1234
// https://developer.arm.com/documentation/dui0491/i/Compiler-specific-Features/Predefined-macros
#elif defined(__sparc) || defined(__sparc__) \ #elif defined(__sparc) || defined(__sparc__) \
|| defined(_POWER) || defined(__powerpc__) \ || defined(_POWER) || defined(__powerpc__) \
|| defined(__ppc__) || defined(__hpux) || defined(__hppa) \ || defined(__ppc__) || defined(__hpux) || defined(__hppa) \
|| defined(_MIPSEB) || defined(_POWER) \ || defined(_MIPSEB) || defined(_POWER) \
|| defined(__s390__) || defined(__s390__) \
|| defined(__ARMEB__) || defined(__AARCH64EB__) \
|| defined(__BIG_ENDIAN) || defined(__ARM_BIG_ENDIAN)
# define BOOST_BIG_ENDIAN # define BOOST_BIG_ENDIAN
# define BOOST_BYTE_ORDER 4321 # define BOOST_BYTE_ORDER 4321
#elif defined(__i386__) || defined(__alpha__) \ #elif defined(__i386__) || defined(__alpha__) \
@@ -63,12 +67,17 @@
|| defined(_M_ALPHA) || defined(__amd64) \ || defined(_M_ALPHA) || defined(__amd64) \
|| defined(__amd64__) || defined(_M_AMD64) \ || defined(__amd64__) || defined(_M_AMD64) \
|| defined(__x86_64) || defined(__x86_64__) \ || defined(__x86_64) || defined(__x86_64__) \
|| defined(_M_X64) || defined(__bfin__) || defined(_M_X64) || defined(__bfin__) \
|| defined(__ARMEL__) || defined(__AARCH64EL__) \
|| defined(__arm64__) || defined(__arm__)
# define BOOST_LITTLE_ENDIAN # define BOOST_LITTLE_ENDIAN
# define BOOST_BYTE_ORDER 1234 # define BOOST_BYTE_ORDER 1234
#else #else
# error The file boost/detail/endian.hpp needs to be set up for your CPU type.
// Failsafe
# define BOOST_LITTLE_ENDIAN
# define BOOST_BYTE_ORDER 1234
#endif #endif