From: <pet...@us...> - 2007-03-26 02:28:37
|
Revision: 11899 http://svn.sourceforge.net/jikesrvm/?rev=11899&view=rev Author: peter_donald Date: 2007-03-25 19:28:34 -0700 (Sun, 25 Mar 2007) Log Message: ----------- Fix bug introduced in r11898 Modified Paths: -------------- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java =================================================================== --- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-03-25 11:37:01 UTC (rev 11898) +++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-03-26 02:28:34 UTC (rev 11899) @@ -126,7 +126,7 @@ public static final VM_TypeReference JavaLangIllegalMonitorStateException = findOrCreate("Ljava/lang/IllegalMonitorStateException;"); - public static final VM_TypeReference VM_Processor = findOrCreate("Lorg/jikesrvm/VM_Processor;"); + public static final VM_TypeReference VM_Processor = findOrCreate("Lorg/jikesrvm/scheduler/VM_Processor;"); public static final VM_TypeReference VM_Type = findOrCreate("Lorg/jikesrvm/classloader/VM_Type;"); public static final VM_TypeReference VM_Class = findOrCreate("Lorg/jikesrvm/classloader/VM_Class;"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cap...@us...> - 2007-04-02 09:33:20
|
Revision: 11985 http://svn.sourceforge.net/jikesrvm/?rev=11985&view=rev Author: captain5050 Date: 2007-04-02 02:32:27 -0700 (Mon, 02 Apr 2007) Log Message: ----------- Fix package name following recent changes Modified Paths: -------------- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java =================================================================== --- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-02 09:03:22 UTC (rev 11984) +++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-02 09:32:27 UTC (rev 11985) @@ -159,7 +159,7 @@ // Synthetic types used by the opt compiler public static final VM_TypeReference NULL_TYPE = (VM.BuildForOptCompiler) ? findOrCreate("Lorg/jikesrvm/classloader/VM_TypeReference$NULL;") : null; public static final VM_TypeReference VALIDATION_TYPE = (VM.BuildForOptCompiler) ? findOrCreate("Lorg/jikesrvm/classloader/VM_TypeReference$VALIDATION;") : null; - public static final VM_TypeReference VM_ExceptionTable = (VM.BuildForOptCompiler) ? findOrCreate("Lorg/jikesrvm/VM_ExceptionTable;") : null; + public static final VM_TypeReference VM_ExceptionTable = (VM.BuildForOptCompiler) ? findOrCreate("Lorg/jikesrvm/compilers/common/VM_ExceptionTable;") : null; public static final VM_TypeReference OPT_OptimizationPlanner = (VM.BuildForAdaptiveSystem) ? findOrCreate("Lorg/jikesrvm/compilers/opt/OPT_OptimizationPlanner;") : null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cap...@us...> - 2007-04-02 10:20:06
|
Revision: 11986 http://svn.sourceforge.net/jikesrvm/?rev=11986&view=rev Author: captain5050 Date: 2007-04-02 03:19:59 -0700 (Mon, 02 Apr 2007) Log Message: ----------- Switch from using strings to classes for findOrCreate (this should aid debugging when classes and packages are renamed) Modified Paths: -------------- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java =================================================================== --- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-02 09:32:27 UTC (rev 11985) +++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-02 10:19:59 UTC (rev 11986) @@ -92,76 +92,77 @@ public static final VM_TypeReference FloatArray = findOrCreate("[F"); public static final VM_TypeReference DoubleArray = findOrCreate("[D"); - public static final VM_TypeReference Word = findOrCreate("Lorg/vmmagic/unboxed/Word;"); - public static final VM_TypeReference Address = findOrCreate("Lorg/vmmagic/unboxed/Address;"); - public static final VM_TypeReference ObjectReference = findOrCreate("Lorg/vmmagic/unboxed/ObjectReference;"); - public static final VM_TypeReference Offset = findOrCreate("Lorg/vmmagic/unboxed/Offset;"); - public static final VM_TypeReference Extent = findOrCreate("Lorg/vmmagic/unboxed/Extent;"); + public static final VM_TypeReference Word = findOrCreate(org.vmmagic.unboxed.Word.class); + public static final VM_TypeReference Address = findOrCreate(org.vmmagic.unboxed.Address.class); + public static final VM_TypeReference ObjectReference = findOrCreate(org.vmmagic.unboxed.ObjectReference.class); + public static final VM_TypeReference Offset = findOrCreate(org.vmmagic.unboxed.Offset.class); + public static final VM_TypeReference Extent = findOrCreate(org.vmmagic.unboxed.Extent.class); public static final VM_TypeReference Code = findOrCreate(VM.BuildForIA32 ? "Lorg/jikesrvm/ia32/VM_Code;":"Lorg/jikesrvm/ppc/VM_Code;"); - public static final VM_TypeReference WordArray = findOrCreate("Lorg/vmmagic/unboxed/WordArray;"); - public static final VM_TypeReference AddressArray = findOrCreate("Lorg/vmmagic/unboxed/AddressArray;"); - public static final VM_TypeReference ObjectReferenceArray = findOrCreate("Lorg/vmmagic/unboxed/ObjectReferenceArray;"); - public static final VM_TypeReference OffsetArray = findOrCreate("Lorg/vmmagic/unboxed/OffsetArray;"); - public static final VM_TypeReference ExtentArray = findOrCreate("Lorg/vmmagic/unboxed/ExtentArray;"); - public static final VM_TypeReference CodeArray = findOrCreate("Lorg/jikesrvm/ArchitectureSpecific$VM_CodeArray;"); - public static final VM_TypeReference Magic = findOrCreate("Lorg/jikesrvm/runtime/VM_Magic;"); - public static final VM_TypeReference SysCall = findOrCreate("Lorg/vmmagic/pragma/SysCall;"); + public static final VM_TypeReference WordArray = findOrCreate(org.vmmagic.unboxed.WordArray.class); + public static final VM_TypeReference AddressArray = findOrCreate(org.vmmagic.unboxed.AddressArray.class); + public static final VM_TypeReference ObjectReferenceArray = findOrCreate(org.vmmagic.unboxed.ObjectReferenceArray.class); + public static final VM_TypeReference OffsetArray = findOrCreate(org.vmmagic.unboxed.OffsetArray.class); + public static final VM_TypeReference ExtentArray = findOrCreate(org.vmmagic.unboxed.ExtentArray.class); + public static final VM_TypeReference CodeArray = findOrCreate(org.jikesrvm.ArchitectureSpecific.VM_CodeArray.class); + public static final VM_TypeReference Magic = findOrCreate(org.jikesrvm.runtime.VM_Magic.class); + public static final VM_TypeReference SysCall = findOrCreate(org.vmmagic.pragma.SysCall.class); - public static final VM_TypeReference JavaLangObject = findOrCreate("Ljava/lang/Object;"); - public static final VM_TypeReference JavaLangClass = findOrCreate("Ljava/lang/Class;"); - public static final VM_TypeReference JavaLangString = findOrCreate("Ljava/lang/String;"); - public static final VM_TypeReference JavaLangCloneable = findOrCreate("Ljava/lang/Cloneable;"); - public static final VM_TypeReference JavaIoSerializable = findOrCreate("Ljava/io/Serializable;"); + public static final VM_TypeReference JavaLangObject = findOrCreate(java.lang.Object.class); + public static final VM_TypeReference JavaLangClass = findOrCreate(java.lang.Class.class); + public static final VM_TypeReference JavaLangString = findOrCreate(java.lang.String.class); + public static final VM_TypeReference JavaLangCloneable = findOrCreate(java.lang.Cloneable.class); + public static final VM_TypeReference JavaIoSerializable = findOrCreate(java.io.Serializable.class); - public static final VM_TypeReference JavaLangObjectArray = findOrCreate("[Ljava/lang/Object;"); + public static final VM_TypeReference JavaLangObjectArray = findOrCreate(java.lang.Object[].class); - public static final VM_TypeReference JavaLangThrowable = findOrCreate("Ljava/lang/Throwable;"); - public static final VM_TypeReference JavaLangError = findOrCreate("Ljava/lang/Error;"); - public static final VM_TypeReference JavaLangNullPointerException = findOrCreate("Ljava/lang/NullPointerException;"); - public static final VM_TypeReference JavaLangArrayIndexOutOfBoundsException = findOrCreate("Ljava/lang/ArrayIndexOutOfBoundsException;"); - public static final VM_TypeReference JavaLangArithmeticException = findOrCreate("Ljava/lang/ArithmeticException;"); - public static final VM_TypeReference JavaLangArrayStoreException = findOrCreate("Ljava/lang/ArrayStoreException;"); - public static final VM_TypeReference JavaLangClassCastException = findOrCreate("Ljava/lang/ClassCastException;"); - public static final VM_TypeReference JavaLangNegativeArraySizeException = findOrCreate("Ljava/lang/NegativeArraySizeException;"); - public static final VM_TypeReference JavaLangIllegalMonitorStateException = findOrCreate("Ljava/lang/IllegalMonitorStateException;"); + public static final VM_TypeReference JavaLangThrowable = findOrCreate(java.lang.Throwable.class); + public static final VM_TypeReference JavaLangError = findOrCreate(java.lang.Error.class); + public static final VM_TypeReference JavaLangNullPointerException = findOrCreate(java.lang.NullPointerException.class); + public static final VM_TypeReference JavaLangArrayIndexOutOfBoundsException = findOrCreate(java.lang.ArrayIndexOutOfBoundsException.class); + public static final VM_TypeReference JavaLangArithmeticException = findOrCreate(java.lang.ArithmeticException.class); + public static final VM_TypeReference JavaLangArrayStoreException = findOrCreate(java.lang.ArrayStoreException.class); + public static final VM_TypeReference JavaLangClassCastException = findOrCreate(java.lang.ClassCastException.class); + public static final VM_TypeReference JavaLangNegativeArraySizeException = findOrCreate(java.lang.NegativeArraySizeException.class); + public static final VM_TypeReference JavaLangIllegalMonitorStateException = findOrCreate(java.lang.IllegalMonitorStateException.class); - public static final VM_TypeReference VM_Processor = findOrCreate("Lorg/jikesrvm/scheduler/VM_Processor;"); - public static final VM_TypeReference VM_Type = findOrCreate("Lorg/jikesrvm/classloader/VM_Type;"); - public static final VM_TypeReference VM_Class = findOrCreate("Lorg/jikesrvm/classloader/VM_Class;"); + public static final VM_TypeReference VM_Processor = findOrCreate(org.jikesrvm.scheduler.VM_Processor.class); + public static final VM_TypeReference VM_Type = findOrCreate(org.jikesrvm.classloader.VM_Type.class); + public static final VM_TypeReference VM_Class = findOrCreate(org.jikesrvm.classloader.VM_Class.class); - public static final VM_TypeReference NativeBridge = findOrCreate("Lorg/vmmagic/pragma/NativeBridge;"); - public static final VM_TypeReference DynamicBridge = findOrCreate("Lorg/vmmagic/pragma/DynamicBridge;"); - public static final VM_TypeReference SynchronizedObject = findOrCreate("Lorg/vmmagic/pragma/SynchronizedObject;"); - public static final VM_TypeReference SaveVolatile = findOrCreate("Lorg/vmmagic/pragma/SaveVolatile;"); - public static final VM_TypeReference Interruptible = findOrCreate("Lorg/vmmagic/pragma/Interruptible;"); - public static final VM_TypeReference LogicallyUninterruptible = findOrCreate("Lorg/vmmagic/pragma/LogicallyUninterruptible;"); - public static final VM_TypeReference NoOptCompile = findOrCreate("Lorg/vmmagic/pragma/NoOptCompile;"); - public static final VM_TypeReference Preemptible = findOrCreate("Lorg/vmmagic/pragma/Preemptible;"); - public static final VM_TypeReference UninterruptibleNoWarn = findOrCreate("Lorg/vmmagic/pragma/UninterruptibleNoWarn;"); - public static final VM_TypeReference Uninterruptible = findOrCreate("Lorg/vmmagic/pragma/Uninterruptible;"); - public static final VM_TypeReference Unpreemptible = findOrCreate("Lorg/vmmagic/pragma/Unpreemptible;"); - public static final VM_TypeReference Inline = findOrCreate("Lorg/vmmagic/pragma/Inline;"); - public static final VM_TypeReference NoInline = findOrCreate("Lorg/vmmagic/pragma/NoInline;"); + public static final VM_TypeReference NativeBridge = findOrCreate(org.vmmagic.pragma.NativeBridge.class); + public static final VM_TypeReference DynamicBridge = findOrCreate(org.vmmagic.pragma.DynamicBridge.class); + public static final VM_TypeReference SynchronizedObject = findOrCreate(org.vmmagic.pragma.SynchronizedObject.class); + public static final VM_TypeReference SaveVolatile = findOrCreate(org.vmmagic.pragma.SaveVolatile.class); + public static final VM_TypeReference Interruptible = findOrCreate(org.vmmagic.pragma.Interruptible.class); + public static final VM_TypeReference LogicallyUninterruptible = findOrCreate(org.vmmagic.pragma.LogicallyUninterruptible.class); + public static final VM_TypeReference NoOptCompile = findOrCreate(org.vmmagic.pragma.NoOptCompile.class); + public static final VM_TypeReference Preemptible = findOrCreate(org.vmmagic.pragma.Preemptible.class); + public static final VM_TypeReference UninterruptibleNoWarn = findOrCreate(org.vmmagic.pragma.UninterruptibleNoWarn.class); + public static final VM_TypeReference Uninterruptible = findOrCreate(org.vmmagic.pragma.Uninterruptible.class); + public static final VM_TypeReference Unpreemptible = findOrCreate(org.vmmagic.pragma.Unpreemptible.class); + public static final VM_TypeReference Inline = findOrCreate(org.vmmagic.pragma.Inline.class); + public static final VM_TypeReference NoInline = findOrCreate(org.vmmagic.pragma.NoInline.class); public static final VM_TypeReference BaselineNoRegisters = - VM.BuildForIA32 ? null : findOrCreate("Lorg/vmmagic/pragma/BaselineNoRegisters;"); + VM.BuildForIA32 ? null : findOrCreate(org.vmmagic.pragma.BaselineNoRegisters.class); public static final VM_TypeReference BaselineSaveLSRegisters = - VM.BuildForIA32 ? null : findOrCreate("Lorg/vmmagic/pragma/BaselineSaveLSRegisters;"); + VM.BuildForIA32 ? null : findOrCreate(org.vmmagic.pragma.BaselineSaveLSRegisters.class); - public static final VM_TypeReference VM_BaseAnnotation = findOrCreate("Lorg/jikesrvm/classloader/VM_Annotation$BaseAnnotation;"); - public static final VM_TypeReference VM_ReferenceMaps = findOrCreate("Lorg/jikesrvm/compilers/baseline/VM_ReferenceMaps;"); - public static final VM_TypeReference VM_JNIFunctions = findOrCreate("Lorg/jikesrvm/jni/VM_JNIFunctions;"); + public static final VM_TypeReference VM_BaseAnnotation = findOrCreate(org.jikesrvm.classloader.VM_Annotation.BaseAnnotation.class); + public static final VM_TypeReference VM_ReferenceMaps = findOrCreate(org.jikesrvm.compilers.baseline.VM_ReferenceMaps.class); + public static final VM_TypeReference VM_JNIFunctions = findOrCreate(org.jikesrvm.jni.VM_JNIFunctions.class); - public static final VM_TypeReference VM_CollectorThread = findOrCreate("Lorg/jikesrvm/memorymanagers/mminterface/VM_CollectorThread;"); + public static final VM_TypeReference VM_CollectorThread = findOrCreate(org.jikesrvm.memorymanagers.mminterface.VM_CollectorThread.class); - public static final VM_TypeReference VM_Array = findOrCreate("Lorg/jikesrvm/classloader/VM_Array;"); + public static final VM_TypeReference VM_Array = findOrCreate(org.jikesrvm.classloader.VM_Array.class); // Synthetic types used by the opt compiler public static final VM_TypeReference NULL_TYPE = (VM.BuildForOptCompiler) ? findOrCreate("Lorg/jikesrvm/classloader/VM_TypeReference$NULL;") : null; public static final VM_TypeReference VALIDATION_TYPE = (VM.BuildForOptCompiler) ? findOrCreate("Lorg/jikesrvm/classloader/VM_TypeReference$VALIDATION;") : null; - public static final VM_TypeReference VM_ExceptionTable = (VM.BuildForOptCompiler) ? findOrCreate("Lorg/jikesrvm/compilers/common/VM_ExceptionTable;") : null; + + public static final VM_TypeReference VM_ExceptionTable = (VM.BuildForOptCompiler) ? findOrCreate(org.jikesrvm.compilers.common.VM_ExceptionTable.class) : null; - public static final VM_TypeReference OPT_OptimizationPlanner = (VM.BuildForAdaptiveSystem) ? findOrCreate("Lorg/jikesrvm/compilers/opt/OPT_OptimizationPlanner;") : null; + public static final VM_TypeReference OPT_OptimizationPlanner = (VM.BuildForAdaptiveSystem) ? findOrCreate(org.jikesrvm.compilers.opt.OPT_OptimizationPlanner.class) : null; /** * Hash value based on name, used for canonical type dictionary This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-04-02 23:20:49
|
Revision: 11995 http://svn.sourceforge.net/jikesrvm/?rev=11995&view=rev Author: peter_donald Date: 2007-04-02 16:20:48 -0700 (Mon, 02 Apr 2007) Log Message: ----------- Remove comment that should no longer be relevant Modified Paths: -------------- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java =================================================================== --- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-02 23:20:15 UTC (rev 11994) +++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-02 23:20:48 UTC (rev 11995) @@ -624,8 +624,7 @@ } /** - * Has the type reference already been resolved into a type? NB this can - * return true when a type itself isn't resolved during the bootstrap + * Has the type reference already been resolved into a type? */ @Uninterruptible public boolean isResolved() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-04-28 03:13:34
|
Revision: 12064 http://svn.sourceforge.net/jikesrvm/?rev=12064&view=rev Author: peter_donald Date: 2007-04-27 20:13:32 -0700 (Fri, 27 Apr 2007) Log Message: ----------- It seems that ObjectReference was accidently alided from list of WordTypes. I assume that it should be present Modified Paths: -------------- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java =================================================================== --- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-28 03:09:56 UTC (rev 12063) +++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-28 03:13:32 UTC (rev 12064) @@ -449,7 +449,7 @@ */ @Uninterruptible public boolean isWordType() { - return this == Word || this == Offset || this == Address || this == Extent; + return this == Word || this == Offset || this == Address || this == Extent || this == ObjectReference; } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Steve B. <Ste...@an...> - 2007-04-28 03:28:41
|
Hi Peter, I'm sure others will correct me if I'm wrong... . ObjectReference is an abstract, VM-neutral notion of an object reference (something like java.lang.Object) . Address is akin to void* (an untyped pointer into memory) . Word is arch-width unsigned int We use Address when we don't want the reference to be traced (it's untyped, and may be raw memory). We use ObjectReference when we want to talk about a user java.lang.Object (rather than a VM source code java lang object). Moreover MMTk is user-language neutral, so it need not in fact be java.lang.Object, but the equivalent in C# etc etc. ObjectReference also abstracts over the referencing mechanism (eg the VM could, for example, use handles and in that case an ObjectReference would be concretely a handle, while Address remains a memory pointer under all circumstances). So without having the opportunity for a careful look, I'd say ObjectReference may very well ahve been left out intentionally in that instance, and putting it back in is probably a mistake. --Steve On 28/04/2007, at 1:13 PM, pet...@us... wrote: > Revision: 12064 > http://svn.sourceforge.net/jikesrvm/?rev=12064&view=rev > Author: peter_donald > Date: 2007-04-27 20:13:32 -0700 (Fri, 27 Apr 2007) > > Log Message: > ----------- > It seems that ObjectReference was accidently alided from list of > WordTypes. I assume that it should be present > > Modified Paths: > -------------- > rvmroot/trunk/rvm/src/org/jikesrvm/classloader/ > VM_TypeReference.java > > Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/ > VM_TypeReference.java > =================================================================== > --- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/ > VM_TypeReference.java 2007-04-28 03:09:56 UTC (rev 12063) > +++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/ > VM_TypeReference.java 2007-04-28 03:13:32 UTC (rev 12064) > @@ -449,7 +449,7 @@ > */ > @Uninterruptible > public boolean isWordType() { > - return this == Word || this == Offset || this == Address || > this == Extent; > + return this == Word || this == Offset || this == Address || > this == Extent || this == ObjectReference; > } > > /** > > > This was sent by the SourceForge.net collaborative development > platform, the world's largest Open Source development site. > > ---------------------------------------------------------------------- > --- > This SF.net email is sponsored by DB2 Express > Download DB2 Express C - the FREE version of DB2 express and take > control of your XML. No limits. Just data. Click to get it now. > http://sourceforge.net/powerbar/db2/ > _______________________________________________ > Jikesrvm-commits mailing list > Jik...@li... > https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits |
From: <pet...@us...> - 2007-04-28 03:14:46
|
Revision: 12065 http://svn.sourceforge.net/jikesrvm/?rev=12065&view=rev Author: peter_donald Date: 2007-04-27 20:14:45 -0700 (Fri, 27 Apr 2007) Log Message: ----------- Object references are unboxed types so no neeed to add extra test for them Modified Paths: -------------- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java =================================================================== --- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-28 03:13:32 UTC (rev 12064) +++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-28 03:14:45 UTC (rev 12065) @@ -496,9 +496,7 @@ * Does 'this' refer to VM_Magic? */ public boolean isMagicType() { - return this == Magic - || this == ObjectReference || this == ObjectReferenceArray - || isUnboxedType() || isUnboxedArrayType(); + return this == Magic || isUnboxedType() || isUnboxedArrayType(); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-04-28 03:15:20
|
Revision: 12066 http://svn.sourceforge.net/jikesrvm/?rev=12066&view=rev Author: peter_donald Date: 2007-04-27 20:15:18 -0700 (Fri, 27 Apr 2007) Log Message: ----------- Use accessor rather thant testing field directly Modified Paths: -------------- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java =================================================================== --- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-28 03:14:45 UTC (rev 12065) +++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-28 03:15:18 UTC (rev 12066) @@ -481,7 +481,7 @@ */ @Uninterruptible boolean isUnboxedArrayType() { - return isWordArrayType() || this == CodeArray; + return isWordArrayType() || isCodeArrayType(); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-04-28 03:20:25
|
Revision: 12068 http://svn.sourceforge.net/jikesrvm/?rev=12068&view=rev Author: peter_donald Date: 2007-04-27 20:20:24 -0700 (Fri, 27 Apr 2007) Log Message: ----------- Revert incorect change Modified Paths: -------------- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java =================================================================== --- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-28 03:19:00 UTC (rev 12067) +++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-28 03:20:24 UTC (rev 12068) @@ -341,7 +341,7 @@ public VM_TypeReference getArrayElementType() { if (VM.VerifyAssertions) VM._assert(isArrayType()); - if (isUnboxedArrayType()) { + if (isWordArrayType()) { if (this == AddressArray) { return Address; } else if (this == ObjectReferenceArray) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-04-28 03:21:26
|
Revision: 12069 http://svn.sourceforge.net/jikesrvm/?rev=12069&view=rev Author: peter_donald Date: 2007-04-27 20:21:21 -0700 (Fri, 27 Apr 2007) Log Message: ----------- minor logic cleanup Modified Paths: -------------- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java =================================================================== --- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-28 03:20:24 UTC (rev 12068) +++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-28 03:21:21 UTC (rev 12069) @@ -341,7 +341,7 @@ public VM_TypeReference getArrayElementType() { if (VM.VerifyAssertions) VM._assert(isArrayType()); - if (isWordArrayType()) { + if (isUnboxedArrayType()) { if (this == AddressArray) { return Address; } else if (this == ObjectReferenceArray) { @@ -352,12 +352,12 @@ return Offset; } else if (this == ExtentArray) { return Extent; + } else if (this == CodeArray) { + return Code; } else { if (VM.VerifyAssertions) VM._assert(false, "Unexpected case of Magic arrays!"); return null; } - } else if (isCodeArrayType()) { - return Code; } else { return findOrCreate(classloader, name.parseForArrayElementDescriptor()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-04-28 04:40:28
|
Revision: 12072 http://svn.sourceforge.net/jikesrvm/?rev=12072&view=rev Author: peter_donald Date: 2007-04-27 21:40:22 -0700 (Fri, 27 Apr 2007) Log Message: ----------- Revert r12064 until the impact of the change can be evaluated. Modified Paths: -------------- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java =================================================================== --- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-28 04:07:50 UTC (rev 12071) +++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-28 04:40:22 UTC (rev 12072) @@ -449,7 +449,7 @@ */ @Uninterruptible public boolean isWordType() { - return this == Word || this == Offset || this == Address || this == Extent || this == ObjectReference; + return this == Word || this == Offset || this == Address || this == Extent; } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pet...@us...> - 2007-04-28 05:47:37
|
Revision: 12074 http://svn.sourceforge.net/jikesrvm/?rev=12074&view=rev Author: peter_donald Date: 2007-04-27 22:47:35 -0700 (Fri, 27 Apr 2007) Log Message: ----------- Revert another change so to fix the build and restore previous behaviour Modified Paths: -------------- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java =================================================================== --- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-28 05:25:34 UTC (rev 12073) +++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-04-28 05:47:35 UTC (rev 12074) @@ -496,7 +496,7 @@ * Does 'this' refer to VM_Magic? */ public boolean isMagicType() { - return this == Magic || isUnboxedType() || isUnboxedArrayType(); + return this == Magic || isUnboxedType() || isUnboxedArrayType() || this == ObjectReference; } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cap...@us...> - 2007-08-10 15:12:49
|
Revision: 13263 http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=13263&view=rev Author: captain5050 Date: 2007-08-10 08:12:46 -0700 (Fri, 10 Aug 2007) Log Message: ----------- Remove old comment Modified Paths: -------------- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java Modified: rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java =================================================================== --- rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-08-10 15:12:10 UTC (rev 13262) +++ rvmroot/trunk/rvm/src/org/jikesrvm/classloader/VM_TypeReference.java 2007-08-10 15:12:46 UTC (rev 13263) @@ -32,10 +32,6 @@ * Resolving a VM_TypeReference to a VM_Type can * be an expensive operation. Therefore we canonicalize * VM_TypeReference instances and cache the result of resolution. - * <p> - * It is officially illegal (as of July 31, 2003) - * to create a VM_TypeReference for a string that would not be syntactically - * valid in a class file. --Steven Augart */ public final class VM_TypeReference { /** @@ -256,7 +252,7 @@ /** * Convert a java.lang.Class into a type reference the slow way. For * use in boot image writing - * @param klass java.lang.Class to convert to typereference + * @param klass java.lang.Class to convert to type reference */ public static VM_TypeReference findOrCreate(Class<?> klass) { if (VM.runningVM) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |