From: Petar Jovanovic <mips32r2@gmail.com>
Date: Fri, 13 Nov 2015 15:45:38 +0000 (+0000)
Subject: mips: fix incorrect assert for hwcaps_host
X-Git-Tag: svn/VALGRIND_3_12_0^2~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74d27264f464443b9f7e728347e8ef2a7d3d9d41;p=thirdparty%2Fvalgrind.git

mips: fix incorrect assert for hwcaps_host

Fix incorrect and incomplete assert condition for hwcaps_host in
iselSB_MIPS().

Spotted by Coverity and reported by Rhys Kidd.


git-svn-id: svn://svn.valgrind.org/vex/trunk@3203
---

diff --git a/VEX/priv/host_mips_isel.c b/VEX/priv/host_mips_isel.c
index a4a89cb974..66b3014d04 100644
--- a/VEX/priv/host_mips_isel.c
+++ b/VEX/priv/host_mips_isel.c
@@ -4171,9 +4171,10 @@ HInstrArray *iselSB_MIPS ( const IRSB* bb,
 
    /* sanity ... */
    vassert(arch_host == VexArchMIPS32 || arch_host == VexArchMIPS64);
-   vassert(VEX_PRID_COMP_MIPS == hwcaps_host
-           || VEX_PRID_COMP_BROADCOM == hwcaps_host
-           || VEX_PRID_COMP_NETLOGIC);
+   vassert(VEX_PRID_COMP_MIPS == VEX_MIPS_COMP_ID(hwcaps_host)
+           || VEX_PRID_COMP_BROADCOM == VEX_MIPS_COMP_ID(hwcaps_host)
+           || VEX_PRID_COMP_NETLOGIC == VEX_MIPS_COMP_ID(hwcaps_host)
+           || VEX_PRID_COMP_CAVIUM == VEX_MIPS_COMP_ID(hwcaps_host));
 
    /* Check that the host's endianness is as expected. */
    vassert(archinfo_host->endness == VexEndnessLE