diff options
| author | meepingsnesroms | 2017-09-01 11:21:48 -0700 |
|---|---|---|
| committer | GitHub | 2017-09-01 11:21:48 -0700 |
| commit | 6c5b8733e0b286d5a4b4d9b7899e4c17a92cd04a (patch) | |
| tree | 924720c49ac10c9ab3c98e3d3e06c8f4a06bc33c /plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S | |
| parent | 646a63e41c53e5c1c971a4e305d4627dcee43c5e (diff) | |
| parent | 874706c9a527d43f1a737b772225c120da86c31e (diff) | |
| download | pcsx_rearmed-6c5b8733e0b286d5a4b4d9b7899e4c17a92cd04a.tar.gz pcsx_rearmed-6c5b8733e0b286d5a4b4d9b7899e4c17a92cd04a.tar.bz2 pcsx_rearmed-6c5b8733e0b286d5a4b4d9b7899e4c17a92cd04a.zip | |
Merge pull request #2 from libretro/master
Update from master
Diffstat (limited to 'plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S')
| -rw-r--r-- | plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S b/plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S index 110c868..7c820d2 100644 --- a/plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S +++ b/plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S @@ -194,26 +194,18 @@ .align 4 -#ifndef __MACH__ +#include "arm_features.h" -#define function(name) \ - .global name; \ - .type name, %function; \ - name: \ +#define function(name) FUNCTION(name): + +#ifndef TEXRELS_FORBIDDEN #define JT_OP_REL(table_label, index_reg, temp) #define JT_OP(x...) x #define JTE(start, target) target -#define EXTRA_UNSAVED_REGS - #else -#define function(name) \ - .globl _##name; \ - name: \ - _##name: \ - #define JT_OP_REL(table_label, index_reg, temp) \ adr temp, table_label; \ ldr temp, [temp, index_reg, lsl #2]; \ @@ -222,13 +214,12 @@ #define JT_OP(x...) #define JTE(start, target) (target - start) -// r7 is preserved, but add it for EABI alignment.. -#define EXTRA_UNSAVED_REGS r7, r9, +#endif +#ifdef __MACH__ #define flush_render_block_buffer _flush_render_block_buffer #define setup_sprite_untextured_simple _setup_sprite_untextured_simple #define update_texture_8bpp_cache _update_texture_8bpp_cache - #endif @ r0: psx_gpu |