Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: asm pause does not exist on Apple ARM #15

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: asm pause does not exist on Apple ARM #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions lzhamdecomp/lzham_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,23 @@
#elif (TARGET_OS_MAC == 1)
#define LZHAM_PLATFORM_PC 1

#if defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__)
#define LZHAM_PLATFORM_PC_X64 1
#define LZHAM_64BIT_POINTERS 1
#define LZHAM_CPU_HAS_64BIT_REGISTERS 1
#else
#define LZHAM_PLATFORM_PC_X86 1
#define LZHAM_64BIT_POINTERS 0
#define LZHAM_CPU_HAS_64BIT_REGISTERS 0
#endif
#if defined(__arm64__) || defined(__aarch64__)
#define LZHAM_PLATFORM_PC_ARM64 1
#define LZHAM_64BIT_POINTERS 1
#define LZHAM_CPU_HAS_64BIT_REGISTERS 1
#elif defined(__arm__)
#define LZHAM_PLATFORM_PC_ARM32 1
#define LZHAM_64BIT_POINTERS 0
#define LZHAM_CPU_HAS_64BIT_REGISTERS 0
#elif defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__)
#define LZHAM_PLATFORM_PC_X64 1
#define LZHAM_64BIT_POINTERS 1
#define LZHAM_CPU_HAS_64BIT_REGISTERS 1
#else
#define LZHAM_PLATFORM_PC_X86 1
#define LZHAM_64BIT_POINTERS 0
#define LZHAM_CPU_HAS_64BIT_REGISTERS 0
#endif

#define LZHAM_USE_UNALIGNED_INT_LOADS 1

Expand Down
8 changes: 7 additions & 1 deletion lzhamdecomp/lzham_platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ void lzham_fail(const char* pExp, const char* pFile, unsigned line);
#if defined(__GNUC__) && LZHAM_PLATFORM_PC
extern __inline__ __attribute__((__always_inline__,__gnu_inline__)) void lzham_yield_processor()
{
__asm__ __volatile__("pause");
#if LZHAM_PLATFORM_PC_X64 || LZHAM_PLATFORM_PC_X86
__asm__ __volatile__("pause");
#elif LZHAM_PLATFORM_PC_ARM64 || LZHAM_PLATFORM_PC_ARM32
__asm__ __volatile__("yield");
#else
__asm__ __volatile__("rep; nop" : : : "memory");
#endif
}
#elif LZHAM_PLATFORM_X360
#define lzham_yield_processor() \
Expand Down