From: Julian Seward <jseward@acm.org>
Date: Thu, 29 May 2008 21:08:16 +0000 (+0000)
Subject: Merge r8151 (Allow 64-byte line sizes (PA6T cpu)).
X-Git-Tag: svn/VALGRIND_3_3_1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03f16dad95604332c05c977f625f18013b59e944;p=thirdparty%2Fvalgrind.git

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 bb4faf7064..c04162d2d5 100644
--- 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 f1c523f778..8b952e4ab4 100644
--- 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)