Mercurial > hg > truffle

changeset 6490:9892bfd8a48f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactored stub names into constants shared between definition and usage sites
author Doug Simon <doug.simon@oracle.com>
date Tue, 02 Oct 2012 17:31:03 +0200
parents 1f0edd29cc66
children e61ef9ba27a8
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorEnterStubCall.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorExitStubCall.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewArrayStubCall.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewInstanceStubCall.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VMErrorNode.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VerifyOopStubCall.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/HotSpotBackend.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/HotSpotAMD64Backend.java
diffstat 9 files changed, 38 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorEnterStubCall.java	Tue Oct 02 17:22:22 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorEnterStubCall.java	Tue Oct 02 17:31:03 2012 +0200
@@ -22,6 +22,8 @@
  */
 package com.oracle.graal.hotspot.nodes;
 
+import static com.oracle.graal.hotspot.target.HotSpotBackend.*;
+
 import com.oracle.graal.compiler.gen.*;
 import com.oracle.graal.compiler.target.*;
 import com.oracle.graal.hotspot.*;
@@ -47,7 +49,7 @@
     @Override
     public void generate(LIRGenerator gen) {
         HotSpotBackend backend = (HotSpotBackend) HotSpotGraalRuntime.getInstance().getCompiler().backend;
-        HotSpotStub stub = backend.getStub("monitorenter");
+        HotSpotStub stub = backend.getStub(MONITORENTER_STUB_NAME);
         gen.emitCall(stub.address, stub.cc, true, gen.operand(object), gen.operand(lock));
     }
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorExitStubCall.java	Tue Oct 02 17:22:22 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorExitStubCall.java	Tue Oct 02 17:31:03 2012 +0200
@@ -22,6 +22,8 @@
  */
 package com.oracle.graal.hotspot.nodes;
 
+import static com.oracle.graal.hotspot.target.HotSpotBackend.*;
+
 import com.oracle.graal.compiler.gen.*;
 import com.oracle.graal.compiler.target.*;
 import com.oracle.graal.hotspot.*;
@@ -44,7 +46,7 @@
     @Override
     public void generate(LIRGenerator gen) {
         HotSpotBackend backend = (HotSpotBackend) HotSpotGraalRuntime.getInstance().getCompiler().backend;
-        HotSpotStub stub = backend.getStub("monitorexit");
+        HotSpotStub stub = backend.getStub(MONITOREXIT_STUB_NAME);
         gen.emitCall(stub.address, stub.cc, true, gen.operand(object), gen.emitLea(gen.peekLock()));
     }
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewArrayStubCall.java	Tue Oct 02 17:22:22 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewArrayStubCall.java	Tue Oct 02 17:31:03 2012 +0200
@@ -22,6 +22,8 @@
  */
 package com.oracle.graal.hotspot.nodes;
 
+import static com.oracle.graal.hotspot.target.HotSpotBackend.*;
+
 import com.oracle.graal.compiler.gen.*;
 import com.oracle.graal.compiler.target.*;
 import com.oracle.graal.hotspot.*;
@@ -61,7 +63,7 @@
     @Override
     public void generate(LIRGenerator gen) {
         HotSpotBackend backend = (HotSpotBackend) HotSpotGraalRuntime.getInstance().getCompiler().backend;
-        HotSpotStub stub = backend.getStub(isObjectArray ? "new_object_array" : "new_type_array");
+        HotSpotStub stub = backend.getStub(isObjectArray ? NEW_OBJECT_ARRAY_STUB_NAME : NEW_TYPE_ARRAY_STUB_NAME);
         Variable result = gen.emitCall(stub.address, stub.cc, true, gen.operand(hub), gen.operand(length));
         gen.setResult(this, result);
     }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewInstanceStubCall.java	Tue Oct 02 17:22:22 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewInstanceStubCall.java	Tue Oct 02 17:31:03 2012 +0200
@@ -22,6 +22,8 @@
  */
 package com.oracle.graal.hotspot.nodes;
 
