X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flightrec%2Femitter.c;h=3875e58ed052fe86f4afc1d3f722c6f531ea9984;hb=2fb8465594a7ffb7ccbac39fdedf7c70085d7f63;hp=2bd4dcadcb840b21ae5022733cedff3e13fe6569;hpb=2b1b10dd333f8b525b90a15468824aae0ff4eb2f;p=pcsx_rearmed.git

diff --git a/deps/lightrec/emitter.c b/deps/lightrec/emitter.c
index 2bd4dcad..3875e58e 100644
--- a/deps/lightrec/emitter.c
+++ b/deps/lightrec/emitter.c
@@ -71,6 +71,7 @@ static void lightrec_emit_end_of_block(struct lightrec_cstate *state,
 	const struct opcode *op = &block->opcode_list[offset],
 			    *ds = get_delay_slot(block->opcode_list, offset);
 	u32 cycles = state->cycles + lightrec_cycles_of_opcode(state->state, op->c);
+	bool has_ds = has_delay_slot(op->c);
 
 	jit_note(__FILE__, __LINE__);
 
@@ -89,8 +90,7 @@ static void lightrec_emit_end_of_block(struct lightrec_cstate *state,
 		update_ra_register(reg_cache, _jit, ra_reg, block->pc, link);
 	}
 
-	if (has_delay_slot(op->c) &&
-	    !op_flag_no_ds(op->flags) && !op_flag_local_branch(op->flags)) {
+	if (has_ds && !op_flag_no_ds(op->flags) && !op_flag_local_branch(op->flags)) {
 		cycles += lightrec_cycles_of_opcode(state->state, ds->c);
 
 		/* Recompile the delay slot */
@@ -106,8 +106,8 @@ static void lightrec_emit_end_of_block(struct lightrec_cstate *state,
 		pr_debug("EOB: %u cycles\n", cycles);
 	}
 
-	if (op_flag_load_delay(ds->flags)
-	    && opcode_is_load(ds->c) && !state->no_load_delay) {
+	if (has_ds && op_flag_load_delay(ds->flags)
+	    && opcode_has_load_delay(ds->c) && !state->no_load_delay) {
 		/* If the delay slot is a load opcode, its target register
 		 * will be written after the first opcode of the target is
 		 * executed. Handle this by jumping to a special section of