Home / Browse / Jikes RVM / Mail / Archive

Jikes RVM

Email Archive: jikesrvm-commits (read-only)

2005:	_Jan	_Feb (118)	_Mar (82)	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2006:	_Jan	_Feb	_Mar	_Apr	_May (59)	_Jun (295)	_Jul (92)	_Aug (121)	_Sep (111)	_Oct (77)	_Nov (163)	_Dec (150)
2007:	_Jan (153)	_Feb (163)	_Mar (349)	_Apr (223)	_May (267)	_Jun (450)	_Jul (346)	_Aug (230)	_Sep (288)	_Oct (123)	_Nov (68)	_Dec (34)
2008:	_Jan (13)	_Feb (35)	_Mar (92)	_Apr (101)	_May (168)	_Jun (285)	_Jul (198)	_Aug (115)	_Sep (77)	_Oct (98)	_Nov (81)	_Dec (35)
2009:	_Jan (76)	_Feb (234)	_Mar (86)	_Apr (41)	_May (23)	_Jun (17)	_Jul (40)	_Aug (16)	_Sep (16)	_Oct	_Nov (8)	_Dec (11)
2010:	_Jan (1)	_Feb (4)	_Mar (17)	_Apr (4)	_May (13)	_Jun (24)	_Jul (89)	_Aug (21)	_Sep (25)	_Oct (19)	_Nov (8)	_Dec (1)
2011:	_Jan (3)	_Feb (13)	_Mar (9)	_Apr (1)	_May (6)	_Jun (19)	_Jul (51)	_Aug (30)	_Sep (3)	_Oct	_Nov	_Dec (13)
2012:	_Jan (10)	_Feb (11)	_Mar	_Apr (1)	_May (3)	_Jun (3)	_Jul (9)	_Aug (34)	_Sep (5)	_Oct (5)	_Nov (8)	_Dec (6)
2013:	_Jan (4)	_Feb (14)	_Mar (11)	_Apr (8)	_May (6)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

[rvm-commits] SF.net SVN: jikesrvm:[14790] rvmroot/trunk/rvm/src/org/jikesrvm/compilers/ baseline/TemplateCompilerFramework.java

From: <captain5050@us...> - 2008-07-24 20:20

Revision: 14790
          http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=14790&view=rev
Author:   captain5050
Date:     2008-07-24 20:20:47 +0000 (Thu, 24 Jul 2008)

Log Message:
-----------
RVM-598, relax constraints on what bytecodes can be in an unpreemptible method.

Modified Paths:
--------------
    rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java	2008-07-24 20:18:43 UTC (rev 14789)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java	2008-07-24 20:20:47 UTC (rev 14790)
@@ -743,7 +743,7 @@
           if (shouldPrint) asm.noteBytecode(biStart, "aastore");
           // Forbidden from uninterruptible code as may cause an {@link
           // ArrayStoreException}
-          if (VM.VerifyUnint && !isInterruptible) forbiddenBytecode("aastore", bcodes.index());
+          if (VM.VerifyUnint && isUninterruptible) forbiddenBytecode("aastore", bcodes.index());
           emit_aastore();
           break;
         }
@@ -1581,11 +1581,12 @@
           if (shouldPrint) asm.noteBytecode(biStart, "new", typeRef);
           // Forbidden from uninterruptible code as new causes calls into MMTk
           // that are interruptible
-          if (VM.VerifyUnint && !isInterruptible) forbiddenBytecode("new ", typeRef, bcodes.index());
+          if (VM.VerifyUnint && isUninterruptible) forbiddenBytecode("new ", typeRef, bcodes.index());
           RVMType type = typeRef.peekType();
           if (type != null && (type.isInitialized() || type.isInBootImage())) {
             emit_resolved_new(type.asClass());
           } else {
+            if (VM.VerifyUnint && isUnpreemptible) forbiddenBytecode("unresolved new ", typeRef, bcodes.index());
             emit_unresolved_new(typeRef);
           }
           break;
@@ -1598,7 +1599,7 @@
           // Forbidden from uninterruptible code as new causes calls into MMTk
           // that are interruptible
           if (shouldPrint) asm.noteBytecode(biStart, "newarray", array.getTypeRef());
