rpms/valgrind
7
0
Fork 0
Code Issues Pull Requests Releases Activity

3.14.0-14 - Add valgrind-3.14.0-ppc-subfe.patch

Browse Source
This commit is contained in:
Mark Wielaard 2019-02-21 17:35:08 +01:00
parent 7dd96b1159
commit 2baa8912ca
2 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
valgrind-3.14.0-ppc-subfe.patch Normal file
View File

@ -0,0 +1,43 @@
commit 256cf43c5eadb28edb45436aca6fda8ee55eb10e
Author: Mark Wielaard <mark@klomp.org>
Date: Thu Feb 21 17:21:53 2019 +0100
memcheck powerpc subfe x, x, x initializes x to 0 or -1 based on CA
GCC might use subfe x, x, x to initialize x to 0 or -1, based on
whether the carry flag is set. This happens in some cases when g++
compiles resetting a unique_ptr. The "trick" used by the compiler is
that it can AND a pointer with the register x (now 0x0 or 0xffffffff)
to set something to NULL or to the given pointer.
subfe is implemented as rD = (log not)rA + rB + XER[CA]
if we instead implement it as rD = rB - rA - (XER[CA] ^ 1)
then memcheck can see that rB and Ra cancel each other out if they
are the same.
https://bugs.kde.org/show_bug.cgi?id=404054
diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c
index e207642..00ae6df 100644
--- a/VEX/priv/guest_ppc_toIR.c
+++ b/VEX/priv/guest_ppc_toIR.c
@@ -5361,11 +5361,15 @@ static Bool dis_int_arith ( UInt theInstr )
flag_OE ? "o" : "", flag_rC ? ".":"",
rD_addr, rA_addr, rB_addr);
// rD = (log not)rA + rB + XER[CA]
+ // ==>
+ // rD = rB - rA - (XER[CA] ^ 1)
assign( old_xer_ca, mkWidenFrom32(ty, getXER_CA_32(), False) );
- assign( rD, binop( mkSzOp(ty, Iop_Add8),
- unop( mkSzOp(ty, Iop_Not8), mkexpr(rA)),
- binop( mkSzOp(ty, Iop_Add8),
- mkexpr(rB), mkexpr(old_xer_ca))) );
+ assign( rD, binop( mkSzOp(ty, Iop_Sub8),
+ binop( mkSzOp(ty, Iop_Sub8),
+ mkexpr(rB), mkexpr(rA)),
+ binop(mkSzOp(ty, Iop_Xor8),
+ mkexpr(old_xer_ca),
+ mkSzImm(ty, 1))) );
set_XER_CA_CA32( ty, PPCG_FLAG_OP_SUBFE,
mkexpr(rD), mkexpr(rA), mkexpr(rB),
mkexpr(old_xer_ca) );

7
valgrind.spec
View File

@ -175,6 +175,9 @@ Patch35: valgrind-3.14.0-subrange_type-count.patch
# KDE#403552 s390x: wrong facility bit checked for vector facility
Patch36: valgrind-3.14.0-s390x-vec-facility-bit.patch
# KDE#404054 powerpc subfe x, x, x initializes x to 0 or -1 based on CA
Patch37: valgrind-3.14.0-ppc-subfe.patch
%if %{build_multilib}
# Ensure glibc{,-devel} is installed for both multilib arches
@ -341,6 +344,7 @@ Valgrind User Manual for details.
%patch34 -p1
%patch35 -p1
%patch36 -p1
%patch37 -p1
%build
CC=gcc
@ -575,6 +579,9 @@ fi
%endif
%changelog
* Thu Feb 21 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0-14
- Add valgrind-3.14.0-ppc-subfe.patch
* Thu Feb 14 2019 Orion Poplawski <orion@nwra.com> - 1:3.14.0-13
- Rebuild for openmpi 3.1.3