# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1321900088 -3600
# Node ID 6157f507b7dfa37f6dbb044e93f243cdc40c5629
# Parent  6cadc61ca6041a910c98a2ecc050b72866a2e6aa# Parent  9482471a7dfaa8288d857c1a140639be3dc04650
Merge.

diff -r 9482471a7dfa -r 6157f507b7df src/cpu/x86/vm/c1_globals_x86.hpp
--- a/src/cpu/x86/vm/c1_globals_x86.hpp	Mon Nov 21 15:54:32 2011 +0100
+++ b/src/cpu/x86/vm/c1_globals_x86.hpp	Mon Nov 21 19:28:08 2011 +0100
@@ -46,11 +46,11 @@
 define_pd_global(intx, OnStackReplacePercentage,     933  );
 define_pd_global(intx, FreqInlineSize,               325  );
 define_pd_global(intx, NewSizeThreadIncrease,        4*K  );
-define_pd_global(intx, InitialCodeCacheSize,         160*K);
-define_pd_global(intx, ReservedCodeCacheSize,        32*M );
+define_pd_global(intx, InitialCodeCacheSize,         4*M);      // changed for GRAAL
+define_pd_global(intx, ReservedCodeCacheSize,        50*M );
 define_pd_global(bool, ProfileInterpreter,           true );    // changed for GRAAL
-define_pd_global(intx, CodeCacheExpansionSize,       32*K );
-define_pd_global(uintx,CodeCacheMinBlockLength,      1);
+define_pd_global(intx, CodeCacheExpansionSize,       64*K );    // changed for GRAAL
+define_pd_global(uintx,CodeCacheMinBlockLength,      4);        // changed for GRAAL
 define_pd_global(uintx,PermSize,                     12*M );
 define_pd_global(uintx,MaxPermSize,                  64*M );
 define_pd_global(bool, NeverActAsServerClassMachine, true );