Author: florian
Date: Sun May 10 12:23:01 2015
New Revision: 15202
Log:
Merge from trunk
Added:
branches/ASPACEM_TWEAKS/tests/check_ppc64le_cap
- copied unchanged from r15201, trunk/tests/check_ppc64le_cap
Modified:
branches/ASPACEM_TWEAKS/ (props changed)
branches/ASPACEM_TWEAKS/NEWS
branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c
branches/ASPACEM_TWEAKS/coregrind/m_stacktrace.c
branches/ASPACEM_TWEAKS/coregrind/m_syscall.c
branches/ASPACEM_TWEAKS/coregrind/m_syswrap/priv_syswrap-linux.h
branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-amd64-linux.c
branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-arm-linux.c
branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-arm64-linux.c
branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-linux.c
branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-mips32-linux.c
branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-mips64-linux.c
branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-linux.c
branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-linux.c
branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-s390x-linux.c
branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-x86-linux.c
branches/ASPACEM_TWEAKS/darwin12.supp
branches/ASPACEM_TWEAKS/docs/internals/3_10_BUGSTATUS.txt
branches/ASPACEM_TWEAKS/drd/tests/pth_create_chain.vgtest
branches/ASPACEM_TWEAKS/memcheck/tests/amd64/fxsave-amd64.c
branches/ASPACEM_TWEAKS/memcheck/tests/badjump.vgtest
branches/ASPACEM_TWEAKS/memcheck/tests/badjump2.c
branches/ASPACEM_TWEAKS/memcheck/tests/supp_unknown.vgtest
branches/ASPACEM_TWEAKS/none/tests/amd64/ (props changed)
branches/ASPACEM_TWEAKS/none/tests/ppc32/jm_vec_isa_2_07.vgtest
branches/ASPACEM_TWEAKS/none/tests/x86/int.disabled
branches/ASPACEM_TWEAKS/perf/memrw.c
Modified: branches/ASPACEM_TWEAKS/NEWS
==============================================================================
--- branches/ASPACEM_TWEAKS/NEWS (original)
+++ branches/ASPACEM_TWEAKS/NEWS Sun May 10 12:23:01 2015
@@ -87,6 +87,7 @@
339288 support Cavium Octeon MIPS specific BBIT*32 instructions
339442 Fix testsuite build failure on OS X 10.9
339542 Enable compilation with Intel's ICC compiler
+339636 Use fxsave64 and fxrstor64 mnemonics instead of old-school rex64 prefix
339688 Mac-specific ASM does not support .version directive (cpuid,
tronical and pushfpopf tests)
339745 Valgrind crash when check Marmalade app (partial fix)
@@ -170,6 +171,9 @@
346487 Compiler generates "note" about a future ABI change for PPC64
346801 Fix link error on OS X: _vgModuleLocal_sf_maybe_extend_stack
347151 Fix suppression for pthread_rwlock_init on OS X 10.8
+347379 valgrind --leak-check=full memleak errors from system libraries on OS X 10.8
+ == 217236
+347389 unhandled syscall: 373 (Linux ARM syncfs)
n-i-bz Provide implementations of certain compiler builtins to support
compilers who may not provide those
n-i-bz Old STABS code is still being compiled, but never used. Remove it.
Modified: branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_aspacemgr/aspacemgr-linux.c Sun May 10 12:23:01 2015
@@ -1172,11 +1172,11 @@
/* Test if a piece of memory is addressable by client or by valgrind with at
least the "prot" protection permissions by examining the underlying
- segments. If client && freeOk is True then SkFree and SkResvn areas are
- also allowed.
+ segments. The KINDS argument specifies the allowed segments ADDR may
+ belong to in order to be considered "valid".
*/
static
-Bool is_valid_for( Bool client, Addr start, SizeT len, UInt prot, Bool freeOk )
+Bool is_valid_for( UInt kinds, Addr start, SizeT len, UInt prot )
{
Int i, iLo, iHi;
Bool needR, needW, needX;
@@ -1204,34 +1204,17 @@
iHi = find_nsegment_idx(start + len - 1);
}
- if (client) {
- for (i = iLo; i <= iHi; i++) {
- if ( (nsegments[i].kind == SkFileC
- || nsegments[i].kind == SkAnonC
- || nsegments[i].kind == SkShmC
- || (nsegments[i].kind == SkFree && freeOk)
- || (nsegments[i].kind == SkResvn && freeOk))
- && (needR ? nsegments[i].hasR : True)
- && (needW ? nsegments[i].hasW : True)
- && (needX ? nsegments[i].hasX : True) ) {
- /* ok */
- } else {
- return False;
- }
- }
- } else {
- for (i = iLo; i <= iHi; i++) {
- if ( (nsegments[i].kind == SkFileV
- || nsegments[i].kind == SkAnonV)
- && (needR ? nsegments[i].hasR : True)
- && (needW ? nsegments[i].hasW : True)
- && (needX ? nsegments[i].hasX : True) ) {
- /* ok */
- } else {
- return False;
- }
+ for (i = iLo; i <= iHi; i++) {
+ if ( (nsegments[i].kind & kinds) != 0
+ && (needR ? nsegments[i].hasR : True)
+ && (needW ? nsegments[i].hasW : True)
+ && (needX ? nsegments[i].hasX : True) ) {
+ /* ok */
+ } else {
+ return False;
}
}
+
return True;
}
@@ -1241,8 +1224,9 @@
Bool VG_(am_is_valid_for_client)( Addr start, SizeT len,
UInt prot )
{
- return is_valid_for(/* client */ True,
- start, len, prot, False/*free not OK*/ );
+ const UInt kinds = SkFileC | SkAnonC | SkShmC;
+
+ return is_valid_for(kinds, start, len, prot);
}
/* Variant of VG_(am_is_valid_for_client) which allows free areas to
@@ -1252,15 +1236,17 @@
Bool VG_(am_is_valid_for_client_or_free_or_resvn)
( Addr start, SizeT len, UInt prot )
{
- return is_valid_for(/* client */ True,
- start, len, prot, True/*free is OK*/ );
+ const UInt kinds = SkFileC | SkAnonC | SkShmC | SkFree | SkResvn;
+
+ return is_valid_for(kinds, start, len, prot);
}
Bool VG_(am_is_valid_for_valgrind) ( Addr start, SizeT len, UInt prot )
{
- return is_valid_for(/* client */ False,
- start, len, prot, False/*irrelevant*/ );
+ const UInt kinds = SkFileV | SkAnonV;
+
+ return is_valid_for(kinds, start, len, prot);
}
Modified: branches/ASPACEM_TWEAKS/coregrind/m_stacktrace.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_stacktrace.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_stacktrace.c Sun May 10 12:23:01 2015
@@ -708,7 +708,7 @@
redirs_used = 0;
# endif
-# if defined(VG_PLAT_USES_PPCTOC)
+# if defined(VG_PLAT_USES_PPCTOC) || defined (VGP_ppc64le_linux)
/* Deal with bogus LR values caused by function
interception/wrapping on ppc-TOC platforms; see comment on
similar code a few lines further down. */
Modified: branches/ASPACEM_TWEAKS/coregrind/m_syscall.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_syscall.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_syscall.c Sun May 10 12:23:01 2015
@@ -305,10 +305,15 @@
".text\n"
".globl do_syscall_WRK\n"
"do_syscall_WRK:\n"
+" .cfi_startproc\n"
" push %esi\n"
+" .cfi_adjust_cfa_offset 4\n"
" push %edi\n"
+" .cfi_adjust_cfa_offset 4\n"
" push %ebx\n"
+" .cfi_adjust_cfa_offset 4\n"
" push %ebp\n"
+" .cfi_adjust_cfa_offset 4\n"
" movl 16+ 4(%esp),%eax\n"
" movl 16+ 8(%esp),%ebx\n"
" movl 16+12(%esp),%ecx\n"
@@ -318,10 +323,15 @@
" movl 16+28(%esp),%ebp\n"
" int $0x80\n"
" popl %ebp\n"
+" .cfi_adjust_cfa_offset -4\n"
" popl %ebx\n"
+" .cfi_adjust_cfa_offset -4\n"
" popl %edi\n"
+" .cfi_adjust_cfa_offset -4\n"
" popl %esi\n"
+" .cfi_adjust_cfa_offset -4\n"
" ret\n"
+" .cfi_endproc\n"
".previous\n"
);
Modified: branches/ASPACEM_TWEAKS/coregrind/m_syswrap/priv_syswrap-linux.h
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_syswrap/priv_syswrap-linux.h (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_syswrap/priv_syswrap-linux.h Sun May 10 12:23:01 2015
@@ -287,6 +287,8 @@
DECL_TEMPLATE(linux, sys_getrandom);
DECL_TEMPLATE(linux, sys_memfd_create);
+DECL_TEMPLATE(linux, sys_syncfs);
+
/* ---------------------------------------------------------------------
Wrappers for sockets and ipc-ery. These are split into standalone
procedures because x86-linux hides them inside multiplexors
Modified: branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-amd64-linux.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-amd64-linux.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-amd64-linux.c Sun May 10 12:23:01 2015
@@ -1062,7 +1062,7 @@
LINXY(__NR_open_by_handle_at, sys_open_by_handle_at),// 304
LINXY(__NR_clock_adjtime, sys_clock_adjtime), // 305
-// LINX_(__NR_syncfs, sys_ni_syscall), // 306
+ LINX_(__NR_syncfs, sys_syncfs), // 306
LINXY(__NR_sendmmsg, sys_sendmmsg), // 307
// LINX_(__NR_setns, sys_ni_syscall), // 308
LINXY(__NR_getcpu, sys_getcpu), // 309
Modified: branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-arm-linux.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-arm-linux.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-arm-linux.c Sun May 10 12:23:01 2015
@@ -1212,6 +1212,7 @@
LINXY(__NR_name_to_handle_at, sys_name_to_handle_at),// 370
LINXY(__NR_open_by_handle_at, sys_open_by_handle_at),// 371
LINXY(__NR_clock_adjtime, sys_clock_adjtime), // 372
+ LINX_(__NR_syncfs, sys_syncfs), // 373
LINXY(__NR_sendmmsg, sys_sendmmsg), // 374
LINXY(__NR_getrandom, sys_getrandom), // 384
LINXY(__NR_memfd_create, sys_memfd_create) // 385
Modified: branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-arm64-linux.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-arm64-linux.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-arm64-linux.c Sun May 10 12:23:01 2015
@@ -1042,6 +1042,8 @@
GENXY(__NR_wait4, sys_wait4), // 260
+ LINX_(__NR_syncfs, sys_syncfs), // 267
+
LINXY(__NR_sendmmsg, sys_sendmmsg), // 269
LINXY(__NR_process_vm_readv, sys_process_vm_readv), // 270
LINX_(__NR_process_vm_writev, sys_process_vm_writev), // 271
Modified: branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-linux.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-linux.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-linux.c Sun May 10 12:23:01 2015
@@ -3064,6 +3064,13 @@
}
}
+PRE(sys_syncfs)
+{
+ *flags |= SfMayBlock;
+ PRINT("sys_syncfs ( %ld )", ARG1);
+ PRE_REG_READ1(long, "syncfs", unsigned int, fd);
+}
+
/* ---------------------------------------------------------------------
utime wrapper
------------------------------------------------------------------ */
Modified: branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-mips32-linux.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-mips32-linux.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-mips32-linux.c Sun May 10 12:23:01 2015
@@ -1112,6 +1112,7 @@
LINXY (__NR_prlimit64, sys_prlimit64), // 338
//..
LINXY (__NR_clock_adjtime, sys_clock_adjtime), // 341
+ LINX_ (__NR_syncfs, sys_syncfs), // 342
//..
LINXY (__NR_process_vm_readv, sys_process_vm_readv), // 345
LINX_ (__NR_process_vm_writev, sys_process_vm_writev), // 346
Modified: branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-mips64-linux.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-mips64-linux.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-mips64-linux.c Sun May 10 12:23:01 2015
@@ -909,7 +909,8 @@
LINXY (__NR_process_vm_readv, sys_process_vm_readv),
LINX_ (__NR_process_vm_writev, sys_process_vm_writev),
LINXY(__NR_getrandom, sys_getrandom),
- LINXY(__NR_memfd_create, sys_memfd_create)
+ LINXY(__NR_memfd_create, sys_memfd_create),
+ LINX_(__NR_syncfs, sys_syncfs)
};
SyscallTableEntry * ML_(get_linux_syscall_entry) ( UInt sysno )
Modified: branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-linux.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-linux.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-ppc32-linux.c Sun May 10 12:23:01 2015
@@ -1253,7 +1253,7 @@
LINXY(__NR_accept4, sys_accept4), // 344
LINX_(__NR_clock_adjtime, sys_clock_adjtime), // 347
-
+ LINX_(__NR_syncfs, sys_syncfs), // 348
LINXY(__NR_sendmmsg, sys_sendmmsg), // 349
LINXY(__NR_process_vm_readv, sys_process_vm_readv), // 351
Modified: branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-linux.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-linux.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-ppc64-linux.c Sun May 10 12:23:01 2015
@@ -1155,7 +1155,7 @@
LINXY(__NR_accept4, sys_accept4), // 344
LINXY(__NR_clock_adjtime, sys_clock_adjtime), // 347
-
+ LINX_(__NR_syncfs, sys_syncfs), // 348
LINXY(__NR_sendmmsg, sys_sendmmsg), // 349
LINXY(__NR_process_vm_readv, sys_process_vm_readv), // 351
Modified: branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-s390x-linux.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-s390x-linux.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-s390x-linux.c Sun May 10 12:23:01 2015
@@ -1035,7 +1035,7 @@
LINXY(__NR_name_to_handle_at, sys_name_to_handle_at), // 335
LINXY(__NR_open_by_handle_at, sys_open_by_handle_at), // 336
LINXY(__NR_clock_adjtime, sys_clock_adjtime), // 337
-// ?????(__NR_syncfs, ), // 338
+ LINX_(__NR_syncfs, sys_syncfs), // 338
// ?????(__NR_setns, ), // 339
LINXY(__NR_process_vm_readv, sys_process_vm_readv), // 340
Modified: branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-x86-linux.c
==============================================================================
--- branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-x86-linux.c (original)
+++ branches/ASPACEM_TWEAKS/coregrind/m_syswrap/syswrap-x86-linux.c Sun May 10 12:23:01 2015
@@ -1805,7 +1805,7 @@
LINXY(__NR_name_to_handle_at, sys_name_to_handle_at),// 341
LINXY(__NR_open_by_handle_at, sys_open_by_handle_at),// 342
LINXY(__NR_clock_adjtime, sys_clock_adjtime), // 343
-// LINX_(__NR_syncfs, sys_ni_syscall), // 344
+ LINX_(__NR_syncfs, sys_syncfs), // 344
LINXY(__NR_sendmmsg, sys_sendmmsg), // 345
// LINX_(__NR_setns, sys_ni_syscall), // 346
Modified: branches/ASPACEM_TWEAKS/darwin12.supp
==============================================================================
--- branches/ASPACEM_TWEAKS/darwin12.supp (original)
+++ branches/ASPACEM_TWEAKS/darwin12.supp Sun May 10 12:23:01 2015
@@ -350,6 +350,108 @@
fun:_objc_init
}
+{
+ OSX108:leak-14
+ Memcheck:Leak
+ match-leak-kinds: reachable
+ fun:malloc_zone_?alloc
+ ...
+ fun:dyld_register_image_state_change_handler
+ ...
+}
+
+{
+ OSX108:leak-15
+ Memcheck:Leak
+ match-leak-kinds: reachable
+ fun:?alloc
+ ...
+ fun:dyld_register_image_state_change_handler
+ ...
+}
+
+{
+ OSX108:leak-16
+ Memcheck:Leak
+ match-leak-kinds: reachable
+ fun:malloc_zone_?alloc
+ ...
+ fun:map_images_nolock
+ fun:map_images
+ ...
+}
+
+{
+ OSX108:leak-17
+ Memcheck:Leak
+ match-leak-kinds: possible
+ fun:malloc_zone_?alloc
+ ...
+ fun:map_images_nolock
+ fun:map_images
+ ...
+}
+
+{
+ OSX108:leak-18
+ Memcheck:Leak
+ match-leak-kinds: indirect
+ fun:malloc_zone_?alloc
+ ...
+ fun:libSystem_initializer
+ ...
+}
+
+{
+ OSX108:leak-19
+ Memcheck:Leak
+ match-leak-kinds: indirect
+ fun:?alloc
+ ...
+ fun:libSystem_initializer
+ ...
+}
+
+{
+ OSX108:leak-20
+ Memcheck:Leak
+ match-leak-kinds: reachable
+ fun:malloc_zone_?alloc
+ ...
+ fun:libSystem_initializer
+ ...
+}
+
+{
+ OSX108:leak-21
+ Memcheck:Leak
+ match-leak-kinds: reachable
+ fun:?alloc
+ ...
+ fun:libSystem_initializer
+ ...
+}
+
+{
+ OSX108:leak-22
+ Memcheck:Leak
+ match-leak-kinds: reachable
+ fun:?alloc
+ ...
+ fun:_libxpc_initializer
+ ...
+}
+
+{
+ OSX108:leak-23
+ Memcheck:Leak
+ match-leak-kinds: definite
+ fun:malloc
+ fun:realloc
+ fun:new_sem_from_pool
+ ...
+}
+
##----------------------------------------------------------------------##
# Memcheck
##----------------------------------------------------------------------##
Modified: branches/ASPACEM_TWEAKS/docs/internals/3_10_BUGSTATUS.txt
==============================================================================
--- branches/ASPACEM_TWEAKS/docs/internals/3_10_BUGSTATUS.txt (original)
+++ branches/ASPACEM_TWEAKS/docs/internals/3_10_BUGSTATUS.txt Sun May 10 12:23:01 2015
@@ -422,3 +422,13 @@
armv6 probable failure
Tue 28 Apr 13:48:40 CEST 2015
+
+346912 callgrind bails out on vpmaskmovd instruction
+
+347198 vex x86->IR: unhandled instruction bytes: 0x66 0xF 0x3A 0x63
+
+347233 Fix memcheck/tests/strchr on OS X 10.10 (Haswell)
+
+347322 Power PC regression test cleanup
+
+Fri 8 May 11:52:14 CEST 2015
Modified: branches/ASPACEM_TWEAKS/drd/tests/pth_create_chain.vgtest
==============================================================================
--- branches/ASPACEM_TWEAKS/drd/tests/pth_create_chain.vgtest (original)
+++ branches/ASPACEM_TWEAKS/drd/tests/pth_create_chain.vgtest Sun May 10 12:23:01 2015
@@ -1,2 +1,2 @@
-prereq: ./supported_libpthread && [ `uname -m` != ppc ] && [ `uname -m` != ppc64 ]
+prereq: ./supported_libpthread && [ `uname -m` != ppc ] && [ `uname -m` != ppc64 ] && [ `uname -m` != ppc64le ]
prog: pth_create_chain 100
Modified: branches/ASPACEM_TWEAKS/memcheck/tests/amd64/fxsave-amd64.c
==============================================================================
--- branches/ASPACEM_TWEAKS/memcheck/tests/amd64/fxsave-amd64.c (original)
+++ branches/ASPACEM_TWEAKS/memcheck/tests/amd64/fxsave-amd64.c Sun May 10 12:23:01 2015
@@ -17,7 +17,11 @@
__attribute__((noinline))
void do_fxsave ( void* p, int rexw ) {
if (rexw) {
+#if defined(VGO_linux)
+ asm __volatile__("fxsave64 (%0)" : : "r" (p) : "memory" );
+#else
asm __volatile__("rex64/fxsave (%0)" : : "r" (p) : "memory" );
+#endif
} else {
asm __volatile__("fxsave (%0)" : : "r" (p) : "memory" );
}
@@ -26,7 +30,11 @@
__attribute__((noinline))
void do_fxrstor ( void* p, int rexw ) {
if (rexw) {
+#if defined(VGO_linux)
+ asm __volatile__("fxrstor64 (%0)" : : "r" (p) : "memory" );
+#else
asm __volatile__("rex64/fxrstor (%0)" : : "r" (p) : "memory" );
+#endif
} else {
asm __volatile__("fxrstor (%0)" : : "r" (p) : "memory" );
}
Modified: branches/ASPACEM_TWEAKS/memcheck/tests/badjump.vgtest
==============================================================================
--- branches/ASPACEM_TWEAKS/memcheck/tests/badjump.vgtest (original)
+++ branches/ASPACEM_TWEAKS/memcheck/tests/badjump.vgtest Sun May 10 12:23:01 2015
@@ -1,3 +1,3 @@
prog: badjump
-cleanup: rm -f vgcore.pid*
+cleanup: rm -f vgcore.*
stderr_filter: filter_allocs
Modified: branches/ASPACEM_TWEAKS/memcheck/tests/badjump2.c
==============================================================================
--- branches/ASPACEM_TWEAKS/memcheck/tests/badjump2.c (original)
+++ branches/ASPACEM_TWEAKS/memcheck/tests/badjump2.c Sun May 10 12:23:01 2015
@@ -35,7 +35,7 @@
if (setjmp(myjmpbuf) == 0) {
// Jump to zero; will cause seg fault
-#if defined(__powerpc64__)
+#if defined(__powerpc64__) && (_CALL_ELF != 2)
unsigned long int fn[3];
fn[0] = 0;
fn[1] = 0;
Modified: branches/ASPACEM_TWEAKS/memcheck/tests/supp_unknown.vgtest
==============================================================================
--- branches/ASPACEM_TWEAKS/memcheck/tests/supp_unknown.vgtest (original)
+++ branches/ASPACEM_TWEAKS/memcheck/tests/supp_unknown.vgtest Sun May 10 12:23:01 2015
@@ -1,4 +1,4 @@
vgopts: -q --suppressions=supp_unknown.supp
prog: badjump
-cleanup: rm -f vgcore.pid*
+cleanup: rm -f vgcore.*
stderr_filter_args: badjump.c
Modified: branches/ASPACEM_TWEAKS/none/tests/ppc32/jm_vec_isa_2_07.vgtest
==============================================================================
--- branches/ASPACEM_TWEAKS/none/tests/ppc32/jm_vec_isa_2_07.vgtest (original)
+++ branches/ASPACEM_TWEAKS/none/tests/ppc32/jm_vec_isa_2_07.vgtest Sun May 10 12:23:01 2015
@@ -1,2 +1,2 @@
-prereq: ../../../tests/check_isa-2_07_cap
+prereq: ../../../tests/check_isa-2_07_cap && ! ../../../tests/check_ppc64le_cap
prog: test_isa_2_07_part1 -a
Modified: branches/ASPACEM_TWEAKS/none/tests/x86/int.disabled
==============================================================================
--- branches/ASPACEM_TWEAKS/none/tests/x86/int.disabled (original)
+++ branches/ASPACEM_TWEAKS/none/tests/x86/int.disabled Sun May 10 12:23:01 2015
@@ -1,4 +1,4 @@
# This is currently disabled because vex doesn't deal with x86
# int $n for n != 0x80 and so the test is pointless (at the moment).
prog: int
-cleanup: rm -f vgcore.pid*
+cleanup: rm -f vgcore.*
Modified: branches/ASPACEM_TWEAKS/perf/memrw.c
==============================================================================
--- branches/ASPACEM_TWEAKS/perf/memrw.c (original)
+++ branches/ASPACEM_TWEAKS/perf/memrw.c Sun May 10 12:23:01 2015
@@ -106,10 +106,12 @@
nr_thr = 1;
- printf ("total program memory -t %d MB"
- " working set -w %d MB\n",
- (nr_b * sz_b) / (1024*1024),
- (nr_b_ws * sz_b) / (1024*1024));
+ printf ("total program memory -t %llu MB"
+ " working set -w %llu MB\n",
+ ((unsigned long long)nr_b * sz_b)
+ / (unsigned long long) (1024*1024),
+ ((unsigned long long)nr_b_ws * sz_b)
+ / (unsigned long long)(1024*1024));
printf (" working set R or W -l %d times"
" repeat the whole stuff -r %d times\n",
nr_loops,
|