commit
6ca7c974f8
@ -0,0 +1 @@
|
|||||||
|
7770912c7465f93a90c5a9d5c1b1b036ebec04fd SOURCES/valgrind-3.17.0.tar.bz2
|
@ -0,0 +1 @@
|
|||||||
|
SOURCES/valgrind-3.17.0.tar.bz2
|
@ -0,0 +1,72 @@
|
|||||||
|
commit d3c977726064ba09fed6dfc7daf22b16824c97b4
|
||||||
|
Author: Mark Wielaard <mark@klomp.org>
|
||||||
|
Date: Fri May 24 18:24:56 2019 +0200
|
||||||
|
|
||||||
|
Add -Wl,-z,now to some binaries.
|
||||||
|
|
||||||
|
diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
|
||||||
|
index 1b7842b..e211eec 100644
|
||||||
|
--- a/auxprogs/Makefile.am
|
||||||
|
+++ b/auxprogs/Makefile.am
|
||||||
|
@@ -32,7 +32,7 @@ valgrind_listener_SOURCES = valgrind-listener.c
|
||||||
|
valgrind_listener_CPPFLAGS = $(AM_CPPFLAGS_PRI) -I$(top_srcdir)/coregrind
|
||||||
|
valgrind_listener_CFLAGS = $(AM_CFLAGS_PRI) -fstack-protector-strong
|
||||||
|
valgrind_listener_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
-valgrind_listener_LDFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
+valgrind_listener_LDFLAGS = $(AM_CFLAGS_PRI) -Wl,-z,now
|
||||||
|
if VGCONF_PLATVARIANT_IS_ANDROID
|
||||||
|
valgrind_listener_CFLAGS += -static
|
||||||
|
endif
|
||||||
|
@@ -51,7 +51,7 @@ valgrind_di_server_SOURCES = valgrind-di-server.c
|
||||||
|
valgrind_di_server_CPPFLAGS = $(AM_CPPFLAGS_PRI) -I$(top_srcdir)/coregrind
|
||||||
|
valgrind_di_server_CFLAGS = $(AM_CFLAGS_PRI) -fstack-protector-strong
|
||||||
|
valgrind_di_server_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
-valgrind_di_server_LDFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
+valgrind_di_server_LDFLAGS = $(AM_CFLAGS_PRI) -Wl,-z,now
|
||||||
|
if VGCONF_PLATVARIANT_IS_ANDROID
|
||||||
|
valgrind_di_server_CFLAGS += -static
|
||||||
|
endif
|
||||||
|
@@ -86,7 +86,7 @@ getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = getoff.c
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -fstack-protector-strong
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
-getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@
|
||||||
|
+getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@ -Wl,-z,now
|
||||||
|
if HAVE_DLINFO_RTLD_DI_TLS_MODID
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = $(LDADD) -ldl
|
||||||
|
endif
|
||||||
|
diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
|
||||||
|
index f572741..1c07e50 100644
|
||||||
|
--- a/cachegrind/Makefile.am
|
||||||
|
+++ b/cachegrind/Makefile.am
|
||||||
|
@@ -27,7 +27,7 @@ cg_merge_SOURCES = cg_merge.c
|
||||||
|
cg_merge_CPPFLAGS = $(AM_CPPFLAGS_PRI)
|
||||||
|
cg_merge_CFLAGS = $(AM_CFLAGS_PRI) -fstack-protector-strong
|
||||||
|
cg_merge_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
-cg_merge_LDFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
+cg_merge_LDFLAGS = $(AM_CFLAGS_PRI) -Wl,-z,now
|
||||||
|
# If there is no secondary platform, and the platforms include x86-darwin,
|
||||||
|
# then the primary platform must be x86-darwin. Hence:
|
||||||
|
if ! VGCONF_HAVE_PLATFORM_SEC
|
||||||
|
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
|
||||||
|
index 3c73210..fb6b7bb 100644
|
||||||
|
--- a/coregrind/Makefile.am
|
||||||
|
+++ b/coregrind/Makefile.am
|
||||||
|
@@ -57,7 +57,7 @@ RANLIB = ${LTO_RANLIB}
|
||||||
|
valgrind_CPPFLAGS = $(AM_CPPFLAGS_PRI)
|
||||||
|
valgrind_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
|
||||||
|
valgrind_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
-valgrind_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@
|
||||||
|
+valgrind_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@ -Wl,-z,now
|
||||||
|
# If there is no secondary platform, and the platforms include x86-darwin,
|
||||||
|
# then the primary platform must be x86-darwin. Hence:
|
||||||
|
if ! VGCONF_HAVE_PLATFORM_SEC
|
||||||
|
@@ -96,7 +96,7 @@ endif
|
||||||
|
vgdb_CPPFLAGS = $(AM_CPPFLAGS_PRI)
|
||||||
|
vgdb_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
|
||||||
|
vgdb_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
-vgdb_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@
|
||||||
|
+vgdb_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@ -Wl,-z,now
|
||||||
|
if VGCONF_PLATVARIANT_IS_ANDROID
|
||||||
|
vgdb_CFLAGS += -static
|
||||||
|
endif
|
@ -0,0 +1,118 @@
|
|||||||
|
commit b73fb7a614e1b5d60af23fb0752b5cead995e02e
|
||||||
|
Author: Mark Wielaard <mark@klomp.org>
|
||||||
|
Date: Sun Apr 14 00:30:05 2019 +0200
|
||||||
|
|
||||||
|
Remove no-stack-protector, add stack-protector-strong to some.
|
||||||
|
|
||||||
|
diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
|
||||||
|
index 56cc5ef..1b7842b 100644
|
||||||
|
--- a/auxprogs/Makefile.am
|
||||||
|
+++ b/auxprogs/Makefile.am
|
||||||
|
@@ -30,7 +30,7 @@ bin_PROGRAMS = valgrind-listener valgrind-di-server
|
||||||
|
|
||||||
|
valgrind_listener_SOURCES = valgrind-listener.c
|
||||||
|
valgrind_listener_CPPFLAGS = $(AM_CPPFLAGS_PRI) -I$(top_srcdir)/coregrind
|
||||||
|
-valgrind_listener_CFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
+valgrind_listener_CFLAGS = $(AM_CFLAGS_PRI) -fstack-protector-strong
|
||||||
|
valgrind_listener_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
valgrind_listener_LDFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
if VGCONF_PLATVARIANT_IS_ANDROID
|
||||||
|
@@ -49,7 +49,7 @@ endif
|
||||||
|
|
||||||
|
valgrind_di_server_SOURCES = valgrind-di-server.c
|
||||||
|
valgrind_di_server_CPPFLAGS = $(AM_CPPFLAGS_PRI) -I$(top_srcdir)/coregrind
|
||||||
|
-valgrind_di_server_CFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
+valgrind_di_server_CFLAGS = $(AM_CFLAGS_PRI) -fstack-protector-strong
|
||||||
|
valgrind_di_server_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
valgrind_di_server_LDFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
if VGCONF_PLATVARIANT_IS_ANDROID
|
||||||
|
@@ -84,7 +84,7 @@ endif
|
||||||
|
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = getoff.c
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
|
||||||
|
-getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
|
||||||
|
+getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -fstack-protector-strong
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@
|
||||||
|
if HAVE_DLINFO_RTLD_DI_TLS_MODID
|
||||||
|
diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
|
||||||
|
index f8447a1..f572741 100644
|
||||||
|
--- a/cachegrind/Makefile.am
|
||||||
|
+++ b/cachegrind/Makefile.am
|
||||||
|
@@ -25,7 +25,7 @@ bin_PROGRAMS = cg_merge
|
||||||
|
|
||||||
|
cg_merge_SOURCES = cg_merge.c
|
||||||
|
cg_merge_CPPFLAGS = $(AM_CPPFLAGS_PRI)
|
||||||
|
-cg_merge_CFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
+cg_merge_CFLAGS = $(AM_CFLAGS_PRI) -fstack-protector-strong
|
||||||
|
cg_merge_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
cg_merge_LDFLAGS = $(AM_CFLAGS_PRI)
|
||||||
|
# If there is no secondary platform, and the platforms include x86-darwin,
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index f8c798b..ccc8f52 100755
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -2352,24 +2352,24 @@
|
||||||
|
AM_CONDITIONAL([HAVE_ALIGNED_CXX_ALLOC], [test x$ac_have_aligned_cxx_alloc = xyes])
|
||||||
|
|
||||||
|
# does this compiler support -fno-stack-protector ?
|
||||||
|
-AC_MSG_CHECKING([if gcc accepts -fno-stack-protector])
|
||||||
|
-
|
||||||
|
-safe_CFLAGS=$CFLAGS
|
||||||
|
-CFLAGS="-fno-stack-protector -Werror"
|
||||||
|
-
|
||||||
|
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
|
||||||
|
- return 0;
|
||||||
|
-]])], [
|
||||||
|
-no_stack_protector=yes
|
||||||
|
-FLAG_FNO_STACK_PROTECTOR="-fno-stack-protector"
|
||||||
|
-AC_MSG_RESULT([yes])
|
||||||
|
-], [
|
||||||
|
-no_stack_protector=no
|
||||||
|
+#AC_MSG_CHECKING([if gcc accepts -fno-stack-protector])
|
||||||
|
+#
|
||||||
|
+#safe_CFLAGS=$CFLAGS
|
||||||
|
+#CFLAGS="-fno-stack-protector -Werror"
|
||||||
|
+#
|
||||||
|
+#AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
|
||||||
|
+# return 0;
|
||||||
|
+#]])], [
|
||||||
|
+#no_stack_protector=yes
|
||||||
|
+#FLAG_FNO_STACK_PROTECTOR="-fno-stack-protector"
|
||||||
|
+#AC_MSG_RESULT([yes])
|
||||||
|
+#], [
|
||||||
|
+#no_stack_protector=no
|
||||||
|
FLAG_FNO_STACK_PROTECTOR=""
|
||||||
|
-AC_MSG_RESULT([no])
|
||||||
|
-])
|
||||||
|
-CFLAGS=$safe_CFLAGS
|
||||||
|
-
|
||||||
|
+#AC_MSG_RESULT([no])
|
||||||
|
+#])
|
||||||
|
+#CFLAGS=$safe_CFLAGS
|
||||||
|
+#
|
||||||
|
AC_SUBST(FLAG_FNO_STACK_PROTECTOR)
|
||||||
|
|
||||||
|
# does this compiler support -finline-functions ?
|
||||||
|
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
|
||||||
|
index 94030fd..3c73210 100644
|
||||||
|
--- a/coregrind/Makefile.am
|
||||||
|
+++ b/coregrind/Makefile.am
|
||||||
|
@@ -55,7 +55,7 @@ AR = ${LTO_AR}
|
||||||
|
RANLIB = ${LTO_RANLIB}
|
||||||
|
|
||||||
|
valgrind_CPPFLAGS = $(AM_CPPFLAGS_PRI)
|
||||||
|
-valgrind_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS)
|
||||||
|
+valgrind_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
|
||||||
|
valgrind_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
valgrind_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@
|
||||||
|
# If there is no secondary platform, and the platforms include x86-darwin,
|
||||||
|
@@ -94,7 +94,7 @@ vgdb_SOURCES += vgdb-invoker-solaris.c
|
||||||
|
endif
|
||||||
|
|
||||||
|
vgdb_CPPFLAGS = $(AM_CPPFLAGS_PRI)
|
||||||
|
-vgdb_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS)
|
||||||
|
+vgdb_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) -fstack-protector-strong
|
||||||
|
vgdb_CCASFLAGS = $(AM_CCASFLAGS_PRI)
|
||||||
|
vgdb_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@
|
||||||
|
if VGCONF_PLATVARIANT_IS_ANDROID
|
@ -0,0 +1,21 @@
|
|||||||
|
commit e08a82991a9b9dc87c13f2b89273f25f97d14baf
|
||||||
|
Author: Tom Hughes <tom@compton.nu>
|
||||||
|
Date: Tue Apr 6 22:44:36 2021 +0100
|
||||||
|
|
||||||
|
Only process clone results in the parent thread
|
||||||
|
|
||||||
|
Fixes BZ#423963
|
||||||
|
|
||||||
|
diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
|
||||||
|
index 5ae4e6613..c59d8ee26 100644
|
||||||
|
--- a/coregrind/m_syswrap/syswrap-linux.c
|
||||||
|
+++ b/coregrind/m_syswrap/syswrap-linux.c
|
||||||
|
@@ -940,7 +940,7 @@ PRE(sys_clone)
|
||||||
|
("Valgrind does not support general clone().");
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (SUCCESS) {
|
||||||
|
+ if (SUCCESS && RES != 0) {
|
||||||
|
if (ARG_FLAGS & (VKI_CLONE_PARENT_SETTID | VKI_CLONE_PIDFD))
|
||||||
|
POST_MEM_WRITE(ARG3, sizeof(Int));
|
||||||
|
if (ARG_FLAGS & (VKI_CLONE_CHILD_SETTID | VKI_CLONE_CHILD_CLEARTID))
|
@ -0,0 +1,30 @@
|
|||||||
|
commit 93104368952c37268da724231487058ea3eaf1dc
|
||||||
|
Author: Tom Hughes <tom@compton.nu>
|
||||||
|
Date: Thu May 20 17:16:06 2021 +0100
|
||||||
|
|
||||||
|
Don't look for separate debuginfo if the image has a .debug_info section
|
||||||
|
|
||||||
|
Fixes BZ#435908
|
||||||
|
|
||||||
|
diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c
|
||||||
|
index b0f062ddc..e424e3e7e 100644
|
||||||
|
--- a/coregrind/m_debuginfo/readelf.c
|
||||||
|
+++ b/coregrind/m_debuginfo/readelf.c
|
||||||
|
@@ -2879,13 +2879,15 @@ Bool ML_(read_elf_debug_info) ( struct _DebugInfo* di )
|
||||||
|
/* Look for a build-id */
|
||||||
|
HChar* buildid = find_buildid(mimg, False, False);
|
||||||
|
|
||||||
|
- /* Look for a debug image that matches either the build-id or
|
||||||
|
+ /* If we don't have a .debug_info section in the main image then
|
||||||
|
+ look for a debug image that matches either the build-id or
|
||||||
|
the debuglink-CRC32 in the main image. If the main image
|
||||||
|
doesn't contain either of those then this won't even bother
|
||||||
|
to try looking. This looks in all known places, including
|
||||||
|
the --extra-debuginfo-path if specified and on the
|
||||||
|
--debuginfo-server if specified. */
|
||||||
|
- if (buildid != NULL || debuglink_escn.img != NULL) {
|
||||||
|
+ if (debug_info_escn.img == NULL &&
|
||||||
|
+ (buildid != NULL || debuglink_escn.img != NULL)) {
|
||||||
|
/* Do have a debuglink section? */
|
||||||
|
if (debuglink_escn.img != NULL) {
|
||||||
|
UInt crc_offset
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,54 @@
|
|||||||
|
commit 45873298ff2d17accc65654d64758360616aade5
|
||||||
|
Author: Andreas Arnez <arnez@linux.ibm.com>
|
||||||
|
Date: Tue Mar 30 18:10:43 2021 +0200
|
||||||
|
|
||||||
|
s390x: Add missing UNOP insns to s390_insn_as_string
|
||||||
|
|
||||||
|
Some unary operator insns are not handled by s390_insn_as_string(). If
|
||||||
|
they are encountered while the appropriate trace flag is set, a vpanic
|
||||||
|
occurs. Fix this: add handling for the missing insns.
|
||||||
|
|
||||||
|
diff --git a/VEX/priv/host_s390_defs.c b/VEX/priv/host_s390_defs.c
|
||||||
|
index 8762975b2..6e0734ae0 100644
|
||||||
|
--- a/VEX/priv/host_s390_defs.c
|
||||||
|
+++ b/VEX/priv/host_s390_defs.c
|
||||||
|
@@ -7860,12 +7860,24 @@ s390_insn_as_string(const s390_insn *insn)
|
||||||
|
op = "v-vunpacku";
|
||||||
|
break;
|
||||||
|
|
||||||
|
- case S390_VEC_FLOAT_NEG:
|
||||||
|
- op = "v-vfloatneg";
|
||||||
|
+ case S390_VEC_ABS:
|
||||||
|
+ op = "v-vabs";
|
||||||
|
break;
|
||||||
|
|
||||||
|
- case S390_VEC_FLOAT_SQRT:
|
||||||
|
- op = "v-vfloatsqrt";
|
||||||
|
+ case S390_VEC_COUNT_LEADING_ZEROES:
|
||||||
|
+ op = "v-vclz";
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case S390_VEC_COUNT_TRAILING_ZEROES:
|
||||||
|
+ op = "v-vctz";
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case S390_VEC_COUNT_ONES:
|
||||||
|
+ op = "v-vpopct";
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case S390_VEC_FLOAT_NEG:
|
||||||
|
+ op = "v-vfloatneg";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case S390_VEC_FLOAT_ABS:
|
||||||
|
@@ -7876,6 +7888,10 @@ s390_insn_as_string(const s390_insn *insn)
|
||||||
|
op = "v-vfloatnabs";
|
||||||
|
break;
|
||||||
|
|
||||||
|
+ case S390_VEC_FLOAT_SQRT:
|
||||||
|
+ op = "v-vfloatsqrt";
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
default:
|
||||||
|
goto fail;
|
||||||
|
}
|
@ -0,0 +1,54 @@
|
|||||||
|
--- valgrind-3.8.1/cachegrind/cg_sim.c.jj 2011-10-26 23:24:32.000000000 +0200
|
||||||
|
+++ valgrind-3.8.1/cachegrind/cg_sim.c 2011-12-09 17:31:19.256023683 +0100
|
||||||
|
@@ -42,27 +42,30 @@ typedef struct {
|
||||||
|
Int size; /* bytes */
|
||||||
|
Int assoc;
|
||||||
|
Int line_size; /* bytes */
|
||||||
|
- Int sets;
|
||||||
|
Int sets_min_1;
|
||||||
|
Int line_size_bits;
|
||||||
|
Int tag_shift;
|
||||||
|
- HChar desc_line[128]; /* large enough */
|
||||||
|
UWord* tags;
|
||||||
|
-} cache_t2;
|
||||||
|
+ HChar desc_line[128];
|
||||||
|
+} cache_t2
|
||||||
|
+#ifdef __GNUC__
|
||||||
|
+__attribute__ ((aligned (8 * sizeof (Int))))
|
||||||
|
+#endif
|
||||||
|
+;
|
||||||
|
|
||||||
|
/* By this point, the size/assoc/line_size has been checked. */
|
||||||
|
static void cachesim_initcache(cache_t config, cache_t2* c)
|
||||||
|
{
|
||||||
|
- Int i;
|
||||||
|
+ Int sets;
|
||||||
|
|
||||||
|
c->size = config.size;
|
||||||
|
c->assoc = config.assoc;
|
||||||
|
c->line_size = config.line_size;
|
||||||
|
|
||||||
|
- c->sets = (c->size / c->line_size) / c->assoc;
|
||||||
|
- c->sets_min_1 = c->sets - 1;
|
||||||
|
+ sets = (c->size / c->line_size) / c->assoc;
|
||||||
|
+ c->sets_min_1 = sets - 1;
|
||||||
|
c->line_size_bits = VG_(log2)(c->line_size);
|
||||||
|
- c->tag_shift = c->line_size_bits + VG_(log2)(c->sets);
|
||||||
|
+ c->tag_shift = c->line_size_bits + VG_(log2)(sets);
|
||||||
|
|
||||||
|
if (c->assoc == 1) {
|
||||||
|
VG_(sprintf)(c->desc_line, "%d B, %d B, direct-mapped",
|
||||||
|
@@ -72,11 +75,8 @@ static void cachesim_initcache(cache_t c
|
||||||
|
c->size, c->line_size, c->assoc);
|
||||||
|
}
|
||||||
|
|
||||||
|
- c->tags = VG_(malloc)("cg.sim.ci.1",
|
||||||
|
- sizeof(UWord) * c->sets * c->assoc);
|
||||||
|
-
|
||||||
|
- for (i = 0; i < c->sets * c->assoc; i++)
|
||||||
|
- c->tags[i] = 0;
|
||||||
|
+ c->tags = VG_(calloc)("cg.sim.ci.1",
|
||||||
|
+ sizeof(UWord), sets * c->assoc);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This attribute forces GCC to inline the function, getting rid of a
|
@ -0,0 +1,15 @@
|
|||||||
|
--- valgrind/glibc-2.34567-NPTL-helgrind.supp.jj 2009-08-19 15:37:48.000000000 +0200
|
||||||
|
+++ valgrind/glibc-2.34567-NPTL-helgrind.supp 2009-10-21 16:46:31.000000000 +0200
|
||||||
|
@@ -88,6 +88,12 @@
|
||||||
|
obj:*/lib*/libpthread-2.*so*
|
||||||
|
}
|
||||||
|
{
|
||||||
|
+ helgrind-glibc2X-102a
|
||||||
|
+ Helgrind:Race
|
||||||
|
+ fun:mythread_wrapper
|
||||||
|
+ obj:*vgpreload_helgrind*.so
|
||||||
|
+}
|
||||||
|
+{
|
||||||
|
helgrind-glibc2X-103
|
||||||
|
Helgrind:Race
|
||||||
|
fun:pthread_cond_*@@GLIBC_2.*
|
@ -0,0 +1,28 @@
|
|||||||
|
--- valgrind/glibc-2.X.supp.in.jj 2011-10-26 23:24:45.000000000 +0200
|
||||||
|
+++ valgrind/glibc-2.X.supp.in 2012-05-07 10:55:20.395942656 +0200
|
||||||
|
@@ -124,7 +124,7 @@
|
||||||
|
glibc-2.5.x-on-SUSE-10.2-(PPC)-2a
|
||||||
|
Memcheck:Cond
|
||||||
|
fun:index
|
||||||
|
- obj:*ld-@GLIBC_VERSION@.*.so
|
||||||
|
+ obj:*ld-@GLIBC_VERSION@*.so
|
||||||
|
}
|
||||||
|
{
|
||||||
|
glibc-2.5.x-on-SuSE-10.2-(PPC)-2b
|
||||||
|
@@ -136,14 +136,14 @@
|
||||||
|
glibc-2.5.5-on-SuSE-10.2-(PPC)-2c
|
||||||
|
Memcheck:Addr4
|
||||||
|
fun:index
|
||||||
|
- obj:*ld-@GLIBC_VERSION@.*.so
|
||||||
|
+ obj:*ld-@GLIBC_VERSION@*.so
|
||||||
|
}
|
||||||
|
{
|
||||||
|
glibc-2.3.5-on-SuSE-10.1-(PPC)-3
|
||||||
|
Memcheck:Addr4
|
||||||
|
fun:*wordcopy_fwd_dest_aligned*
|
||||||
|
fun:mem*cpy
|
||||||
|
- obj:*lib*@GLIBC_VERSION@.*.so
|
||||||
|
+ obj:*lib*@GLIBC_VERSION@*.so
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue