|
From: <sv...@va...> - 2013-08-03 19:38:05
|
florian 2013-08-03 20:37:55 +0100 (Sat, 03 Aug 2013)
New Revision: 13481
Log:
Followup to the renaming in VEX r2735.
Also ignore AT_DCACHEBSIZE entries in the auxiliary vector as they
are not needed.
Fixes BZ 306587.
Modified files:
trunk/NEWS
trunk/coregrind/m_initimg/initimg-linux.c
trunk/coregrind/m_libcproc.c
trunk/coregrind/m_machine.c
Modified: trunk/NEWS (+2 -0)
===================================================================
--- trunk/NEWS 2013-08-03 12:36:52 +01:00 (rev 13480)
+++ trunk/NEWS 2013-08-03 20:37:55 +01:00 (rev 13481)
@@ -94,6 +94,8 @@
306310 3.8.0 release tarball missing some files
FIXED 12964/12983.
+306587 Fix cache line detection from auxiliary vector for PPC.
+
306783 Mips unhandled syscall : 4025 / 4079 / 4182
FIXED r12995.
Modified: trunk/coregrind/m_initimg/initimg-linux.c (+0 -5)
===================================================================
--- trunk/coregrind/m_initimg/initimg-linux.c 2013-08-03 12:36:52 +01:00 (rev 13480)
+++ trunk/coregrind/m_initimg/initimg-linux.c 2013-08-03 20:37:55 +01:00 (rev 13481)
@@ -251,10 +251,6 @@
/*=== Setting up the client's stack ===*/
/*====================================================================*/
-#ifndef AT_DCACHEBSIZE
-#define AT_DCACHEBSIZE 19
-#endif /* AT_DCACHEBSIZE */
-
#ifndef AT_ICACHEBSIZE
#define AT_ICACHEBSIZE 20
#endif /* AT_ICACHEBSIZE */
@@ -710,7 +706,6 @@
# endif
break;
- case AT_DCACHEBSIZE:
case AT_ICACHEBSIZE:
case AT_UCACHEBSIZE:
# if defined(VGP_ppc32_linux)
Modified: trunk/coregrind/m_libcproc.c (+1 -1)
===================================================================
--- trunk/coregrind/m_libcproc.c 2013-08-03 12:36:52 +01:00 (rev 13480)
+++ trunk/coregrind/m_libcproc.c 2013-08-03 20:37:55 +01:00 (rev 13481)
@@ -742,7 +742,7 @@
Addr addr;
VG_(machine_get_VexArchInfo)( NULL, &vai );
- cls = vai.ppc_cache_line_szB;
+ cls = vai.ppc_icache_line_szB;
/* Stay sane .. */
vg_assert(cls == 32 || cls == 64 || cls == 128);
Modified: trunk/coregrind/m_machine.c (+6 -6)
===================================================================
--- trunk/coregrind/m_machine.c 2013-08-03 12:36:52 +01:00 (rev 13480)
+++ trunk/coregrind/m_machine.c 2013-08-03 20:37:55 +01:00 (rev 13481)
@@ -1491,11 +1491,11 @@
/* Either the value must not have been set yet (zero) or we can
tolerate it being set to the same value multiple times, as the
stack scanning logic in m_main is a bit stupid. */
- vg_assert(vai.ppc_cache_line_szB == 0
- || vai.ppc_cache_line_szB == szB);
+ vg_assert(vai.ppc_icache_line_szB == 0
+ || vai.ppc_icache_line_szB == szB);
vg_assert(szB == 32 || szB == 64 || szB == 128);
- vai.ppc_cache_line_szB = szB;
+ vai.ppc_icache_line_szB = szB;
}
#endif
@@ -1509,11 +1509,11 @@
/* Either the value must not have been set yet (zero) or we can
tolerate it being set to the same value multiple times, as the
stack scanning logic in m_main is a bit stupid. */
- vg_assert(vai.ppc_cache_line_szB == 0
- || vai.ppc_cache_line_szB == szB);
+ vg_assert(vai.ppc_icache_line_szB == 0
+ || vai.ppc_icache_line_szB == szB);
vg_assert(szB == 32 || szB == 64 || szB == 128);
- vai.ppc_cache_line_szB = szB;
+ vai.ppc_icache_line_szB = szB;
}
#endif
|