+import static com.oracle.graal.hotspot.target.HotSpotBackend.*;
+
 import com.oracle.graal.compiler.gen.*;
 import com.oracle.graal.compiler.target.*;
 import com.oracle.graal.hotspot.*;
@@ -57,7 +59,7 @@
     @Override
     public void generate(LIRGenerator gen) {
         HotSpotBackend backend = (HotSpotBackend) HotSpotGraalRuntime.getInstance().getCompiler().backend;
-        HotSpotStub stub = backend.getStub("new_instance");
+        HotSpotStub stub = backend.getStub(NEW_INSTANCE_STUB_NAME);
         Variable result = gen.emitCall(stub.address, stub.cc, true, gen.operand(hub));
         gen.setResult(this, result);
     }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java	Tue Oct 02 17:22:22 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java	Tue Oct 02 17:31:03 2012 +0200
@@ -22,6 +22,8 @@
  */
 package com.oracle.graal.hotspot.nodes;
 
+import static com.oracle.graal.hotspot.target.HotSpotBackend.*;
+
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.compiler.gen.*;
 import com.oracle.graal.compiler.target.*;
@@ -63,7 +65,7 @@
     @Override
     public void generate(LIRGenerator gen) {
         HotSpotBackend backend = (HotSpotBackend) HotSpotGraalRuntime.getInstance().getCompiler().backend;
-        HotSpotStub stub = backend.getStub("new_multi_array");
+        HotSpotStub stub = backend.getStub(NEW_MULTI_ARRAY_STUB_NAME);
         Variable result = gen.emitCall(stub.address, stub.cc, true, gen.operand(hub), Constant.forInt(rank), gen.operand(dims));
         gen.setResult(this, result);
     }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VMErrorNode.java	Tue Oct 02 17:22:22 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VMErrorNode.java	Tue Oct 02 17:31:03 2012 +0200
@@ -22,6 +22,8 @@
  */
 package com.oracle.graal.hotspot.nodes;
 
+import static com.oracle.graal.hotspot.target.HotSpotBackend.*;
+
 import com.oracle.graal.api.code.*;
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.compiler.gen.*;
@@ -61,7 +63,7 @@
         }
 
         HotSpotBackend backend = (HotSpotBackend) HotSpotGraalRuntime.getInstance().getCompiler().backend;
-        HotSpotStub stub = backend.getStub("vm_error");
+        HotSpotStub stub = backend.getStub(VM_ERROR_STUB_NAME);
         gen.emitCall(stub.address, stub.cc, false, Constant.forObject(where), gen.operand(format), gen.operand(value));
     }
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VerifyOopStubCall.java	Tue Oct 02 17:22:22 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VerifyOopStubCall.java	Tue Oct 02 17:31:03 2012 +0200
@@ -22,6 +22,8 @@
  */
 package com.oracle.graal.hotspot.nodes;
 
+import static com.oracle.graal.hotspot.target.HotSpotBackend.*;
+
 import com.oracle.graal.compiler.gen.*;
 import com.oracle.graal.compiler.target.*;
 import com.oracle.graal.hotspot.*;
