diff options
| author | notaz | 2015-02-06 01:29:00 +0200 |
|---|---|---|
| committer | notaz | 2015-02-06 01:29:00 +0200 |
| commit | 2af7e74feec67c0a798ac190774cb4b3e925be76 (patch) | |
| tree | 27a148679e25f6edb7a2dd85c54514139bb72450 /libpcsxcore/gte_arm.S | |
| parent | cebb70f24ab54693b12aaa27b85a52689e26e1ff (diff) | |
| parent | 1e0eac2348343c8a046f7a75d460f087556cf7f6 (diff) | |
| download | pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.tar.gz pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.tar.bz2 pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.zip | |
Merge branch 'upstream' into libretro
Diffstat (limited to 'libpcsxcore/gte_arm.S')
| -rw-r--r-- | libpcsxcore/gte_arm.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpcsxcore/gte_arm.S b/libpcsxcore/gte_arm.S index 3ef876d..d6fc1ab 100644 --- a/libpcsxcore/gte_arm.S +++ b/libpcsxcore/gte_arm.S @@ -11,7 +11,7 @@ .align 2 .macro sgnxt16 rd rs -#ifdef HAVE_ARMV7 +#ifdef HAVE_ARMV6 sxth \rd, \rs #else lsl \rd, \rs, #16 @@ -28,7 +28,7 @@ .endm .macro ssatx rd wr bit -#ifdef HAVE_ARMV7 +#ifdef HAVE_ARMV6 ssat \rd, #\bit, \rd #else cmp \rd, \wr @@ -52,7 +52,7 @@ .endm .macro usat16_ rd rs -#ifdef HAVE_ARMV7 +#ifdef HAVE_ARMV6 usat \rd, #16, \rs #else subs \rd, \rs, #0 |