drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #330 from MaddTheSane/arm64

Browse Source 
Better AARCH64/Arm64 support.
This commit is contained in:
Ignacio 2020-08-23 23:44:26 -07:00 committed by GitHub
commit 249d678b25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvcore/Debug.cpp
View File

@ -604,7 +604,7 @@ namespace
# elif NV_CPU_X86 # elif NV_CPU_X86
ucontext_t * ucp = (ucontext_t *)secret; ucontext_t * ucp = (ucontext_t *)secret;
return (void *) ucp->uc_mcontext->__ss.__eip; return (void *) ucp->uc_mcontext->__ss.__eip;
# elif NV_CPU_ARM # elif NV_CPU_ARM || NV_CPU_AARCH64
ucontext_t * ucp = (ucontext_t *)secret; ucontext_t * ucp = (ucontext_t *)secret;
return (void *) ucp->uc_mcontext->__ss.__pc; return (void *) ucp->uc_mcontext->__ss.__pc;
# else # else

4
src/nvcore/nvcore.h
View File

@ -97,7 +97,7 @@
// NV_CPU_X86_64 // NV_CPU_X86_64
// NV_CPU_PPC // NV_CPU_PPC
// NV_CPU_ARM // NV_CPU_ARM
// NV_CPU_ARM_64 // NV_CPU_AARCH64
// NV_CPU_E2K // NV_CPU_E2K
#define NV_CPU_STRING POSH_CPU_STRING #define NV_CPU_STRING POSH_CPU_STRING
@ -112,7 +112,7 @@
#elif defined POSH_CPU_STRONGARM #elif defined POSH_CPU_STRONGARM
# define NV_CPU_ARM 1 # define NV_CPU_ARM 1
#elif defined POSH_CPU_AARCH64 #elif defined POSH_CPU_AARCH64
# define NV_CPU_ARM_64 1 # define NV_CPU_AARCH64 1
#elif defined POSH_CPU_E2K #elif defined POSH_CPU_E2K
# define NV_CPU_E2K 1 # define NV_CPU_E2K 1
#else #else