@@ -44,7 +46,7 @@
     @Override
     public void generate(LIRGenerator gen) {
         HotSpotBackend backend = (HotSpotBackend) HotSpotGraalRuntime.getInstance().getCompiler().backend;
-        HotSpotStub stub = backend.getStub("verify_oop");
+        HotSpotStub stub = backend.getStub(VERIFY_OOP_STUB_NAME);
         gen.emitCall(stub.address, stub.cc, true, gen.operand(object));
     }
 
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/HotSpotBackend.java	Tue Oct 02 17:22:22 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/HotSpotBackend.java	Tue Oct 02 17:31:03 2012 +0200
@@ -34,6 +34,15 @@
  */
 public abstract class HotSpotBackend extends Backend {
 
+    public static final String VM_ERROR_STUB_NAME = "vm_error";
+    public static final String VERIFY_OOP_STUB_NAME = "verify_oop";
+    public static final String NEW_MULTI_ARRAY_STUB_NAME = "new_multi_array";
+    public static final String NEW_INSTANCE_STUB_NAME = "new_instance";
+    public static final String NEW_TYPE_ARRAY_STUB_NAME = "new_type_array";
+    public static final String NEW_OBJECT_ARRAY_STUB_NAME = "new_object_array";
+    public static final String MONITOREXIT_STUB_NAME = "monitorexit";
+    public static final String MONITORENTER_STUB_NAME = "monitorenter";
+
     private final Map<String, HotSpotStub> stubsMap = new HashMap<>();
 
     public HotSpotBackend(CodeCacheProvider runtime, TargetDescription target) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/HotSpotAMD64Backend.java	Tue Oct 02 17:22:22 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/HotSpotAMD64Backend.java	Tue Oct 02 17:31:03 2012 +0200
@@ -67,48 +67,48 @@
         Register jarg1 = jargs[1];
         Register jarg2 = jargs[2];
 
-        addStub("monitorenter", c.fastMonitorEnterStub,
+        addStub(MONITORENTER_STUB_NAME, c.fastMonitorEnterStub,
                 /*        temps */ new Register[] {rax, rbx},
                 /*          ret */ IllegalValue,
                 /* arg0: object */ jarg0.asValue(Kind.Object),
                 /* arg1:   lock */ jarg1.asValue(word));
 
-        addStub("monitorexit", c.fastMonitorExitStub,
+        addStub(MONITOREXIT_STUB_NAME, c.fastMonitorExitStub,
                 /*        temps */ new Register[] {rax, rbx},
                 /*          ret */ IllegalValue,
                 /* arg0: object */ jarg0.asValue(Kind.Object),
                 /* arg1:   lock */ jarg1.asValue(word));
 
-        addStub("new_object_array", c.newObjectArrayStub,
+        addStub(NEW_OBJECT_ARRAY_STUB_NAME, c.newObjectArrayStub,
                 /*        temps */ new Register[] {rcx, rdi, rsi},
                 /*          ret */ rax.asValue(Kind.Object),
                 /* arg0:    hub */ rdx.asValue(Kind.Object),
                 /* arg1: length */ rbx.asValue(Kind.Int));
 
-        addStub("new_type_array", c.newTypeArrayStub,
+        addStub(NEW_TYPE_ARRAY_STUB_NAME, c.newTypeArrayStub,
                 /*        temps */ new Register[] {rcx, rdi, rsi},
                 /*          ret */ rax.asValue(Kind.Object),
                 /* arg0:    hub */ rdx.asValue(Kind.Object),
                 /* arg1: length */ rbx.asValue(Kind.Int));
 
-        addStub("new_instance", c.newInstanceStub,
+        addStub(NEW_INSTANCE_STUB_NAME, c.newInstanceStub,
                 /*        temps */ null,
                 /*          ret */ rax.asValue(Kind.Object),
                 /* arg0:    hub */ rdx.asValue(Kind.Object));
 
-        addStub("new_multi_array", c.newMultiArrayStub,
+        addStub(NEW_MULTI_ARRAY_STUB_NAME, c.newMultiArrayStub,
                 /*        temps */ null,
                 /*          ret */ rax.asValue(Kind.Object),
                 /* arg0:    hub */ rax.asValue(Kind.Object),
                 /* arg1:   rank */ rbx.asValue(Kind.Int),
                 /* arg2:   dims */ rcx.asValue(word));
 
-        addStub("verify_oop", c.verifyOopStub,
+        addStub(VERIFY_OOP_STUB_NAME, c.verifyOopStub,
                 /*        temps */ null,
                 /*          ret */ IllegalValue,
                 /* arg0: object */ r13.asValue(Kind.Object));
 
-        addStub("vm_error", c.vmErrorStub,
+        addStub(VM_ERROR_STUB_NAME, c.vmErrorStub,
                 /*        temps */ null,
                 /*          ret */ IllegalValue,
                 /* arg0:  where */ jarg0.asValue(Kind.Object),