[Valgrind-developers] valgrind: r8152 - branches/VALGRIND_3_3_BRANCH/coregrind

[<sv...@va...>]

Author: sewardj
Date: 2008-05-29 22:08:16 +0100 (Thu, 29 May 2008)
New Revision: 8152

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


Modified:
   branches/VALGRIND_3_3_BRANCH/coregrind/m_machine.c
   branches/VALGRIND_3_3_BRANCH/coregrind/m_transtab.c


Modified: branches/VALGRIND_3_3_BRANCH/coregrind/m_machine.c
===================================================================
--- branches/VALGRIND_3_3_BRANCH/coregrind/m_machine.c	2008-05-29 16:39:57 UTC (rev 8151)
+++ branches/VALGRIND_3_3_BRANCH/coregrind/m_machine.c	2008-05-29 21:08:16 UTC (rev 8152)
@@ -554,7 +554,7 @@
    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 @@
    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

Modified: branches/VALGRIND_3_3_BRANCH/coregrind/m_transtab.c
===================================================================
--- branches/VALGRIND_3_3_BRANCH/coregrind/m_transtab.c	2008-05-29 16:39:57 UTC (rev 8151)
+++ branches/VALGRIND_3_3_BRANCH/coregrind/m_transtab.c	2008-05-29 21:08:16 UTC (rev 8152)
@@ -804,7 +804,7 @@
    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)