From: Stefan Maksimovic <stefan.maksimovic@rt-rk.com>
Date: Fri, 17 Jan 2020 13:19:44 +0000 (+0000)
Subject: mips64: fix assert in host_mips_defs.c for Malu_MADD
X-Git-Tag: VALGRIND_3_16_0~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0483f86aacd892f416dd8374a028bbdf34b40ecd;p=thirdparty%2Fvalgrind.git

mips64: fix assert in host_mips_defs.c for Malu_MADD

Mark the immediate as signed for Iex_Get and Ist_Put for Ity_V128 on BE.

The Malu_MADD case in emit_MIPSInst in VEX/priv/host_mips_defs.c expects a
signed immediate, hence the change.

This fixes an assert in host_mips_defs.c.
---

diff --git a/VEX/priv/host_mips_isel.c b/VEX/priv/host_mips_isel.c
index 51428cfc39..51ac757731 100644
--- a/VEX/priv/host_mips_isel.c
+++ b/VEX/priv/host_mips_isel.c
@@ -2851,8 +2851,9 @@ static HReg iselV128Expr_wrk(ISelEnv* env, IRExpr* e) {
       HReg v_dst = newVRegV(env);
 #if defined(_MIPSEB)
       HReg r_addr = newVRegI(env);
+      vassert(!(e->Iex.Get.offset & ~0x7FFF));
       addInstr(env, MIPSInstr_Alu(mode64 ? Malu_DADD : Malu_ADD, r_addr, GuestStatePointer(mode64),
-                                  MIPSRH_Imm(False, e->Iex.Get.offset)));
+                                  MIPSRH_Imm(True, e->Iex.Get.offset)));
       addInstr(env, MIPSInstr_MsaMi10(MSA_LD, 0, r_addr, v_dst, MSA_B));
 #else
       vassert(!(e->Iex.Get.offset & 7));
@@ -6974,9 +6975,10 @@ static void iselStmt(ISelEnv * env, IRStmt * stmt)
             vassert(has_msa);
             HReg v_src = iselV128Expr(env, stmt->Ist.Put.data);
 #if defined(_MIPSEB)
+            vassert(!(stmt->Ist.Put.offset & ~0x7FFF));
             HReg r_addr = newVRegI(env);
             addInstr(env, MIPSInstr_Alu(mode64 ? Malu_DADD : Malu_ADD, r_addr, GuestStatePointer(mode64),
-                                        MIPSRH_Imm(False, stmt->Ist.Put.offset)));
+                                        MIPSRH_Imm(True, stmt->Ist.Put.offset)));
             addInstr(env, MIPSInstr_MsaMi10(MSA_ST, 0, r_addr, v_src, MSA_B));
 #else
             vassert(!(stmt->Ist.Put.offset & 7));