# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1291126437 -3600
# Node ID cb04e4217df0b81c79c1a8677651dacb2fa22b66
# Parent  7641338cfc925d185337e9331ab661fe7975a5ed
Sync with CRI/C1X changes.

diff -r 7641338cfc92 -r cb04e4217df0 c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/Compiler.java
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/Compiler.java	Thu Nov 25 19:21:22 2010 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/Compiler.java	Tue Nov 30 15:13:57 2010 +0100
@@ -20,7 +20,6 @@
  */
 package com.sun.hotspot.c1x;
 
-import java.lang.management.*;
 import java.lang.reflect.Proxy;
 import java.net.*;
 
@@ -149,7 +148,7 @@
         final int wordSize = 8;
         final int stackFrameAlignment = 16;
         registerConfig = runtime.globalStubRegConfig;
-        target = new HotSpotTarget(new AMD64(), true, wordSize, wordSize, wordSize, stackFrameAlignment, config.vmPageSize, wordSize, wordSize, config.codeEntryAlignment, true);
+        target = new HotSpotTarget(new AMD64(), true, wordSize, stackFrameAlignment, config.vmPageSize, wordSize, true);
 
         if (Logger.ENABLED) {
             generator = LoggingProxy.getProxy(RiXirGenerator.class, new HotSpotXirGenerator(config, target, registerConfig));
diff -r 7641338cfc92 -r cb04e4217df0 c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotRegisterConfig.java
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotRegisterConfig.java	Thu Nov 25 19:21:22 2010 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotRegisterConfig.java	Tue Nov 30 15:13:57 2010 +0100
@@ -85,7 +85,7 @@
         }
 
         if (globalStubConfig) {
-            registerSaveArea = new CiCalleeSaveArea(-1, rsaRegs, 8);
+            registerSaveArea = new CiCalleeSaveArea(-1, 8, rsaRegs);
         } else {
             registerSaveArea = CiCalleeSaveArea.EMPTY;
         }
@@ -101,7 +101,7 @@
     }
 
     @Override
-    public CiRegister getRegister(int index) {
+    public CiRegister getRegisterForRole(int index) {
         throw new UnsupportedOperationException();
     }
 
@@ -113,7 +113,7 @@
         return callingConvention(parameters, type, target);
     }
 
-    public CiRegister[] getCallingConventionRegisters(Type type) {
+    public CiRegister[] getCallingConventionRegisters(Type type, RegisterFlag flag) {
         return allParameterRegisters;
     }
 
diff -r 7641338cfc92 -r cb04e4217df0 c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotRuntime.java
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotRuntime.java	Thu Nov 25 19:21:22 2010 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotRuntime.java	Tue Nov 30 15:13:57 2010 +0100
@@ -29,7 +29,6 @@
 import com.sun.cri.ci.CiTargetMethod.DataPatch;
 import com.sun.cri.ci.CiTargetMethod.Safepoint;
 import com.sun.cri.ri.*;
-import com.sun.max.asm.*;
 import com.sun.max.asm.dis.*;
 import com.sun.max.lang.*;
 
diff -r 7641338cfc92 -r cb04e4217df0 c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTarget.java
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTarget.java	Thu Nov 25 19:21:22 2010 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTarget.java	Tue Nov 30 15:13:57 2010 +0100
@@ -29,9 +29,8 @@
  */
 public class HotSpotTarget extends CiTarget {
 
-    public HotSpotTarget(CiArchitecture arch, boolean isMP, int spillSlotSize, int wordSize, int referenceSize, int stackAlignment, int pageSize, int cacheAlignment,
-                    int heapAlignment, int codeAlignment, boolean inlineObjects) {
-        super(arch, isMP, spillSlotSize, wordSize, referenceSize, stackAlignment, pageSize, cacheAlignment, heapAlignment, codeAlignment, inlineObjects, true);
+    public HotSpotTarget(CiArchitecture arch, boolean isMP, int spillSlotSize, int stackAlignment, int pageSize, int cacheAlignment, boolean inlineObjects) {
+        super(arch, isMP, spillSlotSize, stackAlignment, pageSize, cacheAlignment, inlineObjects, true);
     }
 
     @Override