X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flightrec%2Finterpreter.c;h=43bea83f0a4f7e73d71a71b9b6ebb7e5a0da1f1a;hb=13b02197fcb7575646408094d5583ed7391b1153;hp=57986d810065599665e5b84a128368b17eef3f88;hpb=03535202b4b624c534340322646fb7f4062e3f53;p=pcsx_rearmed.git

diff --git a/deps/lightrec/interpreter.c b/deps/lightrec/interpreter.c
index 57986d81..43bea83f 100644
--- a/deps/lightrec/interpreter.c
+++ b/deps/lightrec/interpreter.c
@@ -985,6 +985,33 @@ static u32 int_META_EXTS(struct interpreter *inter)
 	return jump_next(inter);
 }
 
+static u32 int_META_MULT2(struct interpreter *inter)
+{
+	u32 *reg_cache = inter->state->regs.gpr;
+	union code c = inter->op->c;
+	u32 rs = reg_cache[c.r.rs];
+	u8 reg_lo = get_mult_div_lo(c);
+	u8 reg_hi = get_mult_div_hi(c);
+
+	if (!op_flag_no_lo(inter->op->flags)) {
+		if (c.r.op < 32)
+			reg_cache[reg_lo] = rs << c.r.op;
+		else
+			reg_cache[reg_lo] = 0;
+	}
+
+	if (!op_flag_no_hi(inter->op->flags)) {
+		if (c.r.op >= 32)
+			reg_cache[reg_hi] = rs << (c.r.op - 32);
+		else if (c.i.op == OP_META_MULT2)
+			reg_cache[reg_hi] = (s32) rs >> (32 - c.r.op);
+		else
+			reg_cache[reg_hi] = rs >> (32 - c.r.op);
+	}
+
+	return jump_next(inter);
+}
+
 static const lightrec_int_func_t int_standard[64] = {
 	SET_DEFAULT_ELM(int_standard, int_unimplemented),
 	[OP_SPECIAL]		= int_SPECIAL,
@@ -1023,6 +1050,8 @@ static const lightrec_int_func_t int_standard[64] = {
 	[OP_META_MOV]		= int_META_MOV,
 	[OP_META_EXTC]		= int_META_EXTC,
 	[OP_META_EXTS]		= int_META_EXTS,
+	[OP_META_MULT2]		= int_META_MULT2,
+	[OP_META_MULTU2]	= int_META_MULT2,
 };
 
 static const lightrec_int_func_t int_special[64] = {
@@ -1155,5 +1184,7 @@ u32 lightrec_emulate_block(struct lightrec_state *state, struct block *block, u3
 
 	pr_err("PC 0x%x is outside block at PC 0x%x\n", pc, block->pc);
 
+	lightrec_set_exit_flags(state, LIGHTREC_EXIT_SEGFAULT);
+
 	return 0;
 }