Track changes to PPC naming convention - VEX r1504
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5416 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c
index a8987e7..482a1f3 100644
--- a/coregrind/m_machine.c
+++ b/coregrind/m_machine.c
@@ -238,6 +238,12 @@
then safe to use VG_(machine_get_VexArchInfo)
and VG_(machine_ppc32_has_FP)
and VG_(machine_ppc32_has_VMX)
+ -------------
+ ppc64: initially: call VG_(machine_get_hwcaps)
+ call VG_(machine_ppc64_set_clszB)
+
+ then safe to use VG_(machine_get_VexArchInfo)
+ and VG_(machine_ppc64_has_VMX)
VG_(machine_get_hwcaps) may use signals (although it attempts to
leave signal state unchanged) and therefore should only be
@@ -456,11 +462,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.ppc32_cache_line_szB == 0
- || vai.ppc32_cache_line_szB == szB);
+ vg_assert(vai.ppc_cache_line_szB == 0
+ || vai.ppc_cache_line_szB == szB);
vg_assert(szB == 32 || szB == 128);
- vai.ppc32_cache_line_szB = szB;
+ vai.ppc_cache_line_szB = szB;
}
#endif
@@ -474,11 +480,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.ppc32_cache_line_szB == 0
- || vai.ppc32_cache_line_szB == szB);
+ vg_assert(vai.ppc_cache_line_szB == 0
+ || vai.ppc_cache_line_szB == szB);
vg_assert(szB == 32 || szB == 128);
- vai.ppc32_cache_line_szB = szB;
+ vai.ppc_cache_line_szB = szB;
}
#endif
diff --git a/coregrind/m_transtab.c b/coregrind/m_transtab.c
index 5b69194..31705a7 100644
--- a/coregrind/m_transtab.c
+++ b/coregrind/m_transtab.c
@@ -31,7 +31,7 @@
#include "pub_core_basics.h"
#include "pub_core_debuglog.h"
-#include "pub_core_machine.h" // ppc32: VG_(cache_line_size_ppc32)
+#include "pub_core_machine.h" // For VG(machine_get_VexArchInfo)
#include "pub_core_libcbase.h"
#include "pub_core_libcassert.h"
#include "pub_core_libcprint.h"
@@ -742,7 +742,7 @@
VexArchInfo vai;
VG_(machine_get_VexArchInfo)( NULL, &vai );
- cls = vai.ppc32_cache_line_szB;
+ cls = vai.ppc_cache_line_szB;
/* Stay sane .. */
vg_assert(cls == 32 || cls == 128);
diff --git a/coregrind/pub_core_machine.h b/coregrind/pub_core_machine.h
index 1b68204..656e015 100644
--- a/coregrind/pub_core_machine.h
+++ b/coregrind/pub_core_machine.h
@@ -87,7 +87,7 @@
//-------------------------------------------------------------
/* Details about the capabilities of the underlying (host) CPU. These
details are acquired by (1) enquiring with the CPU at startup, or
- (2) from the AT_SYSINFO entries the kernel gave us (ppc32 cache
+ (2) from the AT_SYSINFO entries the kernel gave us (ppc cache
line size). It's a bit nasty in the sense that there's no obvious
way to stop uses of some of this info before it's ready to go.