From 1cb612409cb38db017077588c5a321c2fa54de7f Mon Sep 17 00:00:00 2001
From: kvn <unknown>
Date: Tue, 28 Jun 2011 15:04:39 -0700
Subject: [PATCH] 6990015: Incorrect Icache line size is used for 64 bit x86
 Summary: correct Icache::line_size for x64 and add verification code into
 vm_version_x86. Reviewed-by: never, phh

---
 src/cpu/x86/vm/icache_x86.hpp     |  4 ++--
 src/cpu/x86/vm/vm_version_x86.cpp | 14 ++++++++++++++
 src/cpu/x86/vm/vm_version_x86.hpp |  4 +++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/cpu/x86/vm/icache_x86.hpp b/src/cpu/x86/vm/icache_x86.hpp
index e02b10310..914158a65 100644
--- a/src/cpu/x86/vm/icache_x86.hpp
+++ b/src/cpu/x86/vm/icache_x86.hpp
@@ -43,8 +43,8 @@ class ICache : public AbstractICache {
 #ifdef AMD64
   enum {
     stub_size      = 64, // Size of the icache flush stub in bytes
-    line_size      = 32, // Icache line size in bytes
-    log2_line_size = 5   // log2(line_size)
+    line_size      = 64, // Icache line size in bytes
+    log2_line_size = 6   // log2(line_size)
   };
 
   // Use default implementation
diff --git a/src/cpu/x86/vm/vm_version_x86.cpp b/src/cpu/x86/vm/vm_version_x86.cpp
index fb81bf3d4..d140f36fe 100644
--- a/src/cpu/x86/vm/vm_version_x86.cpp
+++ b/src/cpu/x86/vm/vm_version_x86.cpp
@@ -321,6 +321,20 @@ void VM_Version::get_processor_features() {
   if (UseSSE < 2) UseSSE = 2;
 #endif
 
+#ifdef AMD64
+  // flush_icache_stub have to be generated first.
+  // That is why Icache line size is hard coded in ICache class,
+  // see icache_x86.hpp. It is also the reason why we can't use
+  // clflush instruction in 32-bit VM since it could be running
+  // on CPU which does not support it.
+  //
+  // The only thing we can do is to verify that flushed
+  // ICache::line_size has correct value.
+  guarantee(_cpuid_info.std_cpuid1_edx.bits.clflush != 0, "clflush is not supported");
+  // clflush_size is size in quadwords (8 bytes).
+  guarantee(_cpuid_info.std_cpuid1_ebx.bits.clflush_size == 8, "such clflush size is not supported");
+#endif
+
   // If the OS doesn't support SSE, we can't use this feature even if the HW does
   if (!os::supports_sse())
     _cpuFeatures &= ~(CPU_SSE|CPU_SSE2|CPU_SSE3|CPU_SSSE3|CPU_SSE4A|CPU_SSE4_1|CPU_SSE4_2);
diff --git a/src/cpu/x86/vm/vm_version_x86.hpp b/src/cpu/x86/vm/vm_version_x86.hpp
index 3b69a75f1..ba2682276 100644
--- a/src/cpu/x86/vm/vm_version_x86.hpp
+++ b/src/cpu/x86/vm/vm_version_x86.hpp
@@ -91,7 +91,9 @@ public:
                cmpxchg8 : 1,
                         : 6,
                cmov     : 1,
-                        : 7,
+                        : 3,
+               clflush  : 1,
+                        : 3,
                mmx      : 1,
                fxsr     : 1,
                sse      : 1,
-- 
GitLab