From: Carl Love <cel@us.ibm.com>
Date: Thu, 5 Sep 2013 19:47:40 +0000 (+0000)
Subject: The current code is not properly handling a non-zero TH field in the
X-Git-Tag: svn/VALGRIND_3_9_0^2~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2206934b71aa558dd455d304a9b9e303018cd8fb;p=thirdparty%2Fvalgrind.git

The current code is not properly handling a non-zero TH field in the
dcbt instruction, which is valid for several forms of data cache block
touch instructions.  This patch adds the needed support to
VEX/priv/guest_ppc_toIR.c.

Bugzilla 324518

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

diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c
index 5e350e7515..25cb505d38 100644
--- a/VEX/priv/guest_ppc_toIR.c
+++ b/VEX/priv/guest_ppc_toIR.c
@@ -6737,14 +6737,16 @@ static Bool dis_cache_manage ( UInt         theInstr,
 
    IRType ty     = mode64 ? Ity_I64 : Ity_I32;
 
-   /* For dcbt, the lowest two bits of b21to25 encode an
-      access-direction hint (TH field) which we ignore.  Well, that's
-      what the PowerPC documentation says.  In fact xlc -O4 on POWER5
-      seems to generate values of 8 and 10 for b21to25. */
-   if (opc1 == 0x1F && opc2 == 0x116) {
-     /* b21to25 &= ~3; */ /* if the docs were true */
-     b21to25 = 0; /* blunt instrument */
+   // Check for valid hint values for dcbt and dcbtst as currently described in
+   // ISA 2.07.  If valid, then we simply set b21to25 to zero since we have no
+   // means of modeling the hint anyway.
+   if (opc1 == 0x1F && ((opc2 == 0x116) || (opc2 == 0xF6))) {
+      if (b21to25 == 0b10000 || b21to25 < 0b10000)
+         b21to25 = 0;
    }
+   if (opc1 == 0x1F && opc2 == 0x116 && b21to25 == 0b10001)
+      b21to25 = 0;
+
    if (opc1 == 0x1F && opc2 == 0x3F6) { // dcbz
       if (b21to25 == 1) {
          is_dcbzl = True;