3.13.0-10 - Add valgrind-3.13.0-ppc64-timebase.patch.
This commit is contained in:
Mark Wielaard
parent
edfc5f2f0f
commit
5c9a40daf7
99
valgrind-3.13.0-ppc64-timebase.patch
Normal file
99
valgrind-3.13.0-ppc64-timebase.patch
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
commit 6a55b1e82ccda3f0d663d2cc89eb543ae2d096bf
|
||||||
|
Author: Carl Love <carll@us.ibm.com>
|
||||||
|
Date: Tue Oct 31 13:45:28 2017 -0500
|
||||||
|
|
||||||
|
Fix access to time base register to return 64-bits.
|
||||||
|
|
||||||
|
diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c
|
||||||
|
index f63146e7e..4ec37f5f9 100644
|
||||||
|
--- a/VEX/priv/guest_ppc_toIR.c
|
||||||
|
+++ b/VEX/priv/guest_ppc_toIR.c
|
||||||
|
@@ -9419,26 +9419,60 @@ static Bool dis_proc_ctl ( const VexAbiInfo* vbi, UInt theInstr )
|
||||||
|
putIReg( rD_addr, getGST( PPC_GST_SPRG3_RO ) );
|
||||||
|
break;
|
||||||
|
|
||||||
|
- /* Even a lowly PPC7400 can run the associated helper, so no
|
||||||
|
- obvious need for feature testing at this point. */
|
||||||
|
- case 268 /* 0x10C */:
|
||||||
|
- case 269 /* 0x10D */: {
|
||||||
|
- UInt arg = SPR==268 ? 0 : 1;
|
||||||
|
- IRTemp val = newTemp(Ity_I32);
|
||||||
|
- IRExpr** args = mkIRExprVec_1( mkU32(arg) );
|
||||||
|
+ case 268 /* 0x10C TB - 64 bit time base register */:
|
||||||
|
+ {
|
||||||
|
+ IRTemp val = newTemp(Ity_I64);
|
||||||
|
+ IRExpr** args = mkIRExprVec_0();
|
||||||
|
IRDirty* d = unsafeIRDirty_1_N(
|
||||||
|
- val,
|
||||||
|
- 0/*regparms*/,
|
||||||
|
- "ppc32g_dirtyhelper_MFSPR_268_269",
|
||||||
|
- fnptr_to_fnentry
|
||||||
|
- (vbi, &ppc32g_dirtyhelper_MFSPR_268_269),
|
||||||
|
- args
|
||||||
|
- );
|
||||||
|
+ val,
|
||||||
|
+ 0/*regparms*/,
|
||||||
|
+ "ppcg_dirtyhelper_MFTB",
|
||||||
|
+ fnptr_to_fnentry(vbi,
|
||||||
|
+ &ppcg_dirtyhelper_MFTB),
|
||||||
|
+ args );
|
||||||
|
+ /* execute the dirty call, dumping the result in val. */
|
||||||
|
+ stmt( IRStmt_Dirty(d) );
|
||||||
|
+ putIReg( rD_addr, (mode64) ? mkexpr(val) :
|
||||||
|
+ unop(Iop_64to32, mkexpr(val)) );
|
||||||
|
+
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ case 269 /* 0x10D TBU - upper 32-bits of time base register */:
|
||||||
|
+ {
|
||||||
|
+ DIP("mfspr r%u,%u", rD_addr, SPR);
|
||||||
|
+ IRTemp val = newTemp(Ity_I64);
|
||||||
|
+ IRExpr** args = mkIRExprVec_0();
|
||||||
|
+ IRDirty* d = unsafeIRDirty_1_N(
|
||||||
|
+ val,
|
||||||
|
+ 0/*regparms*/,
|
||||||
|
+ "ppcg_dirtyhelper_MFTB",
|
||||||
|
+ fnptr_to_fnentry(vbi,
|
||||||
|
+ &ppcg_dirtyhelper_MFTB),
|
||||||
|
+ args );
|
||||||
|
/* execute the dirty call, dumping the result in val. */
|
||||||
|
stmt( IRStmt_Dirty(d) );
|
||||||
|
putIReg( rD_addr,
|
||||||
|
- mkWidenFrom32(ty, mkexpr(val), False/*unsigned*/) );
|
||||||
|
+ mkWidenFrom32(ty, unop(Iop_64HIto32, mkexpr(val)),
|
||||||
|
+ /* Signed */False) );
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ case 284 /* 0x1 TBL - lower 32-bits of time base register */:
|
||||||
|
+ {
|
||||||
|
DIP("mfspr r%u,%u", rD_addr, SPR);
|
||||||
|
+ IRTemp val = newTemp(Ity_I64);
|
||||||
|
+ IRExpr** args = mkIRExprVec_0();
|
||||||
|
+ IRDirty* d = unsafeIRDirty_1_N(
|
||||||
|
+ val,
|
||||||
|
+ 0/*regparms*/,
|
||||||
|
+ "ppcg_dirtyhelper_MFTB",
|
||||||
|
+ fnptr_to_fnentry(vbi,
|
||||||
|
+ &ppcg_dirtyhelper_MFTB),
|
||||||
|
+ args );
|
||||||
|
+ /* execute the dirty call, dumping the result in val. */
|
||||||
|
+ stmt( IRStmt_Dirty(d) );
|
||||||
|
+ putIReg( rD_addr,
|
||||||
|
+ mkWidenFrom32(ty, unop(Iop_64to32, mkexpr(val)),
|
||||||
|
+ /* Signed */False) );
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -9493,6 +9527,12 @@ static Bool dis_proc_ctl ( const VexAbiInfo* vbi, UInt theInstr )
|
||||||
|
putIReg( rD_addr, (mode64) ? mkexpr(val) :
|
||||||
|
unop(Iop_64to32, mkexpr(val)) );
|
||||||
|
break;
|
||||||
|
+ case 284:
|
||||||
|
+ DIP("mftbl r%u", rD_addr);
|
||||||
|
+ putIReg( rD_addr,
|
||||||
|
+ mkWidenFrom32(ty, unop(Iop_64to32, mkexpr(val)),
|
||||||
|
+ /* Signed */False) );
|
||||||
|
+ break;
|
||||||
|
default:
|
||||||
|
return False; /* illegal instruction */
|
||||||
|
}
|
||||||
@ -3,7 +3,7 @@
|
|||||||
Summary: Tool for finding memory management bugs in programs
|
Summary: Tool for finding memory management bugs in programs
|
||||||
Name: %{?scl_prefix}valgrind
|
Name: %{?scl_prefix}valgrind
|
||||||
Version: 3.13.0
|
Version: 3.13.0
|
||||||
Release: 9%{?dist}
|
Release: 10%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.valgrind.org/
|
URL: http://www.valgrind.org/
|
||||||
@ -144,6 +144,9 @@ Patch15: valgrind-3.13.0-suppress-dl-trampoline-sse-avx.patch
|
|||||||
# Implement static TLS code for more platforms
|
# Implement static TLS code for more platforms
|
||||||
Patch16: valgrind-3.13.0-static-tls.patch
|
Patch16: valgrind-3.13.0-static-tls.patch
|
||||||
|
|
||||||
|
# KDE#386397 PPC64 valgrind truncates powerpc timebase to 32-bits.
|
||||||
|
Patch17: valgrind-3.13.0-ppc64-timebase.patch
|
||||||
|
|
||||||
%if %{build_multilib}
|
%if %{build_multilib}
|
||||||
# Ensure glibc{,-devel} is installed for both multilib arches
|
# Ensure glibc{,-devel} is installed for both multilib arches
|
||||||
BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
|
BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
|
||||||
@ -274,6 +277,7 @@ Valgrind User Manual for details.
|
|||||||
%patch14 -p1
|
%patch14 -p1
|
||||||
%patch15 -p1
|
%patch15 -p1
|
||||||
%patch16 -p1
|
%patch16 -p1
|
||||||
|
%patch17 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# We need to use the software collection compiler and binutils if available.
|
# We need to use the software collection compiler and binutils if available.
|
||||||
@ -476,6 +480,9 @@ echo ===============END TESTING===============
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Nov 2 2017 Mark Wielaard <mjw@fedoraproject.org> - 3.13.0-10
|
||||||
|
- Add valgrind-3.13.0-ppc64-timebase.patch.
|
||||||
|
|
||||||
* Tue Oct 17 2017 Mark Wielaard <mjw@fedoraproject.org> - 3.13.0-9
|
* Tue Oct 17 2017 Mark Wielaard <mjw@fedoraproject.org> - 3.13.0-9
|
||||||
- Add valgrind-3.13.0-amd64-eflags-tests.patch
|
- Add valgrind-3.13.0-amd64-eflags-tests.patch
|
||||||
- Add valgrind-3.13.0-suppress-dl-trampoline-sse-avx.patch
|
- Add valgrind-3.13.0-suppress-dl-trampoline-sse-avx.patch
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user