Mercurial > hg > truffle

changeset 5269:6b2d030d01ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Lukas Stadler <lukas.stadler@jku.at>
date Fri, 20 Apr 2012 15:03:02 +0200
parents b59e32ea3761 (current diff) 4e4a868c2b2a (diff)
children e7f3f0541429
files mx/commands.py
diffstat 8 files changed, 22 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java	Fri Apr 20 15:02:54 2012 +0200
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java	Fri Apr 20 15:03:02 2012 +0200
@@ -332,6 +332,10 @@
         return true;
     }
 
+    /**
+     * Removes this node from its graph.
+     * This node must have no {@linkplain Node#usages() usages} and no {@linkplain #predecessor() predecessor}.
+     */
     public void safeDelete() {
         assert checkDeletion();
         clearInputs();
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java	Fri Apr 20 15:02:54 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java	Fri Apr 20 15:03:02 2012 +0200
@@ -98,7 +98,6 @@
     public long accessFieldStub;
     public long resolveStaticCallStub;
     public long inlineCacheMissStub;
-    public long unwindExceptionStub;
     public long handleExceptionStub;
     public long handleDeoptStub;
     public long monitorEnterStub;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/HotSpotAMD64Backend.java	Fri Apr 20 15:02:54 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/target/amd64/HotSpotAMD64Backend.java	Fri Apr 20 15:03:02 2012 +0200
@@ -45,8 +45,6 @@
 import com.oracle.max.asm.target.amd64.AMD64Assembler.ConditionFlag;
 import com.oracle.max.asm.target.amd64.*;
 import com.oracle.max.cri.ci.*;
-import com.oracle.max.cri.ci.CiCallingConvention.Type;
-import com.oracle.max.cri.ci.CiRegister.RegisterFlag;
 import com.oracle.max.cri.ri.*;
 import com.oracle.max.cri.xir.*;
 
@@ -200,20 +198,6 @@
 
         boolean frameOmitted = tasm.frameContext == null;
         if (!frameOmitted) {
-            CiRegister thread = r15;
-            CiRegister exceptionOop = regConfig.getCallingConventionRegisters(Type.RuntimeCall, RegisterFlag.CPU)[0];
-            Label unwind = new Label();
-            asm.bind(unwind);
-            tasm.recordMark(MARK_UNWIND_ENTRY);
-            CiAddress exceptionOopField = new CiAddress(CiKind.Object, thread.asValue(), config.threadExceptionOopOffset);
-            CiAddress exceptionPcField = new CiAddress(CiKind.Object, thread.asValue(), config.threadExceptionPcOffset);
-            asm.movq(exceptionOop, exceptionOopField);
-            asm.movslq(exceptionOopField, 0);
-            asm.movslq(exceptionPcField, 0);
-
-            AMD64Call.directCall(tasm, asm, config.unwindExceptionStub, null);
-            AMD64Call.shouldNotReachHere(tasm, asm);
-
             tasm.recordMark(MARK_EXCEPTION_HANDLER_ENTRY);
             AMD64Call.directCall(tasm, asm, config.handleExceptionStub, null);
             AMD64Call.shouldNotReachHere(tasm, asm);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java	Fri Apr 20 15:02:54 2012 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java	Fri Apr 20 15:03:02 2012 +0200
@@ -166,6 +166,12 @@
         node.safeDelete();
     }
 
+    /**
+     * Unlinks a node from all its control flow neighbours and then removes it from its graph.
+     * The node must have no {@linkplain Node#usages() usages}.
+     *
+     * @param node the node to be unlinked and removed
+     */
     public void removeFixed(FixedWithNextNode node) {
         assert node != null;
         if (node instanceof BeginNode) {
--- a/mx/commands.py	Fri Apr 20 15:02:54 2012 +0200
+++ b/mx/commands.py	Fri Apr 20 15:03:02 2012 +0200
@@ -547,6 +547,14 @@
         else:
             file(timestampFile, 'a')
 
+def vmg(args):
+    """run the debug build of VM selected by the '--vm' option"""
+    return vm(args, vmbuild='debug')
+
+def vmfg(args):
+    """run the fastdebug build of VM selected by the '--vm' option"""
+    return vm(args, vmbuild='fastdebug')
+
 def vm(args, vm=None, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, vmbuild=None):
     """run the VM selected by the '--vm' option"""
 
@@ -988,7 +996,9 @@
         'unittest' : [unittest, '[filters...]'],
         'jtt' : [jtt, '[filters...]'],
         'jacocoreport' : [jacocoreport, '[output directory]'],
-        'vm': [vm, '[-options] class [args...]']
+        'vm': [vm, '[-options] class [args...]'],
+        'vmg': [vmg, '[-options] class [args...]'],
+        'vmfg': [vmfg, '[-options] class [args...]']
     }
     
     mx.add_argument('--jacoco', help='instruments com.oracle.* classes using JaCoCo', default='off', choices=['off', 'on', 'append'])
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Fri Apr 20 15:02:54 2012 +0200
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Fri Apr 20 15:03:02 2012 +0200
@@ -815,9 +815,6 @@
       case MARK_OSR_ENTRY:
         _offsets.set_value(CodeOffsets::OSR_Entry, pc_offset);
         break;
-      case MARK_UNWIND_ENTRY:
-        _offsets.set_value(CodeOffsets::UnwindHandler, pc_offset);
-        break;
       case MARK_EXCEPTION_HANDLER_ENTRY:
         _offsets.set_value(CodeOffsets::Exceptions, pc_offset);
         break;
--- a/src/share/vm/graal/graalCodeInstaller.hpp	Fri Apr 20 15:02:54 2012 +0200
+++ b/src/share/vm/graal/graalCodeInstaller.hpp	Fri Apr 20 15:03:02 2012 +0200
@@ -31,7 +31,7 @@
     MARK_VERIFIED_ENTRY             = 0x0001,
     MARK_UNVERIFIED_ENTRY           = 0x0002,
     MARK_OSR_ENTRY                  = 0x0003,
-    MARK_UNWIND_ENTRY               = 0x0004,
+  //MARK_UNWIND_ENTRY               = 0x0004,
     MARK_EXCEPTION_HANDLER_ENTRY    = 0x0005,
     MARK_DEOPT_HANDLER_ENTRY        = 0x0006,
     MARK_STATIC_CALL_STUB           = 0x1000,
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Fri Apr 20 15:02:54 2012 +0200
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Fri Apr 20 15:03:02 2012 +0200
@@ -824,7 +824,6 @@
   set_long(env, config, "accessFieldStub", VmIds::addStub(Runtime1::entry_for(Runtime1::access_field_patching_id)));
   set_long(env, config, "resolveStaticCallStub", VmIds::addStub(SharedRuntime::get_resolve_static_call_stub()));
   set_long(env, config, "inlineCacheMissStub", VmIds::addStub(SharedRuntime::get_ic_miss_stub()));
-  set_long(env, config, "unwindExceptionStub", VmIds::addStub(Runtime1::entry_for(Runtime1::graal_unwind_exception_call_id)));
   set_long(env, config, "handleExceptionStub", VmIds::addStub(Runtime1::entry_for(Runtime1::handle_exception_nofpu_id)));
   set_long(env, config, "handleDeoptStub", VmIds::addStub(SharedRuntime::deopt_blob()->unpack()));
   set_long(env, config, "monitorEnterStub", VmIds::addStub(Runtime1::entry_for(Runtime1::monitorenter_id)));