Mercurial > hg > graal-jvmci-8

diff graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java @ 21413:15a46a918fc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed unnecessary HotSpotCodeCache.MarkId enum (JBS:GRAAL-53) converted some uses of GraalInternalError to InternalError
author Doug Simon <doug.simon@oracle.com>
date Mon, 18 May 2015 22:27:24 +0200
parents b1700db197c7
children 0ee2ed36d079 1da7aef31a08
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java	Mon May 18 17:44:43 2015 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java	Mon May 18 22:27:24 2015 +0200
@@ -39,7 +39,6 @@
 import com.oracle.graal.compiler.gen.*;
 import com.oracle.graal.compiler.target.*;
 import com.oracle.graal.hotspot.*;
-import com.oracle.graal.hotspot.meta.HotSpotCodeCacheProvider.MarkId;
 import com.oracle.graal.hotspot.meta.*;
 import com.oracle.graal.hotspot.stubs.*;
 import com.oracle.graal.lir.*;
@@ -251,7 +250,7 @@
         emitCodeBody(installedCodeOwner, crb, lir);
 
         // Emit the suffix
-        emitCodeSuffix(installedCodeOwner, crb, asm, frameMap);
+        emitCodeSuffix(installedCodeOwner, crb, asm, config, frameMap);
 
         // Profile assembler instructions
         profileInstructions(lir, crb);
@@ -265,7 +264,7 @@
     public void emitCodePrefix(ResolvedJavaMethod installedCodeOwner, CompilationResultBuilder crb, AMD64MacroAssembler asm, RegisterConfig regConfig, HotSpotVMConfig config, Label verifiedEntry) {
         HotSpotProviders providers = getProviders();
         if (installedCodeOwner != null && !installedCodeOwner.isStatic()) {
-            MarkId.recordMark(crb, MarkId.UNVERIFIED_ENTRY);
+            crb.recordMark(config.MARKID_UNVERIFIED_ENTRY);
             CallingConvention cc = regConfig.getCallingConvention(JavaCallee, null, new JavaType[]{providers.getMetaAccess().lookupJavaType(Object.class)}, getTarget(), false);
             Register inlineCacheKlass = rax; // see definition of IC_Klass in
                                              // c1_LIRAssembler_x86.cpp
@@ -287,9 +286,9 @@
         }
 
         asm.align(config.codeEntryAlignment);
-        MarkId.recordMark(crb, MarkId.OSR_ENTRY);
+        crb.recordMark(config.MARKID_OSR_ENTRY);
         asm.bind(verifiedEntry);
-        MarkId.recordMark(crb, MarkId.VERIFIED_ENTRY);
+        crb.recordMark(config.MARKID_VERIFIED_ENTRY);
     }
 
     /**
@@ -303,15 +302,16 @@
 
     /**
      * @param installedCodeOwner see {@link Backend#emitCode}
+     * @param config
      */
-    public void emitCodeSuffix(ResolvedJavaMethod installedCodeOwner, CompilationResultBuilder crb, AMD64MacroAssembler asm, FrameMap frameMap) {
+    public void emitCodeSuffix(ResolvedJavaMethod installedCodeOwner, CompilationResultBuilder crb, AMD64MacroAssembler asm, HotSpotVMConfig config, FrameMap frameMap) {
         HotSpotProviders providers = getProviders();
         HotSpotFrameContext frameContext = (HotSpotFrameContext) crb.frameContext;
         if (!frameContext.isStub) {
             HotSpotForeignCallsProvider foreignCalls = providers.getForeignCalls();
-            MarkId.recordMark(crb, MarkId.EXCEPTION_HANDLER_ENTRY);
+            crb.recordMark(config.MARKID_EXCEPTION_HANDLER_ENTRY);
             AMD64Call.directCall(crb, asm, foreignCalls.lookupForeignCall(EXCEPTION_HANDLER), null, false, null);
-            MarkId.recordMark(crb, MarkId.DEOPT_HANDLER_ENTRY);
+            crb.recordMark(config.MARKID_DEOPT_HANDLER_ENTRY);
             AMD64Call.directCall(crb, asm, foreignCalls.lookupForeignCall(DEOPTIMIZATION_HANDLER), null, false, null);
         } else {
             // No need to emit the stubs for entries back into the method since