diff options
| author | dankcushions | 2016-04-22 15:05:41 +0100 |
|---|---|---|
| committer | dankcushions | 2016-04-22 15:05:41 +0100 |
| commit | cb4d282af668df3bdbd428be5a5ad26996cd0f4f (patch) | |
| tree | 93e9704ebb9395c4f6c7bab847d9df7abb005d3d /plugins | |
| parent | 4ed8f00a1221b15925117f1c7413b4640e6e7198 (diff) | |
| parent | 4da64aea132e752bfea9448238599653e741b465 (diff) | |
| download | pcsx_rearmed-cb4d282af668df3bdbd428be5a5ad26996cd0f4f.tar.gz pcsx_rearmed-cb4d282af668df3bdbd428be5a5ad26996cd0f4f.tar.bz2 pcsx_rearmed-cb4d282af668df3bdbd428be5a5ad26996cd0f4f.zip | |
Merge branch 'master' of https://github.com/notaz/pcsx_rearmed into notaz-master
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dfsound/arm_utils.S | 4 | ||||
| -rw-r--r-- | plugins/dfsound/spu.c | 2 | ||||
| -rw-r--r-- | plugins/gpu_unai/gpulib_if.cpp | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S index 9652313..eaeca51 100644 --- a/plugins/dfsound/arm_utils.S +++ b/plugins/dfsound/arm_utils.S @@ -20,10 +20,10 @@ ptr_ChanBuf: .word ESYM(ChanBuf) .align 2 .macro load_varadr reg var -#if defined(__ARM_ARCH_7A__) && !defined(__PIC__) +#if defined(HAVE_ARMV7) && !defined(__PIC__) movw \reg, #:lower16:ESYM(\var) movt \reg, #:upper16:ESYM(\var) -#elif defined(__ARM_ARCH_7A__) && defined(__MACH__) +#elif defined(HAVE_ARMV7) && defined(__MACH__) movw \reg, #:lower16:(ptr_\var-(1678f+8)) movt \reg, #:upper16:(ptr_\var-(1678f+8)) 1678: diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index c6a1bf5..0058ad2 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -35,7 +35,7 @@ #include "arm_features.h" #endif -#ifdef __ARM_ARCH_7A__ +#ifdef HAVE_ARMV7 #define ssat32_to_16(v) \ asm("ssat %0,#16,%1" : "=r" (v) : "r" (v)) #else diff --git a/plugins/gpu_unai/gpulib_if.cpp b/plugins/gpu_unai/gpulib_if.cpp index 646b0f2..2dedbf8 100644 --- a/plugins/gpu_unai/gpulib_if.cpp +++ b/plugins/gpu_unai/gpulib_if.cpp @@ -23,6 +23,7 @@ #include <stdlib.h> #include <string.h> #include "../gpulib/gpu.h" +#include "arm_features.h" #define u8 uint8_t #define s8 int8_t @@ -171,7 +172,7 @@ int do_cmd_list(unsigned int *list, int list_len, int *last_cmd) unsigned int *list_end = list + list_len; linesInterlace = force_interlace; -#ifndef __ARM_ARCH_7A__ /* XXX */ +#ifdef HAVE_PRE_ARMV7 /* XXX */ linesInterlace |= gpu.status.interlace; #endif |