Mercurial > hg > graal-compiler
diff src/share/vm/graal/graalJavaAccess.hpp @ 5554:70f715dfbb41
Bring Java renamings and restructurings to the C++ part.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Sun, 10 Jun 2012 01:17:48 +0200 |
| parents | 511612d1b5c1 |
| children | 69358a2182a3 |
line wrap: on
line diff
--- a/src/share/vm/graal/graalJavaAccess.hpp Sat Jun 09 22:50:50 2012 +0200 +++ b/src/share/vm/graal/graalJavaAccess.hpp Sun Jun 10 01:17:48 2012 +0200 @@ -26,12 +26,12 @@ #include "classfile/systemDictionary.hpp" #include "oops/instanceMirrorKlass.hpp" -/* This macro defines the structure of the CiTargetMethod - classes. +/* This macro defines the structure of the InstalledCode - classes. * It will generate classes with accessors similar to javaClasses.hpp, but with specializations for oops, Handles and jni handles. * * The public interface of these classes will look like this: - * class CiStackSlot : AllStatic { + * class StackSlot : AllStatic { * public: * static klassOop klass(); * static jint index(oop obj); @@ -45,43 +45,43 @@ */ #define COMPILER_CLASSES_DO(start_class, end_class, char_field, int_field, boolean_field, long_field, float_field, oop_field, static_oop_field) \ - start_class(HotSpotTypeResolved) \ - oop_field(HotSpotTypeResolved, javaMirror, "Ljava/lang/Class;") \ - oop_field(HotSpotTypeResolved, simpleName, "Ljava/lang/String;") \ - int_field(HotSpotTypeResolved, accessFlags) \ - boolean_field(HotSpotTypeResolved, hasFinalizer) \ - boolean_field(HotSpotTypeResolved, hasFinalizableSubclass) \ - int_field(HotSpotTypeResolved, superCheckOffset) \ - boolean_field(HotSpotTypeResolved, isArrayClass) \ - boolean_field(HotSpotTypeResolved, isInstanceClass) \ - boolean_field(HotSpotTypeResolved, isInterface) \ - int_field(HotSpotTypeResolved, instanceSize) \ + start_class(HotSpotResolvedJavaType) \ + oop_field(HotSpotResolvedJavaType, javaMirror, "Ljava/lang/Class;") \ + oop_field(HotSpotResolvedJavaType, simpleName, "Ljava/lang/String;") \ + int_field(HotSpotResolvedJavaType, accessFlags) \ + boolean_field(HotSpotResolvedJavaType, hasFinalizer) \ + boolean_field(HotSpotResolvedJavaType, hasFinalizableSubclass) \ + int_field(HotSpotResolvedJavaType, superCheckOffset) \ + boolean_field(HotSpotResolvedJavaType, isArrayClass) \ + boolean_field(HotSpotResolvedJavaType, isInstanceClass) \ + boolean_field(HotSpotResolvedJavaType, isInterface) \ + int_field(HotSpotResolvedJavaType, instanceSize) \ end_class \ start_class(HotSpotKlassOop) \ oop_field(HotSpotKlassOop, javaMirror, "Ljava/lang/Class;") \ end_class \ - start_class(HotSpotMethodResolved) \ - oop_field(HotSpotMethodResolved, name, "Ljava/lang/String;") \ - oop_field(HotSpotMethodResolved, holder, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \ - oop_field(HotSpotMethodResolved, javaMirror, "Ljava/lang/Object;") \ - int_field(HotSpotMethodResolved, codeSize) \ - int_field(HotSpotMethodResolved, accessFlags) \ - int_field(HotSpotMethodResolved, maxLocals) \ - int_field(HotSpotMethodResolved, maxStackSize) \ - boolean_field(HotSpotMethodResolved, canBeInlined) \ + start_class(HotSpotResolvedJavaMethod) \ + oop_field(HotSpotResolvedJavaMethod, name, "Ljava/lang/String;") \ + oop_field(HotSpotResolvedJavaMethod, holder, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \ + oop_field(HotSpotResolvedJavaMethod, javaMirror, "Ljava/lang/Object;") \ + int_field(HotSpotResolvedJavaMethod, codeSize) \ + int_field(HotSpotResolvedJavaMethod, accessFlags) \ + int_field(HotSpotResolvedJavaMethod, maxLocals) \ + int_field(HotSpotResolvedJavaMethod, maxStackSize) \ + boolean_field(HotSpotResolvedJavaMethod, canBeInlined) \ end_class \ start_class(HotSpotMethodData) \ oop_field(HotSpotMethodData, hotspotMirror, "Ljava/lang/Object;") \ int_field(HotSpotMethodData, normalDataSize) \ int_field(HotSpotMethodData, extraDataSize) \ end_class \ - start_class(HotSpotType) \ - oop_field(HotSpotType, name, "Ljava/lang/String;") \ + start_class(HotSpotJavaType) \ + oop_field(HotSpotJavaType, name, "Ljava/lang/String;") \ end_class \ - start_class(HotSpotField) \ - oop_field(HotSpotField, constant, "Lcom/oracle/graal/api/meta/Constant;") \ - int_field(HotSpotField, offset) \ - int_field(HotSpotField, accessFlags) \ + start_class(HotSpotResolvedJavaField) \ + oop_field(HotSpotResolvedJavaField, constant, "Lcom/oracle/graal/api/meta/Constant;") \ + int_field(HotSpotResolvedJavaField, offset) \ + int_field(HotSpotResolvedJavaField, accessFlags) \ end_class \ start_class(HotSpotCompiledMethod) \ long_field(HotSpotCompiledMethod, nmethod) \ @@ -96,139 +96,139 @@ end_class \ start_class(HotSpotTargetMethod) \ oop_field(HotSpotTargetMethod, targetMethod, "Lcom/oracle/graal/api/code/CompilationResult;") \ - oop_field(HotSpotTargetMethod, method, "Lcom/oracle/graal/hotspot/meta/HotSpotMethodResolved;") \ + oop_field(HotSpotTargetMethod, method, "Lcom/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod;") \ oop_field(HotSpotTargetMethod, name, "Ljava/lang/String;") \ oop_field(HotSpotTargetMethod, sites, "[Lcom/oracle/graal/api/code/CompilationResult$Site;") \ oop_field(HotSpotTargetMethod, exceptionHandlers, "[Lcom/oracle/graal/api/code/CompilationResult$ExceptionHandler;") \ end_class \ - start_class(RiExceptionHandler) \ - int_field(RiExceptionHandler, startBCI) \ - int_field(RiExceptionHandler, endBCI) \ - int_field(RiExceptionHandler, handlerBCI) \ - int_field(RiExceptionHandler, catchTypeCPI) \ - oop_field(RiExceptionHandler, catchType, "Lcom/oracle/graal/api/meta/JavaType;") \ + start_class(ExceptionHandler) \ + int_field(ExceptionHandler, startBCI) \ + int_field(ExceptionHandler, endBCI) \ + int_field(ExceptionHandler, handlerBCI) \ + int_field(ExceptionHandler, catchTypeCPI) \ + oop_field(ExceptionHandler, catchType, "Lcom/oracle/graal/api/meta/JavaType;") \ end_class \ - start_class(CiTargetMethod) \ - int_field(CiTargetMethod, frameSize) \ - int_field(CiTargetMethod, customStackAreaOffset) \ - oop_field(CiTargetMethod, targetCode, "[B") \ - oop_field(CiTargetMethod, assumptions, "Lcom/oracle/graal/api/code/Assumptions;") \ - int_field(CiTargetMethod, targetCodeSize) \ + start_class(InstalledCode) \ + int_field(InstalledCode, frameSize) \ + int_field(InstalledCode, customStackAreaOffset) \ + oop_field(InstalledCode, targetCode, "[B") \ + oop_field(InstalledCode, assumptions, "Lcom/oracle/graal/api/code/Assumptions;") \ + int_field(InstalledCode, targetCodeSize) \ end_class \ - start_class(CiAssumptions) \ - oop_field(CiAssumptions, list, "[Lcom/oracle/graal/api/code/Assumptions$Assumption;") \ + start_class(Assumptions) \ + oop_field(Assumptions, list, "[Lcom/oracle/graal/api/code/Assumptions$Assumption;") \ end_class \ - start_class(CiAssumptions_MethodContents) \ - oop_field(CiAssumptions_MethodContents, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \ + start_class(Assumptions_MethodContents) \ + oop_field(Assumptions_MethodContents, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \ end_class \ - start_class(CiAssumptions_ConcreteSubtype) \ - oop_field(CiAssumptions_ConcreteSubtype, context, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \ - oop_field(CiAssumptions_ConcreteSubtype, subtype, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \ + start_class(Assumptions_ConcreteSubtype) \ + oop_field(Assumptions_ConcreteSubtype, context, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \ + oop_field(Assumptions_ConcreteSubtype, subtype, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \ end_class \ - start_class(CiAssumptions_ConcreteMethod) \ - oop_field(CiAssumptions_ConcreteMethod, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \ - oop_field(CiAssumptions_ConcreteMethod, context, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \ - oop_field(CiAssumptions_ConcreteMethod, impl, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \ + start_class(Assumptions_ConcreteMethod) \ + oop_field(Assumptions_ConcreteMethod, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \ + oop_field(Assumptions_ConcreteMethod, context, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \ + oop_field(Assumptions_ConcreteMethod, impl, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \ end_class \ - start_class(CiTargetMethod_Site) \ - int_field(CiTargetMethod_Site, pcOffset) \ + start_class(InstalledCode_Site) \ + int_field(InstalledCode_Site, pcOffset) \ end_class \ - start_class(CiTargetMethod_Call) \ - oop_field(CiTargetMethod_Call, target, "Ljava/lang/Object;") \ - oop_field(CiTargetMethod_Call, debugInfo, "Lcom/oracle/graal/api/code/DebugInfo;") \ + start_class(InstalledCode_Call) \ + oop_field(InstalledCode_Call, target, "Ljava/lang/Object;") \ + oop_field(InstalledCode_Call, debugInfo, "Lcom/oracle/graal/api/code/DebugInfo;") \ end_class \ - start_class(CiTargetMethod_DataPatch) \ - oop_field(CiTargetMethod_DataPatch, constant, "Lcom/oracle/graal/api/meta/Constant;") \ - int_field(CiTargetMethod_DataPatch, alignment) \ + start_class(InstalledCode_DataPatch) \ + oop_field(InstalledCode_DataPatch, constant, "Lcom/oracle/graal/api/meta/Constant;") \ + int_field(InstalledCode_DataPatch, alignment) \ end_class \ - start_class(CiTargetMethod_Safepoint) \ - oop_field(CiTargetMethod_Safepoint, debugInfo, "Lcom/oracle/graal/api/code/DebugInfo;") \ + start_class(InstalledCode_Safepoint) \ + oop_field(InstalledCode_Safepoint, debugInfo, "Lcom/oracle/graal/api/code/DebugInfo;") \ end_class \ - start_class(CiTargetMethod_ExceptionHandler) \ - int_field(CiTargetMethod_ExceptionHandler, handlerPos) \ + start_class(InstalledCode_ExceptionHandler) \ + int_field(InstalledCode_ExceptionHandler, handlerPos) \ end_class \ - start_class(CiTargetMethod_Mark) \ - oop_field(CiTargetMethod_Mark, id, "Ljava/lang/Object;") \ - oop_field(CiTargetMethod_Mark, references, "[Lcom/oracle/graal/api/code/CompilationResult$Mark;") \ + start_class(InstalledCode_Mark) \ + oop_field(InstalledCode_Mark, id, "Ljava/lang/Object;") \ + oop_field(InstalledCode_Mark, references, "[Lcom/oracle/graal/api/code/CompilationResult$Mark;") \ end_class \ - start_class(CiDebugInfo) \ - oop_field(CiDebugInfo, bytecodePosition, "Lcom/oracle/graal/api/code/BytecodePosition;") \ - oop_field(CiDebugInfo, registerRefMap, "Ljava/util/BitSet;") \ - oop_field(CiDebugInfo, frameRefMap, "Ljava/util/BitSet;") \ + start_class(DebugInfo) \ + oop_field(DebugInfo, bytecodePosition, "Lcom/oracle/graal/api/code/BytecodePosition;") \ + oop_field(DebugInfo, registerRefMap, "Ljava/util/BitSet;") \ + oop_field(DebugInfo, frameRefMap, "Ljava/util/BitSet;") \ end_class \ start_class(GraalBitMap) \ oop_field(GraalBitMap, words, "[J") \ end_class \ - start_class(CiFrame) \ - oop_field(CiFrame, values, "[Lcom/oracle/graal/api/meta/Value;") \ - int_field(CiFrame, numLocals) \ - int_field(CiFrame, numStack) \ - int_field(CiFrame, numLocks) \ - long_field(CiFrame, leafGraphId) \ - boolean_field(CiFrame, rethrowException) \ - boolean_field(CiFrame, duringCall) \ + start_class(BytecodeFrame) \ + oop_field(BytecodeFrame, values, "[Lcom/oracle/graal/api/meta/Value;") \ + int_field(BytecodeFrame, numLocals) \ + int_field(BytecodeFrame, numStack) \ + int_field(BytecodeFrame, numLocks) \ + long_field(BytecodeFrame, leafGraphId) \ + boolean_field(BytecodeFrame, rethrowException) \ + boolean_field(BytecodeFrame, duringCall) \ end_class \ - start_class(CiCodePos) \ - oop_field(CiCodePos, caller, "Lcom/oracle/graal/api/code/BytecodePosition;") \ - oop_field(CiCodePos, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \ - int_field(CiCodePos, bci) \ + start_class(BytecodePosition) \ + oop_field(BytecodePosition, caller, "Lcom/oracle/graal/api/code/BytecodePosition;") \ + oop_field(BytecodePosition, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \ + int_field(BytecodePosition, bci) \ end_class \ - start_class(CiConstant) \ - oop_field(CiConstant, kind, "Lcom/oracle/graal/api/meta/Kind;") \ - oop_field(CiConstant, object, "Ljava/lang/Object;") \ - long_field(CiConstant, primitive) \ + start_class(Constant) \ + oop_field(Constant, kind, "Lcom/oracle/graal/api/meta/Kind;") \ + oop_field(Constant, object, "Ljava/lang/Object;") \ + long_field(Constant, primitive) \ end_class \ - start_class(CiKind) \ - char_field(CiKind, typeChar) \ - static_oop_field(CiKind, Boolean, "Lcom/oracle/graal/api/meta/Kind;"); \ - static_oop_field(CiKind, Byte, "Lcom/oracle/graal/api/meta/Kind;"); \ - static_oop_field(CiKind, Char, "Lcom/oracle/graal/api/meta/Kind;"); \ - static_oop_field(CiKind, Short, "Lcom/oracle/graal/api/meta/Kind;"); \ - static_oop_field(CiKind, Int, "Lcom/oracle/graal/api/meta/Kind;"); \ - static_oop_field(CiKind, Long, "Lcom/oracle/graal/api/meta/Kind;"); \ + start_class(Kind) \ + char_field(Kind, typeChar) \ + static_oop_field(Kind, Boolean, "Lcom/oracle/graal/api/meta/Kind;"); \ + static_oop_field(Kind, Byte, "Lcom/oracle/graal/api/meta/Kind;"); \ + static_oop_field(Kind, Char, "Lcom/oracle/graal/api/meta/Kind;"); \ + static_oop_field(Kind, Short, "Lcom/oracle/graal/api/meta/Kind;"); \ + static_oop_field(Kind, Int, "Lcom/oracle/graal/api/meta/Kind;"); \ + static_oop_field(Kind, Long, "Lcom/oracle/graal/api/meta/Kind;"); \ end_class \ - start_class(CiRuntimeCall) \ - static_oop_field(CiRuntimeCall, UnwindException, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ - static_oop_field(CiRuntimeCall, RegisterFinalizer, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ - static_oop_field(CiRuntimeCall, SetDeoptInfo, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ - static_oop_field(CiRuntimeCall, CreateNullPointerException, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ - static_oop_field(CiRuntimeCall, CreateOutOfBoundsException, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ - static_oop_field(CiRuntimeCall, JavaTimeMillis, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ - static_oop_field(CiRuntimeCall, JavaTimeNanos, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ - static_oop_field(CiRuntimeCall, Debug, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ - static_oop_field(CiRuntimeCall, ArithmeticFrem, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ - static_oop_field(CiRuntimeCall, ArithmeticDrem, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ - static_oop_field(CiRuntimeCall, ArithmeticCos, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ - static_oop_field(CiRuntimeCall, ArithmeticTan, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ - static_oop_field(CiRuntimeCall, ArithmeticSin, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ - static_oop_field(CiRuntimeCall, Deoptimize, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ - static_oop_field(CiRuntimeCall, GenericCallback, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ + start_class(RuntimeCall) \ + static_oop_field(RuntimeCall, UnwindException, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ + static_oop_field(RuntimeCall, RegisterFinalizer, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ + static_oop_field(RuntimeCall, SetDeoptInfo, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ + static_oop_field(RuntimeCall, CreateNullPointerException, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ + static_oop_field(RuntimeCall, CreateOutOfBoundsException, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ + static_oop_field(RuntimeCall, JavaTimeMillis, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ + static_oop_field(RuntimeCall, JavaTimeNanos, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ + static_oop_field(RuntimeCall, Debug, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ + static_oop_field(RuntimeCall, ArithmeticFrem, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ + static_oop_field(RuntimeCall, ArithmeticDrem, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ + static_oop_field(RuntimeCall, ArithmeticCos, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ + static_oop_field(RuntimeCall, ArithmeticTan, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ + static_oop_field(RuntimeCall, ArithmeticSin, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ + static_oop_field(RuntimeCall, Deoptimize, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ + static_oop_field(RuntimeCall, GenericCallback, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ end_class \ - start_class(RiMethod) \ + start_class(JavaMethod) \ end_class \ - start_class(CiValue) \ - oop_field(CiValue, kind, "Lcom/oracle/graal/api/meta/Kind;") \ - static_oop_field(CiValue, IllegalValue, "Lcom/oracle/graal/api/meta/Value;"); \ + start_class(Value) \ + oop_field(Value, kind, "Lcom/oracle/graal/api/meta/Kind;") \ + static_oop_field(Value, IllegalValue, "Lcom/oracle/graal/api/meta/Value;"); \ end_class \ - start_class(CiRegisterValue) \ - oop_field(CiRegisterValue, reg, "Lcom/oracle/graal/api/code/Register;") \ + start_class(RegisterValue) \ + oop_field(RegisterValue, reg, "Lcom/oracle/graal/api/code/Register;") \ end_class \ - start_class(CiRegister) \ - int_field(CiRegister, number) \ + start_class(code_Register) \ + int_field(code_Register, number) \ end_class \ - start_class(CiStackSlot) \ - int_field(CiStackSlot, offset) \ - boolean_field(CiStackSlot, addFrameSize) \ + start_class(StackSlot) \ + int_field(StackSlot, offset) \ + boolean_field(StackSlot, addFrameSize) \ end_class \ - start_class(CiVirtualObject) \ - int_field(CiVirtualObject, id) \ - oop_field(CiVirtualObject, type, "Lcom/oracle/graal/api/meta/JavaType;") \ - oop_field(CiVirtualObject, values, "[Lcom/oracle/graal/api/meta/Value;") \ + start_class(VirtualObject) \ + int_field(VirtualObject, id) \ + oop_field(VirtualObject, type, "Lcom/oracle/graal/api/meta/JavaType;") \ + oop_field(VirtualObject, values, "[Lcom/oracle/graal/api/meta/Value;") \ end_class \ - start_class(CiMonitorValue) \ - oop_field(CiMonitorValue, owner, "Lcom/oracle/graal/api/meta/Value;") \ - oop_field(CiMonitorValue, lockData, "Lcom/oracle/graal/api/meta/Value;") \ - boolean_field(CiMonitorValue, eliminated) \ + start_class(code_MonitorValue) \ + oop_field(code_MonitorValue, owner, "Lcom/oracle/graal/api/meta/Value;") \ + oop_field(code_MonitorValue, lockData, "Lcom/oracle/graal/api/meta/Value;") \ + boolean_field(code_MonitorValue, eliminated) \ end_class \ /* end*/