lifning/gpsp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor mips asm cleanup and fixes

Browse source
This commit is contained in:
David Guillen Fandos 2021-05-20 20:12:00 +02:00
parent 261b2db9bb
commit f19f1695a6
2 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
psp/mips_emit.h
View file

@ -558,9 +558,6 @@ u32 arm_to_mips_reg[] =
#define generate_shift_right_arithmetic(ireg, imm) \ #define generate_shift_right_arithmetic(ireg, imm) \
mips_emit_sra(ireg, ireg, imm) \ mips_emit_sra(ireg, ireg, imm) \
#define generate_rotate_right(ireg, imm) \
mips_emit_rotr(ireg, ireg, imm) \
#define generate_add(ireg_dest, ireg_src) \ #define generate_add(ireg_dest, ireg_src) \
mips_emit_addu(ireg_dest, ireg_dest, ireg_src) \ mips_emit_addu(ireg_dest, ireg_dest, ireg_src) \

24
psp/mips_stub.S
View file

@ -34,7 +34,6 @@
.global execute_lsl_flags_reg .global execute_lsl_flags_reg
.global execute_lsr_flags_reg .global execute_lsr_flags_reg
.global execute_asr_flags_reg .global execute_asr_flags_reg
.global execute_ror_flags_reg
.global execute_arm_translate_internal .global execute_arm_translate_internal
.global icache_region_sync .global icache_region_sync
.global reg_check .global reg_check
@ -283,7 +282,7 @@ return_to_main:
lw $fp, 32($sp) lw $fp, 32($sp)
lw $ra, 36($sp) lw $ra, 36($sp)
jr $ra # Return to main jr $ra # Return to main
add $sp, $sp, 48 # Restore stack pointer (delay slot) addiu $sp, $sp, 48 # Restore stack pointer (delay slot)
# Perform an indirect branch. # Perform an indirect branch.
@ -513,11 +512,11 @@ lsl_shift_high:
bne $1, $0, lsl_shift_done # jump if shift == 32 bne $1, $0, lsl_shift_done # jump if shift == 32
andi $22, $4, 1 # c flag = value & 0x01 (delay) andi $22, $4, 1 # c flag = value & 0x01 (delay)
add $22, $0, $0 # c flag = 0 otherwise addu $22, $0, $0 # c flag = 0 otherwise
lsl_shift_done: lsl_shift_done:
jr $ra # return jr $ra # return
add $4, $0, $0 # value = 0 no matter what addu $4, $0, $0 # value = 0 no matter what
execute_lsr_flags_reg: execute_lsr_flags_reg:
@ -538,11 +537,11 @@ lsr_shift_high:
bne $1, $0, lsr_shift_done # jump if shift == 32 bne $1, $0, lsr_shift_done # jump if shift == 32
srl $22, $4, 31 # c flag = value >> 31 (delay) srl $22, $4, 31 # c flag = value >> 31 (delay)
add $22, $0, $0 # c flag = 0 otherwise addu $22, $0, $0 # c flag = 0 otherwise
lsr_shift_done: lsr_shift_done:
jr $ra # return jr $ra # return
add $4, $0, $0 # value = 0 no matter what addu $4, $0, $0 # value = 0 no matter what
execute_asr_flags_reg: execute_asr_flags_reg:
@ -564,22 +563,11 @@ asr_shift_high:
andi $22, $4, 1 # c flag = value & 0x01 andi $22, $4, 1 # c flag = value & 0x01
execute_ror_flags_reg:
beq $5, $0, ror_zero_shift # is the shift zero?
addiu $1, $5, -1 # $1 = (shift - 1) (delay)
srav $1, $4, $1 # $1 = (value >> (shift - 1))
andi $22, $1, 1 # c flag = $1 & 1
ror_zero_shift:
jr $ra # return
rotrv $4, $4, $5 # return (value ror shift) delay
# $4: cycle counter argument # $4: cycle counter argument
# $5: pointer to reg # $5: pointer to reg
execute_arm_translate_internal: execute_arm_translate_internal:
add $sp, $sp, -48 # Store the main thread context addiu $sp, $sp, -48 # Store the main thread context
sw $s0, 0($sp) sw $s0, 0($sp)
sw $s1, 4($sp) sw $s1, 4($sp)
sw $s2, 8($sp) sw $s2, 8($sp)