From: notaz Date: Mon, 1 Aug 2022 21:08:49 +0000 (+0300) Subject: gpu_neon: fix some more abi violations X-Git-Tag: r24~352 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=commitdiff_plain;h=fab27ba2d1aab02ab99f416bb2da01123663af8c gpu_neon: fix some more abi violations --- 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 d6907e4c..9d342ae7 100644 --- a/plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S +++ b/plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S @@ -3174,9 +3174,9 @@ function(texture_blocks_16bpp) .align 3; \ \ function(shade_blocks_##shading##_textured_modulated_##dithering##_##target) \ + save_abi_regs(); \ shade_blocks_textured_modulated_prologue_##shading(dithering, target); \ stmdb sp!, { r4 - r5, lr }; \ - save_abi_regs(); \ ldrh num_blocks, [psx_gpu, #psx_gpu_num_blocks_offset]; \ \ vld1.u32 { test_mask }, [psx_gpu, :128]; \ @@ -3292,8 +3292,9 @@ function(shade_blocks_##shading##_textured_modulated_##dithering##_##target) \ shade_blocks_textured_modulated_store_draw_mask_##target(28); \ shade_blocks_textured_modulated_store_pixels_##target(); \ \ + ldmia sp!, { r4 - r5, lr }; \ restore_abi_regs(); \ - ldmia sp!, { r4 - r5, pc } \ + bx lr \ shade_blocks_textured_modulated_builder(shaded, dithered, direct); @@ -5950,7 +5951,7 @@ setup_sprite_untextured_height_loop: #define texel_block_expanded_b q2 #define texel_block_expanded_ab q2 #define texel_block_expanded_c q3 -#define texel_block_expanded_d q4 +#define texel_block_expanded_d q0 #define texel_block_expanded_cd q3 function(update_texture_4bpp_cache)