Merge r8151 (Allow 64-byte line sizes (PA6T cpu)).

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_3_BRANCH@8152

diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c
index bb4faf706487f71beebaa95b3a7ce69c07cc8824..c04162d2d530e8b83edddada3b457afa0a1f7a55 100644 (file)
--- a/coregrind/m_machine.c
+++ b/coregrind/m_machine.c
@@ -554,7 +554,7 @@ void VG_(machine_ppc32_set_clszB)( Int szB )
    vg_assert(vai.ppc_cache_line_szB == 0
              || vai.ppc_cache_line_szB == szB);
 
-   vg_assert(szB == 32 || szB == 128);
+   vg_assert(szB == 32 || szB == 64 || szB == 128);
    vai.ppc_cache_line_szB = szB;
 }
 #endif
@@ -572,7 +572,7 @@ void VG_(machine_ppc64_set_clszB)( Int szB )
    vg_assert(vai.ppc_cache_line_szB == 0
              || vai.ppc_cache_line_szB == szB);
 
-   vg_assert(szB == 32 || szB == 128);
+   vg_assert(szB == 32 || szB == 64 || szB == 128);
    vai.ppc_cache_line_szB = szB;
 }
 #endif

diff --git a/coregrind/m_transtab.c b/coregrind/m_transtab.c
index f1c523f7783a137986f0b6b2f415eb24bb444109..8b952e4ab41a58a9ee35f148dab304f2d17d5e68 100644 (file)
--- a/coregrind/m_transtab.c
+++ b/coregrind/m_transtab.c
@@ -804,7 +804,7 @@ static void invalidate_icache ( void *ptr, Int nbytes )
    cls = vai.ppc_cache_line_szB;
 
    /* Stay sane .. */
-   vg_assert(cls == 32 || cls == 128);
+   vg_assert(cls == 32 || cls == 64 || cls == 128);
 
    startaddr &= ~(cls - 1);
    for (addr = startaddr; addr < endaddr; addr += cls)