get_caches(): ensure caches are initialised on targets where

get_caches_from_CPUID fails.

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

diff --git a/cachegrind/cg_main.c b/cachegrind/cg_main.c
index 2756243ade611994cc07081d5c9658ddf82bf717..4f1bf10716b96a50ff2b49ed1a9d351c87f15b94 100644 (file)
--- a/cachegrind/cg_main.c
+++ b/cachegrind/cg_main.c
@@ -1060,6 +1060,10 @@ void get_caches(cache_t* I1c, cache_t* D1c, cache_t* L2c)
     -1 != VG_(clo_##L##_cache).assoc ||     \
     -1 != VG_(clo_##L##_cache).line_size)
 
+   *I1c = VG_(clo_I1_cache);
+   *D1c = VG_(clo_D1_cache);
+   *L2c = VG_(clo_L2_cache);
+
    /* If any undefined on command-line, try CPUID */
    if (! CMD_LINE_DEFINED(I1) ||
        ! CMD_LINE_DEFINED(D1) ||

diff --git a/vg_cachesim.c b/vg_cachesim.c
index 2756243ade611994cc07081d5c9658ddf82bf717..4f1bf10716b96a50ff2b49ed1a9d351c87f15b94 100644 (file)
--- a/vg_cachesim.c
+++ b/vg_cachesim.c
@@ -1060,6 +1060,10 @@ void get_caches(cache_t* I1c, cache_t* D1c, cache_t* L2c)
     -1 != VG_(clo_##L##_cache).assoc ||     \
     -1 != VG_(clo_##L##_cache).line_size)
 
+   *I1c = VG_(clo_I1_cache);
+   *D1c = VG_(clo_D1_cache);
+   *L2c = VG_(clo_L2_cache);
+
    /* If any undefined on command-line, try CPUID */
    if (! CMD_LINE_DEFINED(I1) ||
        ! CMD_LINE_DEFINED(D1) ||