changeset in /hg/icedtea: 2007-11-15 Gary Benson <gbenson at redh...

[Gary Benson]

changeset b4f375a16170 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b4f375a16170
description:
	2007-11-15  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp
		(line_size, log2_line_size): Reduce cache line size.
		* ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp
		(generate_icache_flush): Ensure we never run with an
		over-large cache line size.

diffstat:

3 files changed, 11 insertions(+), 5 deletions(-)
ChangeLog                                   |    8 ++++++++
ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp |    4 +---
ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp |    4 ++--

diffs (56 lines):

diff -r 9298f9e71015 -r b4f375a16170 ChangeLog
--- a/ChangeLog	Wed Nov 14 17:28:39 2007 -0500
+++ b/ChangeLog	Thu Nov 15 06:06:41 2007 -0500
@@ -1,3 +1,11 @@ 2007-11-15  Lillian Angel  <langel at redha
+2007-11-15  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp
+	(line_size, log2_line_size): Reduce cache line size.
+	* ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp
+	(generate_icache_flush): Ensure we never run with an
+	over-large cache line size.
+
 2007-11-15  Lillian Angel  <langel at redhat.com>
 	    Joshua Sumali  <jsumali at redhat.com>
 
diff -r 9298f9e71015 -r b4f375a16170 ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp
--- a/ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp	Wed Nov 14 17:28:39 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/icache_ppc.cpp	Thu Nov 15 06:06:41 2007 -0500
@@ -28,7 +28,6 @@
 
 #define __ _masm->
 
-#ifdef ASSERT
 static int get_cache_block_size()
 {
   // Measure the cache block size by zeroing the first cache block
@@ -49,14 +48,13 @@ static int get_cache_block_size()
   free(page);
   return blocksize;
 }
-#endif // ASSERT
 
 void ICacheStubGenerator::generate_icache_flush(
   ICache::flush_icache_stub_t* flush_icache_stub) {
 
   StubCodeMark mark(this, "ICache", "flush_icache_stub");
 
-  assert(ICache::line_size <= get_cache_block_size(), "line_size too large");
+  guarantee(ICache::line_size <= get_cache_block_size(),"line_size too large");
   assert(ICache::line_size == 1 << ICache::log2_line_size, "doh");
 
   address start = __ enter();
diff -r 9298f9e71015 -r b4f375a16170 ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp
--- a/ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp	Wed Nov 14 17:28:39 2007 -0500
+++ b/ports/hotspot/src/cpu/ppc/vm/icache_ppc.hpp	Thu Nov 15 06:06:41 2007 -0500
@@ -35,8 +35,8 @@ class ICache : public AbstractICache {
 #else
     stub_size      = 80,  // Size of the icache flush stub in bytes
 #endif // PPC32
-    line_size      = 128, // Icache line size in bytes
-    log2_line_size = 7    // log2(line_size)
+    line_size      = 32,  // Icache line size in bytes
+    log2_line_size = 5    // log2(line_size)
   };
 
   // Use default implementation