Followup to the renaming in VEX r2735.

Also ignore AT_DCACHEBSIZE entries in the auxiliary vector as they
are not needed.
Fixes BZ 306587.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13481

diff --git a/NEWS b/NEWS
index e6dfdd999e6ea1c57ce2455865ac77605e761640..6523073eb7841b85dd6c6a1c63108e5b64dc8d7b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -94,6 +94,8 @@ m = merged into 3_8_BRANCH
 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.
 

diff --git a/coregrind/m_initimg/initimg-linux.c b/coregrind/m_initimg/initimg-linux.c
index 0d493ec2c2d621a0a8adfef67e3bd418b84458b6..3f49de95fa30821e8774e6c8ede5fa51eb9875df 100644 (file)
--- a/coregrind/m_initimg/initimg-linux.c
+++ b/coregrind/m_initimg/initimg-linux.c
@@ -251,10 +251,6 @@ static HChar** setup_client_env ( HChar** origenv, const HChar* toolname)
 /*=== 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 @@ Addr setup_client_stack( void*  init_sp,
 #           endif
             break;
 
-         case AT_DCACHEBSIZE:
          case AT_ICACHEBSIZE:
          case AT_UCACHEBSIZE:
 #           if defined(VGP_ppc32_linux)

diff --git a/coregrind/m_libcproc.c b/coregrind/m_libcproc.c
index 045a37870cb533faacc5504357e4198aa42ae658..0b9ae230ec54e3f0370fedbac56e6c7cf4290f55 100644 (file)
--- a/coregrind/m_libcproc.c
+++ b/coregrind/m_libcproc.c
@@ -742,7 +742,7 @@ void VG_(invalidate_icache) ( void *ptr, SizeT nbytes )
    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);

diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c
index ac51b85e2c84caa0e34a5854770ff23bde7d4196..ab5bc31f1dacebd1d13d473fa1d609d59f7f2464 100644 (file)
--- a/coregrind/m_machine.c
+++ b/coregrind/m_machine.c
@@ -1491,11 +1491,11 @@ void VG_(machine_ppc32_set_clszB)( Int szB )
    /* 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 @@ void VG_(machine_ppc64_set_clszB)( Int szB )
    /* 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