Menu
▾
▴
[rvm-commits] code: 4 new changesets
|
From: <jik...@li...> - 2014-07-17 17:31:28
|
details: http://hg.code.sourceforge.net/p/jikesrvm/code/rev/994cb4a214d1 changeset: 10790:994cb4a214d1 user: Erik Brangs <eri...@gm...> date: Thu Jul 17 12:55:47 2014 +0200 description: RVM-1079 : Convert HeapLayoutConstants to a class. details: http://hg.code.sourceforge.net/p/jikesrvm/code/rev/e38e75e13000 changeset: 10791:e38e75e13000 user: Erik Brangs <eri...@gm...> date: Thu Jul 17 13:10:01 2014 +0200 description: RVM-1079 : Convert OptConstants to a class. details: http://hg.code.sourceforge.net/p/jikesrvm/code/rev/afd7100d8435 changeset: 10792:afd7100d8435 user: Erik Brangs <eri...@gm...> date: Thu Jul 17 15:15:26 2014 +0200 description: RVM-1079 : Convert OSRConstants to a class. details: http://hg.code.sourceforge.net/p/jikesrvm/code/rev/008c936b1d17 changeset: 10793:008c936b1d17 user: Erik Brangs <eri...@gm...> date: Thu Jul 17 18:42:28 2014 +0200 description: RVM-1079 : Convert SizeConstants to a class. diffstat: MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java | 5 +- MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/FinalizableProcessor.java | 5 +- MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Memory.java | 7 +- MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanThread.java | 8 +- rvm/src-generated/vm-configuration/HeapLayoutConstants.template | 31 +- rvm/src/org/jikesrvm/Constants.java | 4 +- rvm/src/org/jikesrvm/Services.java | 6 +- rvm/src/org/jikesrvm/SizeConstants.java | 111 +++++---- rvm/src/org/jikesrvm/VM.java | 3 + rvm/src/org/jikesrvm/adaptive/measurements/instrumentation/CounterArrayManager.java | 7 +- rvm/src/org/jikesrvm/classloader/BytecodeStream.java | 6 +- rvm/src/org/jikesrvm/classloader/ClassFileReader.java | 4 + rvm/src/org/jikesrvm/classloader/FieldReference.java | 3 +- rvm/src/org/jikesrvm/classloader/InterfaceInvocation.java | 4 +- rvm/src/org/jikesrvm/classloader/InterfaceMethodSignature.java | 4 +- rvm/src/org/jikesrvm/classloader/NativeMethod.java | 2 + rvm/src/org/jikesrvm/classloader/NormalMethod.java | 1 + rvm/src/org/jikesrvm/classloader/Primitive.java | 8 + rvm/src/org/jikesrvm/classloader/RVMArray.java | 10 +- rvm/src/org/jikesrvm/classloader/RVMClass.java | 6 +- rvm/src/org/jikesrvm/classloader/RVMMethod.java | 1 + rvm/src/org/jikesrvm/classloader/RVMType.java | 9 +- rvm/src/org/jikesrvm/classloader/UnboxedType.java | 4 + rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiledMethod.java | 6 +- rvm/src/org/jikesrvm/compilers/baseline/BaselineCompiler.java | 4 +- rvm/src/org/jikesrvm/compilers/baseline/TemplateCompilerFramework.java | 3 +- rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineCompilerImpl.java | 5 +- rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineExceptionDeliverer.java | 2 + rvm/src/org/jikesrvm/compilers/baseline/ia32/BaselineGCMapIterator.java | 2 + rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java | 10 + rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineExceptionDeliverer.java | 3 + rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineGCMapIterator.java | 6 + rvm/src/org/jikesrvm/compilers/common/CompiledMethod.java | 3 +- rvm/src/org/jikesrvm/compilers/common/CompiledMethods.java | 7 +- rvm/src/org/jikesrvm/compilers/common/HardwareTrapGCMapIterator.java | 5 +- rvm/src/org/jikesrvm/compilers/opt/ClassLoaderProxy.java | 11 +- rvm/src/org/jikesrvm/compilers/opt/StaticFieldReader.java | 4 +- rvm/src/org/jikesrvm/compilers/opt/bc2ir/BBSet.java | 6 +- rvm/src/org/jikesrvm/compilers/opt/bc2ir/BC2IR.java | 14 +- rvm/src/org/jikesrvm/compilers/opt/bc2ir/GenerationContext.java | 14 +- rvm/src/org/jikesrvm/compilers/opt/bc2ir/HandlerBlockLE.java | 6 +- rvm/src/org/jikesrvm/compilers/opt/driver/OptConstants.java | 44 ++- rvm/src/org/jikesrvm/compilers/opt/inlining/InlineTools.java | 3 +- rvm/src/org/jikesrvm/compilers/opt/ir/Instruction.java | 9 +- rvm/src/org/jikesrvm/compilers/opt/ir/operand/DoubleConstantOperand.java | 3 +- rvm/src/org/jikesrvm/compilers/opt/ir/operand/FloatConstantOperand.java | 3 +- rvm/src/org/jikesrvm/compilers/opt/ir/operand/LocationOperand.java | 6 +- rvm/src/org/jikesrvm/compilers/opt/ir/ppc/PhysicalRegisterSet.java | 3 + rvm/src/org/jikesrvm/compilers/opt/lir2mir/ppc/BURS_Helpers.java | 5 + rvm/src/org/jikesrvm/compilers/opt/regalloc/GenericStackManager.java | 2 +- rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/CallingConvention.java | 10 +- rvm/src/org/jikesrvm/compilers/opt/regalloc/ppc/StackManager.java | 8 +- rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptGenericGCMapIterator.java | 6 +- rvm/src/org/jikesrvm/compilers/opt/runtimesupport/OptMachineCodeMap.java | 15 +- rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ia32/OptGCMapIterator.java | 5 +- rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptExceptionDeliverer.java | 3 + rvm/src/org/jikesrvm/compilers/opt/runtimesupport/ppc/OptGCMapIterator.java | 2 + rvm/src/org/jikesrvm/ia32/OutOfLineMachineCode.java | 8 +- rvm/src/org/jikesrvm/jni/JNIEnvironment.java | 8 +- rvm/src/org/jikesrvm/jni/JNIFunctions.java | 27 +- rvm/src/org/jikesrvm/jni/ia32/JNIGCMapIterator.java | 3 + rvm/src/org/jikesrvm/jni/ppc/JNICompiler.java | 7 + rvm/src/org/jikesrvm/jni/ppc/JNIGCMapIterator.java | 3 + rvm/src/org/jikesrvm/jni/ppc/JNIHelpers.java | 11 + rvm/src/org/jikesrvm/jni/ppc/JNIStackframeLayoutConstants.java | 3 + rvm/src/org/jikesrvm/mm/mminterface/Barriers.java | 39 +- rvm/src/org/jikesrvm/mm/mminterface/DebugUtil.java | 5 + rvm/src/org/jikesrvm/mm/mminterface/GCMapIteratorGroup.java | 5 +- rvm/src/org/jikesrvm/mm/mminterface/HandInlinedScanning.java | 13 +- rvm/src/org/jikesrvm/mm/mminterface/MemoryManager.java | 10 +- rvm/src/org/jikesrvm/mm/mminterface/MemoryManagerConstants.java | 4 +- rvm/src/org/jikesrvm/mm/mminterface/SpecializedScanMethod.java | 4 +- rvm/src/org/jikesrvm/objectmodel/FieldLayout.java | 6 +- rvm/src/org/jikesrvm/objectmodel/FieldLayoutContext.java | 7 +- rvm/src/org/jikesrvm/objectmodel/FieldLayoutPacked.java | 5 +- rvm/src/org/jikesrvm/objectmodel/FieldLayoutUnpacked.java | 18 +- rvm/src/org/jikesrvm/objectmodel/MiscHeader.java | 2 + rvm/src/org/jikesrvm/objectmodel/ObjectModel.java | 4 +- rvm/src/org/jikesrvm/objectmodel/TIB.java | 7 +- rvm/src/org/jikesrvm/options/OptionSet.java | 13 +- rvm/src/org/jikesrvm/osr/BytecodeTraverser.java | 13 +- rvm/src/org/jikesrvm/osr/EncodedOSRMap.java | 3 +- rvm/src/org/jikesrvm/osr/ExecutionState.java | 19 +- rvm/src/org/jikesrvm/osr/LocalRegPair.java | 3 +- rvm/src/org/jikesrvm/osr/OSRConstants.java | 108 +++++---- rvm/src/org/jikesrvm/osr/OSRMapIterator.java | 12 +- rvm/src/org/jikesrvm/osr/ObjectHolder.java | 5 +- rvm/src/org/jikesrvm/osr/VariableElement.java | 11 +- rvm/src/org/jikesrvm/osr/bytecodes/CheckCast.java | 1 + rvm/src/org/jikesrvm/osr/bytecodes/InvokeCompiledMethod.java | 1 + rvm/src/org/jikesrvm/osr/bytecodes/InvokeStatic.java | 3 + rvm/src/org/jikesrvm/osr/bytecodes/LoadDoubleConst.java | 1 + rvm/src/org/jikesrvm/osr/bytecodes/LoadFloatConst.java | 1 + rvm/src/org/jikesrvm/osr/bytecodes/LoadIntConst.java | 1 + rvm/src/org/jikesrvm/osr/bytecodes/LoadLongConst.java | 1 + rvm/src/org/jikesrvm/osr/bytecodes/LoadRetAddrConst.java | 1 + rvm/src/org/jikesrvm/osr/bytecodes/LoadWordConst.java | 3 + rvm/src/org/jikesrvm/osr/bytecodes/ParamInitEnd.java | 1 + rvm/src/org/jikesrvm/osr/bytecodes/PseudoBytecode.java | 6 +- rvm/src/org/jikesrvm/osr/ia32/BaselineExecutionStateExtractor.java | 17 +- rvm/src/org/jikesrvm/osr/ia32/OptExecutionStateExtractor.java | 22 +- rvm/src/org/jikesrvm/osr/ppc/BaselineExecutionStateExtractor.java | 19 +- rvm/src/org/jikesrvm/osr/ppc/CodeInstaller.java | 3 + rvm/src/org/jikesrvm/osr/ppc/OptExecutionStateExtractor.java | 21 +- rvm/src/org/jikesrvm/ppc/DynamicLinkerHelper.java | 3 + rvm/src/org/jikesrvm/ppc/MultianewarrayHelper.java | 2 + rvm/src/org/jikesrvm/ppc/OutOfLineMachineCode.java | 4 + rvm/src/org/jikesrvm/ppc/RegisterConstants.java | 3 +- rvm/src/org/jikesrvm/runtime/Reflection.java | 1 + rvm/src/org/jikesrvm/runtime/RuntimeEntrypoints.java | 12 +- rvm/src/org/jikesrvm/runtime/Statics.java | 9 +- tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImage.java | 5 +- tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/Address.java | 3 +- tools/bootImageWriter/vmmagic/src/org/vmmagic/unboxed/ObjectReference.java | 3 +- 114 files changed, 679 insertions(+), 341 deletions(-) diffs (truncated from 3111 to 300 lines): diff --git a/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java --- a/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java +++ b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Barriers.java @@ -12,7 +12,8 @@ */ package org.jikesrvm.mm.mmtk; -import org.jikesrvm.SizeConstants; +import static org.jikesrvm.SizeConstants.LOG_BYTES_IN_ADDRESS; + import org.jikesrvm.runtime.Magic; import org.mmtk.vm.VM; @@ -20,7 +21,7 @@ import org.vmmagic.pragma.*; @Uninterruptible -public class Barriers extends org.mmtk.vm.Barriers implements SizeConstants { +public class Barriers extends org.mmtk.vm.Barriers { /** * Perform the actual write of a boolean write barrier. * diff --git a/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/FinalizableProcessor.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/FinalizableProcessor.java --- a/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/FinalizableProcessor.java +++ b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/FinalizableProcessor.java @@ -12,10 +12,11 @@ */ package org.jikesrvm.mm.mmtk; +import static org.jikesrvm.SizeConstants.*; + import org.vmmagic.pragma.*; import org.vmmagic.unboxed.*; -import org.jikesrvm.SizeConstants; import org.jikesrvm.VM; import org.jikesrvm.mm.mminterface.Selected; import org.jikesrvm.runtime.Magic; @@ -28,7 +29,7 @@ * TODO can this be a linked list? */ @Uninterruptible -public final class FinalizableProcessor extends org.mmtk.vm.FinalizableProcessor implements SizeConstants { +public final class FinalizableProcessor extends org.mmtk.vm.FinalizableProcessor { /******************************************************************** * Class fields diff --git a/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Memory.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Memory.java --- a/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Memory.java +++ b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/Memory.java @@ -12,13 +12,16 @@ */ package org.jikesrvm.mm.mmtk; +import static org.jikesrvm.HeapLayoutConstants.BOOT_IMAGE_CODE_END; +import static org.jikesrvm.HeapLayoutConstants.BOOT_IMAGE_DATA_START; +import static org.jikesrvm.HeapLayoutConstants.MAXIMUM_MAPPABLE; + import org.mmtk.policy.ImmortalSpace; import org.mmtk.utility.Constants; import org.mmtk.utility.heap.VMRequest; import org.jikesrvm.VM; import org.jikesrvm.runtime.BootRecord; -import org.jikesrvm.HeapLayoutConstants; import org.jikesrvm.runtime.Magic; import org.jikesrvm.objectmodel.JavaHeader; import org.jikesrvm.SizeConstants; @@ -27,7 +30,7 @@ import org.vmmagic.pragma.*; @Uninterruptible public class Memory extends org.mmtk.vm.Memory - implements Constants, HeapLayoutConstants, SizeConstants { + implements Constants { @Override protected final Address getHeapStartConstant() { return BOOT_IMAGE_DATA_START; } diff --git a/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanThread.java b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanThread.java --- a/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanThread.java +++ b/MMTk/ext/vm/jikesrvm/org/jikesrvm/mm/mmtk/ScanThread.java @@ -12,17 +12,20 @@ */ package org.jikesrvm.mm.mmtk; +import static org.jikesrvm.SizeConstants.BYTES_IN_ADDRESS; + import org.jikesrvm.ArchitectureSpecific; +import org.jikesrvm.ArchitectureSpecific.Registers; +import org.jikesrvm.Constants; import org.jikesrvm.VM; -import org.jikesrvm.Constants; import org.jikesrvm.classloader.RVMMethod; import org.jikesrvm.compilers.common.CompiledMethod; import org.jikesrvm.compilers.common.CompiledMethods; -import org.jikesrvm.mm.mminterface.Selected; import org.jikesrvm.mm.mminterface.DebugUtil; import org.jikesrvm.mm.mminterface.GCMapIterator; import org.jikesrvm.mm.mminterface.GCMapIteratorGroup; import org.jikesrvm.mm.mminterface.MemoryManager; +import org.jikesrvm.mm.mminterface.Selected; import org.jikesrvm.runtime.Magic; import org.jikesrvm.runtime.RuntimeEntrypoints; import org.jikesrvm.scheduler.RVMThread; @@ -35,7 +38,6 @@ import org.vmmagic.unboxed.Address; import org.vmmagic.unboxed.ObjectReference; import org.vmmagic.unboxed.Offset; -import org.jikesrvm.ArchitectureSpecific.Registers; /** * Class that supports scanning thread stacks for references during diff --git a/rvm/src-generated/vm-configuration/HeapLayoutConstants.template b/rvm/src-generated/vm-configuration/HeapLayoutConstants.template --- a/rvm/src-generated/vm-configuration/HeapLayoutConstants.template +++ b/rvm/src-generated/vm-configuration/HeapLayoutConstants.template @@ -17,40 +17,45 @@ /** * Constants defining heap layout constants */ -public interface HeapLayoutConstants { +public final class HeapLayoutConstants { /** The address of the start of the data section of the boot image. */ - Address BOOT_IMAGE_DATA_START = + public static final Address BOOT_IMAGE_DATA_START = Address.@_ADDRESS_METHOD_@( @_BOOTIMAGE_DATA_ADDRESS_@ ); /** The address of the start of the code section of the boot image. */ - Address BOOT_IMAGE_CODE_START = + public static final Address BOOT_IMAGE_CODE_START = Address.@_ADDRESS_METHOD_@( @_BOOTIMAGE_CODE_ADDRESS_@ ); /** The address of the start of the ref map section of the boot image. */ - Address BOOT_IMAGE_RMAP_START = + public static final Address BOOT_IMAGE_RMAP_START = Address.@_ADDRESS_METHOD_@( @_BOOTIMAGE_RMAP_ADDRESS_@ ); /** The address in virtual memory that is the highest that can be mapped. */ - Address MAXIMUM_MAPPABLE = + public static final Address MAXIMUM_MAPPABLE = Address.@_ADDRESS_METHOD_@( @_MAXIMUM_MAPPABLE_ADDRESS_@ ); /** The maximum boot image data size */ - int BOOT_IMAGE_DATA_SIZE = 56<<20; + public static final int BOOT_IMAGE_DATA_SIZE = 56<<20; /** The maximum boot image code size */ - int BOOT_IMAGE_CODE_SIZE = 24<<20; + public static final int BOOT_IMAGE_CODE_SIZE = 24<<20; /* Typical compression ratio is about 1/20 */ - int BAD_MAP_COMPRESSION = 5; // conservative heuristic - int MAX_BOOT_IMAGE_RMAP_SIZE = BOOT_IMAGE_DATA_SIZE/BAD_MAP_COMPRESSION; + public static final int BAD_MAP_COMPRESSION = 5; // conservative heuristic + public static final int MAX_BOOT_IMAGE_RMAP_SIZE = BOOT_IMAGE_DATA_SIZE/BAD_MAP_COMPRESSION; /** The address of the end of the data section of the boot image. */ - Address BOOT_IMAGE_DATA_END = BOOT_IMAGE_DATA_START.plus(BOOT_IMAGE_DATA_SIZE); + public static final Address BOOT_IMAGE_DATA_END = BOOT_IMAGE_DATA_START.plus(BOOT_IMAGE_DATA_SIZE); /** The address of the end of the code section of the boot image. */ - Address BOOT_IMAGE_CODE_END = BOOT_IMAGE_CODE_START.plus(BOOT_IMAGE_CODE_SIZE); + public static final Address BOOT_IMAGE_CODE_END = BOOT_IMAGE_CODE_START.plus(BOOT_IMAGE_CODE_SIZE); /** The address of the end of the ref map section of the boot image. */ - Address BOOT_IMAGE_RMAP_END = BOOT_IMAGE_RMAP_START.plus(MAX_BOOT_IMAGE_RMAP_SIZE); + public static final Address BOOT_IMAGE_RMAP_END = BOOT_IMAGE_RMAP_START.plus(MAX_BOOT_IMAGE_RMAP_SIZE); /** The address of the end of the boot image. */ - Address BOOT_IMAGE_END = BOOT_IMAGE_RMAP_END; + public static final Address BOOT_IMAGE_END = BOOT_IMAGE_RMAP_END; + + private HeapLayoutConstants() { + // prevent instantiation + } + } diff --git a/rvm/src/org/jikesrvm/Constants.java b/rvm/src/org/jikesrvm/Constants.java --- a/rvm/src/org/jikesrvm/Constants.java +++ b/rvm/src/org/jikesrvm/Constants.java @@ -17,9 +17,7 @@ * Some of these constants are architecture-specific * and some are (at the moment) architecture-neutral. */ -public interface Constants extends HeapLayoutConstants, // architecture-neutral - SizeConstants // 'semi-'architecture-neutral -{ +public interface Constants { /** * For assertion checking things that should never happen. */ diff --git a/rvm/src/org/jikesrvm/Services.java b/rvm/src/org/jikesrvm/Services.java --- a/rvm/src/org/jikesrvm/Services.java +++ b/rvm/src/org/jikesrvm/Services.java @@ -12,6 +12,10 @@ */ package org.jikesrvm; +import static org.jikesrvm.SizeConstants.LOG_BYTES_IN_ADDRESS; +import static org.jikesrvm.SizeConstants.LOG_BYTES_IN_CHAR; +import static org.jikesrvm.SizeConstants.LOG_BYTES_IN_INT; + import org.jikesrvm.mm.mminterface.Barriers; import org.jikesrvm.runtime.Entrypoints; import org.jikesrvm.runtime.Magic; @@ -27,7 +31,7 @@ * Various service utilities. This is a common place for some shared utility routines */ @Uninterruptible -public class Services implements SizeConstants { +public class Services { /** * Biggest buffer you would possibly need for {@link org.jikesrvm.scheduler.RVMThread#dump(char[], int)} * Modify this if you modify that method. diff --git a/rvm/src/org/jikesrvm/SizeConstants.java b/rvm/src/org/jikesrvm/SizeConstants.java --- a/rvm/src/org/jikesrvm/SizeConstants.java +++ b/rvm/src/org/jikesrvm/SizeConstants.java @@ -15,70 +15,75 @@ /** * Constants defining the basic sizes of primitive quantities */ -public interface SizeConstants { +public final class SizeConstants { - int LOG_BYTES_IN_BYTE = 0; - int BYTES_IN_BYTE = 1; - int LOG_BITS_IN_BYTE = 3; - int BITS_IN_BYTE = 1 << LOG_BITS_IN_BYTE; + public static final int LOG_BYTES_IN_BYTE = 0; + public static final int BYTES_IN_BYTE = 1; + public static final int LOG_BITS_IN_BYTE = 3; + public static final int BITS_IN_BYTE = 1 << LOG_BITS_IN_BYTE; - int LOG_BYTES_IN_BOOLEAN = 0; - int BYTES_IN_BOOLEAN = 1 << LOG_BYTES_IN_BOOLEAN; - int LOG_BITS_IN_BOOLEAN = LOG_BITS_IN_BYTE + LOG_BYTES_IN_BOOLEAN; - int BITS_IN_BOOLEAN = 1 << LOG_BITS_IN_BOOLEAN; + public static final int LOG_BYTES_IN_BOOLEAN = 0; + public static final int BYTES_IN_BOOLEAN = 1 << LOG_BYTES_IN_BOOLEAN; + public static final int LOG_BITS_IN_BOOLEAN = LOG_BITS_IN_BYTE + LOG_BYTES_IN_BOOLEAN; + public static final int BITS_IN_BOOLEAN = 1 << LOG_BITS_IN_BOOLEAN; - int LOG_BYTES_IN_CHAR = 1; - int BYTES_IN_CHAR = 1 << LOG_BYTES_IN_CHAR; - int LOG_BITS_IN_CHAR = LOG_BITS_IN_BYTE + LOG_BYTES_IN_CHAR; - int BITS_IN_CHAR = 1 << LOG_BITS_IN_CHAR; + public static final int LOG_BYTES_IN_CHAR = 1; + public static final int BYTES_IN_CHAR = 1 << LOG_BYTES_IN_CHAR; + public static final int LOG_BITS_IN_CHAR = LOG_BITS_IN_BYTE + LOG_BYTES_IN_CHAR; + public static final int BITS_IN_CHAR = 1 << LOG_BITS_IN_CHAR; - int LOG_BYTES_IN_SHORT = 1; - int BYTES_IN_SHORT = 1 << LOG_BYTES_IN_SHORT; - int LOG_BITS_IN_SHORT = LOG_BITS_IN_BYTE + LOG_BYTES_IN_SHORT; - int BITS_IN_SHORT = 1 << LOG_BITS_IN_SHORT; + public static final int LOG_BYTES_IN_SHORT = 1; + public static final int BYTES_IN_SHORT = 1 << LOG_BYTES_IN_SHORT; + public static final int LOG_BITS_IN_SHORT = LOG_BITS_IN_BYTE + LOG_BYTES_IN_SHORT; + public static final int BITS_IN_SHORT = 1 << LOG_BITS_IN_SHORT; - int LOG_BYTES_IN_INT = 2; - int BYTES_IN_INT = 1 << LOG_BYTES_IN_INT; - int LOG_BITS_IN_INT = LOG_BITS_IN_BYTE + LOG_BYTES_IN_INT; - int BITS_IN_INT = 1 << LOG_BITS_IN_INT; + public static final int LOG_BYTES_IN_INT = 2; + public static final int BYTES_IN_INT = 1 << LOG_BYTES_IN_INT; + public static final int LOG_BITS_IN_INT = LOG_BITS_IN_BYTE + LOG_BYTES_IN_INT; + public static final int BITS_IN_INT = 1 << LOG_BITS_IN_INT; - int LOG_BYTES_IN_FLOAT = 2; - int BYTES_IN_FLOAT = 1 << LOG_BYTES_IN_FLOAT; - int LOG_BITS_IN_FLOAT = LOG_BITS_IN_BYTE + LOG_BYTES_IN_FLOAT; - int BITS_IN_FLOAT = 1 << LOG_BITS_IN_FLOAT; + public static final int LOG_BYTES_IN_FLOAT = 2; + public static final int BYTES_IN_FLOAT = 1 << LOG_BYTES_IN_FLOAT; + public static final int LOG_BITS_IN_FLOAT = LOG_BITS_IN_BYTE + LOG_BYTES_IN_FLOAT; + public static final int BITS_IN_FLOAT = 1 << LOG_BITS_IN_FLOAT; - int LOG_BYTES_IN_LONG = 3; - int BYTES_IN_LONG = 1 << LOG_BYTES_IN_LONG; - int LOG_BITS_IN_LONG = LOG_BITS_IN_BYTE + LOG_BYTES_IN_LONG; - int BITS_IN_LONG = 1 << LOG_BITS_IN_LONG; + public static final int LOG_BYTES_IN_LONG = 3; + public static final int BYTES_IN_LONG = 1 << LOG_BYTES_IN_LONG; + public static final int LOG_BITS_IN_LONG = LOG_BITS_IN_BYTE + LOG_BYTES_IN_LONG; + public static final int BITS_IN_LONG = 1 << LOG_BITS_IN_LONG; - int LOG_BYTES_IN_DOUBLE = 3; - int BYTES_IN_DOUBLE = 1 << LOG_BYTES_IN_DOUBLE; - int LOG_BITS_IN_DOUBLE = LOG_BITS_IN_BYTE + LOG_BYTES_IN_DOUBLE; - int BITS_IN_DOUBLE = 1 << LOG_BITS_IN_DOUBLE; + public static final int LOG_BYTES_IN_DOUBLE = 3; + public static final int BYTES_IN_DOUBLE = 1 << LOG_BYTES_IN_DOUBLE; + public static final int LOG_BITS_IN_DOUBLE = LOG_BITS_IN_BYTE + LOG_BYTES_IN_DOUBLE; + public static final int BITS_IN_DOUBLE = 1 << LOG_BITS_IN_DOUBLE; - int LOG_BYTES_IN_ADDRESS = VM.BuildFor64Addr ? 3 : 2; - int BYTES_IN_ADDRESS = 1 << LOG_BYTES_IN_ADDRESS; - int LOG_BITS_IN_ADDRESS = LOG_BITS_IN_BYTE + LOG_BYTES_IN_ADDRESS; - int BITS_IN_ADDRESS = 1 << LOG_BITS_IN_ADDRESS; + public static final int LOG_BYTES_IN_ADDRESS = VM.BuildFor64Addr ? 3 : 2; + public static final int BYTES_IN_ADDRESS = 1 << LOG_BYTES_IN_ADDRESS; + public static final int LOG_BITS_IN_ADDRESS = LOG_BITS_IN_BYTE + LOG_BYTES_IN_ADDRESS; + public static final int BITS_IN_ADDRESS = 1 << LOG_BITS_IN_ADDRESS; |