-          if (VM.VerifyUnint && !isInterruptible) forbiddenBytecode("new ", array, bcodes.index());
+          if (VM.VerifyUnint && isUninterruptible) forbiddenBytecode("newarray ", array, bcodes.index());
           emit_resolved_newarray(array);
           break;
         }
@@ -1610,7 +1611,7 @@
           if (shouldPrint) asm.noteBytecode(biStart, "anewarray new", arrayRef);
           // Forbidden from uninterruptible code as new causes calls into MMTk
           // that are interruptible
-          if (VM.VerifyUnint && !isInterruptible) forbiddenBytecode("new ", arrayRef, bcodes.index());
+          if (VM.VerifyUnint && !isInterruptible) forbiddenBytecode("anewarray ", arrayRef, bcodes.index());
 
           if (VM.VerifyAssertions && elementTypeRef.isUnboxedType()) {
             VM._assert(false,
@@ -1653,7 +1654,7 @@
           if (VM.UseEpilogueYieldPoints) emit_threadSwitchTest(RVMThread.EPILOGUE);
           // Forbidden from uninterruptible code as athrow causes calls into runtime
           // that are interruptible
-          if (VM.VerifyUnint && !isInterruptible) forbiddenBytecode("athrow", bcodes.index());
+          if (VM.VerifyUnint && isUninterruptible) forbiddenBytecode("athrow", bcodes.index());
           emit_athrow();
           break;
         }
@@ -1732,7 +1733,7 @@
           if (shouldPrint) asm.noteBytecode(biStart, "monitorenter");
           // Forbidden from uninterruptible code as calls interruptible object model
           // for its implementation
-          if (VM.VerifyUnint && !isInterruptible) forbiddenBytecode("monitorenter", bcodes.index());
+          if (VM.VerifyUnint && isUninterruptible) forbiddenBytecode("monitorenter", bcodes.index());
           emit_monitorenter();
           break;
         }
@@ -1741,7 +1742,7 @@
           if (shouldPrint) asm.noteBytecode(biStart, "monitorexit");
           // Forbidden from uninterruptible code as calls interruptible object model
           // for its implementation
-          if (VM.VerifyUnint && !isInterruptible) forbiddenBytecode("monitorexit", bcodes.index());
+          if (VM.VerifyUnint && isUninterruptible) forbiddenBytecode("monitorexit", bcodes.index());
           emit_monitorexit();
           break;
         }
@@ -2070,6 +2071,7 @@
       // Respect programmer overrides of uninterruptibility checking
       if (method.hasLogicallyUninterruptibleAnnotation()) return;
       if (method.hasUninterruptibleNoWarnAnnotation()) return;
+      if (method.hasUnpreemptibleNoWarnAnnotation()) return;
     }
     // NB generate as a single string to avoid threads splitting output
     VM.sysWriteln("WARNING: UNINTERRUPTIBLE VIOLATION\n   "+ method + " at line " + method.getLineNumberForBCIndex(bci) +
@@ -2087,6 +2089,7 @@
       // Respect programmer overrides of uninterruptibility checking
       if (method.hasLogicallyUninterruptibleAnnotation()) return;
       if (method.hasUninterruptibleNoWarnAnnotation()) return;
+      if (method.hasUnpreemptibleNoWarnAnnotation()) return;
     }
     if (isUninterruptible && !target.isUninterruptible()) {
       // NB generate as a single string to avoid threads splitting output


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[rvm-commits] SF.net SVN: jikesrvm:[15053] rvmroot/trunk/rvm/src/org/jikesrvm/compilers/ baseline/TemplateCompilerFramework.java

From: <captain5050@us...> - 2008-10-06 12:51

Revision: 15053
          http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15053&view=rev
Author:   captain5050
Date:     2008-10-06 12:50:06 +0000 (Mon, 06 Oct 2008)

Log Message:
-----------
Fix typo and improve indentation

Modified Paths:
--------------
    rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java	2008-10-06 12:46:27 UTC (rev 15052)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java	2008-10-06 12:50:06 UTC (rev 15053)
@@ -1864,9 +1864,9 @@
           break;
         }
 
-        /* CAUTION: can not use JBC_impdep1, which is 0xfffffffe ( signed ),
-        * this is not consistant with OPT compiler.
-        */
+        /* CAUTION: cannot use JBC_impdep1, which is 0xfffffffe (signed),
+         * this is not consistent with OPT compiler.
+         */
         case JBC_impdep1: /* --- pseudo bytecode --- */ {
           if (VM.BuildForAdaptiveSystem) {
             int pseudo_opcode = bcodes.nextPseudoInstruction();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[rvm-commits] SF.net SVN: jikesrvm:[15553] rvmroot/trunk/rvm/src/org/jikesrvm/compilers/ baseline/TemplateCompilerFramework.java

From: <steveb-oss@us...> - 2009-03-05 20:19

Revision: 15553
          http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15553&view=rev
Author:   steveb-oss
Date:     2009-03-05 20:19:03 +0000 (Thu, 05 Mar 2009)

Log Message:
-----------
Bug fix from Ellen McKinnon, RVM-800

Modified Paths:
--------------
    rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java	2009-03-05 15:34:49 UTC (rev 15552)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java	2009-03-05 20:19:03 UTC (rev 15553)
@@ -1640,12 +1640,12 @@
               array.resolve();
               array.instantiate();
             }
-            if (array.isInitialized() || array.isInBootImage()) {
-              emit_resolved_newarray(array);
-              break;
-            }
           }
-          emit_unresolved_newarray(arrayRef);
+          if (array != null && (array.isInitialized() || array.isInBootImage())) {
+            emit_resolved_newarray(array);
+          } else {
+            emit_unresolved_newarray(arrayRef);
+          }
           break;
         }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[rvm-commits] SF.net SVN: jikesrvm:[15579] rvmroot/trunk/rvm/src/org/jikesrvm/compilers/ baseline/TemplateCompilerFramework.java

From: <dgrove-oss@us...> - 2009-03-12 04:34

Revision: 15579
          http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15579&view=rev
Author:   dgrove-oss
Date:     2009-03-12 04:34:06 +0000 (Thu, 12 Mar 2009)

Log Message:
-----------
RVM-800. allow baseline compiler to resolve the array ref for newarrary using similar logic as in opt compiler.  There are slight differences due to the way in which we instantiate java.lang.Object, but otherwise I believe the code is now doing the same thing in both compilers.

Modified Paths:
--------------
    rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java

Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java	2009-03-11 03:32:03 UTC (rev 15578)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java	2009-03-12 04:34:06 UTC (rev 15579)
@@ -1629,16 +1629,24 @@
                        "You must use the 'create' function to create an array of this type");
           }
 
-          // We can do early resolution of the array type if the element type
-          // is already initialized.
           RVMArray array = (RVMArray) arrayRef.peekType();
-          if (array != null &&
-              !(array.isInitialized() || array.isInBootImage()) &&
-              RVMType.JavaLangObjectType.isInstantiated()) {
-            RVMType elementType = elementTypeRef.peekType();
-            if (elementType != null && (elementType.isInitialized() || elementType.isInBootImage())) {
-              array.resolve();
-              array.instantiate();
+          if (RVMType.JavaLangObjectType.isInstantiated()) {
+            // If we've already instantiated java.lang.Object, then we can
+            // forcibly fully instantiate the array type as long as the element type is
+            // either already initialized or is in the bootimage.
+            // Note: The test against java.lang.Object is required only for the baseline compiler
+            //       and is not present in the opt compiler version of anewarray (BC2IR) because of the way
+            //       we handle recursive invocations of the compiler (can be caused by instantiate()).
+            //       We need Object to be instantiated because we are going to mine it's TIB to get entries for array methods...
+            if (array == null || !(array.isInitialized() || array.isInBootImage())) {
+              RVMType elementType = elementTypeRef.peekType();
+              if (elementType != null && (elementType.isInitialized() || elementType.isInBootImage())) {
+                if (array == null) {
+                  array = (RVMArray)arrayRef.resolve();
+                }
+                array.resolve();
+                array.instantiate();
+              }
             }
           }
           if (array != null && (array.isInitialized() || array.isInBootImage())) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.