comparison 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
comparison
equal deleted inserted replaced
5553:511612d1b5c1 5554:70f715dfbb41
24 void graal_compute_offsets(); 24 void graal_compute_offsets();
25 25
26 #include "classfile/systemDictionary.hpp" 26 #include "classfile/systemDictionary.hpp"
27 #include "oops/instanceMirrorKlass.hpp" 27 #include "oops/instanceMirrorKlass.hpp"
28 28
29 /* This macro defines the structure of the CiTargetMethod - classes. 29 /* This macro defines the structure of the InstalledCode - classes.
30 * It will generate classes with accessors similar to javaClasses.hpp, but with specializations for oops, Handles and jni handles. 30 * It will generate classes with accessors similar to javaClasses.hpp, but with specializations for oops, Handles and jni handles.
31 * 31 *
32 * The public interface of these classes will look like this: 32 * The public interface of these classes will look like this:
33 33
34 * class CiStackSlot : AllStatic { 34 * class StackSlot : AllStatic {
35 * public: 35 * public:
36 * static klassOop klass(); 36 * static klassOop klass();
37 * static jint index(oop obj); 37 * static jint index(oop obj);
38 * static jint index(Handle obj); 38 * static jint index(Handle obj);
39 * static jint index(jobject obj); 39 * static jint index(jobject obj);
43 * }; 43 * };
44 * 44 *
45 */ 45 */
46 46
47 #define COMPILER_CLASSES_DO(start_class, end_class, char_field, int_field, boolean_field, long_field, float_field, oop_field, static_oop_field) \ 47 #define COMPILER_CLASSES_DO(start_class, end_class, char_field, int_field, boolean_field, long_field, float_field, oop_field, static_oop_field) \
48 start_class(HotSpotTypeResolved) \ 48 start_class(HotSpotResolvedJavaType) \
49 oop_field(HotSpotTypeResolved, javaMirror, "Ljava/lang/Class;") \ 49 oop_field(HotSpotResolvedJavaType, javaMirror, "Ljava/lang/Class;") \
50 oop_field(HotSpotTypeResolved, simpleName, "Ljava/lang/String;") \ 50 oop_field(HotSpotResolvedJavaType, simpleName, "Ljava/lang/String;") \
51 int_field(HotSpotTypeResolved, accessFlags) \ 51 int_field(HotSpotResolvedJavaType, accessFlags) \
52 boolean_field(HotSpotTypeResolved, hasFinalizer) \ 52 boolean_field(HotSpotResolvedJavaType, hasFinalizer) \
53 boolean_field(HotSpotTypeResolved, hasFinalizableSubclass) \ 53 boolean_field(HotSpotResolvedJavaType, hasFinalizableSubclass) \
54 int_field(HotSpotTypeResolved, superCheckOffset) \ 54 int_field(HotSpotResolvedJavaType, superCheckOffset) \
55 boolean_field(HotSpotTypeResolved, isArrayClass) \ 55 boolean_field(HotSpotResolvedJavaType, isArrayClass) \
56 boolean_field(HotSpotTypeResolved, isInstanceClass) \ 56 boolean_field(HotSpotResolvedJavaType, isInstanceClass) \
57 boolean_field(HotSpotTypeResolved, isInterface) \ 57 boolean_field(HotSpotResolvedJavaType, isInterface) \
58 int_field(HotSpotTypeResolved, instanceSize) \ 58 int_field(HotSpotResolvedJavaType, instanceSize) \
59 end_class \ 59 end_class \
60 start_class(HotSpotKlassOop) \ 60 start_class(HotSpotKlassOop) \
61 oop_field(HotSpotKlassOop, javaMirror, "Ljava/lang/Class;") \ 61 oop_field(HotSpotKlassOop, javaMirror, "Ljava/lang/Class;") \
62 end_class \ 62 end_class \
63 start_class(HotSpotMethodResolved) \ 63 start_class(HotSpotResolvedJavaMethod) \
64 oop_field(HotSpotMethodResolved, name, "Ljava/lang/String;") \ 64 oop_field(HotSpotResolvedJavaMethod, name, "Ljava/lang/String;") \
65 oop_field(HotSpotMethodResolved, holder, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \ 65 oop_field(HotSpotResolvedJavaMethod, holder, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \
66 oop_field(HotSpotMethodResolved, javaMirror, "Ljava/lang/Object;") \ 66 oop_field(HotSpotResolvedJavaMethod, javaMirror, "Ljava/lang/Object;") \
67 int_field(HotSpotMethodResolved, codeSize) \ 67 int_field(HotSpotResolvedJavaMethod, codeSize) \
68 int_field(HotSpotMethodResolved, accessFlags) \ 68 int_field(HotSpotResolvedJavaMethod, accessFlags) \
69 int_field(HotSpotMethodResolved, maxLocals) \ 69 int_field(HotSpotResolvedJavaMethod, maxLocals) \
70 int_field(HotSpotMethodResolved, maxStackSize) \ 70 int_field(HotSpotResolvedJavaMethod, maxStackSize) \
71 boolean_field(HotSpotMethodResolved, canBeInlined) \ 71 boolean_field(HotSpotResolvedJavaMethod, canBeInlined) \
72 end_class \ 72 end_class \
73 start_class(HotSpotMethodData) \ 73 start_class(HotSpotMethodData) \
74 oop_field(HotSpotMethodData, hotspotMirror, "Ljava/lang/Object;") \ 74 oop_field(HotSpotMethodData, hotspotMirror, "Ljava/lang/Object;") \
75 int_field(HotSpotMethodData, normalDataSize) \ 75 int_field(HotSpotMethodData, normalDataSize) \
76 int_field(HotSpotMethodData, extraDataSize) \ 76 int_field(HotSpotMethodData, extraDataSize) \
77 end_class \ 77 end_class \
78 start_class(HotSpotType) \ 78 start_class(HotSpotJavaType) \
79 oop_field(HotSpotType, name, "Ljava/lang/String;") \ 79 oop_field(HotSpotJavaType, name, "Ljava/lang/String;") \
80 end_class \ 80 end_class \
81 start_class(HotSpotField) \ 81 start_class(HotSpotResolvedJavaField) \
82 oop_field(HotSpotField, constant, "Lcom/oracle/graal/api/meta/Constant;") \ 82 oop_field(HotSpotResolvedJavaField, constant, "Lcom/oracle/graal/api/meta/Constant;") \
83 int_field(HotSpotField, offset) \ 83 int_field(HotSpotResolvedJavaField, offset) \
84 int_field(HotSpotField, accessFlags) \ 84 int_field(HotSpotResolvedJavaField, accessFlags) \
85 end_class \ 85 end_class \
86 start_class(HotSpotCompiledMethod) \ 86 start_class(HotSpotCompiledMethod) \
87 long_field(HotSpotCompiledMethod, nmethod) \ 87 long_field(HotSpotCompiledMethod, nmethod) \
88 oop_field(HotSpotCompiledMethod, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;")\ 88 oop_field(HotSpotCompiledMethod, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;")\
89 end_class \ 89 end_class \
94 start_class(HotSpotProxy) \ 94 start_class(HotSpotProxy) \
95 static_oop_field(HotSpotProxy, DUMMY_CONSTANT_OBJ, "Ljava/lang/Long;") \ 95 static_oop_field(HotSpotProxy, DUMMY_CONSTANT_OBJ, "Ljava/lang/Long;") \
96 end_class \ 96 end_class \
97 start_class(HotSpotTargetMethod) \ 97 start_class(HotSpotTargetMethod) \
98 oop_field(HotSpotTargetMethod, targetMethod, "Lcom/oracle/graal/api/code/CompilationResult;") \ 98 oop_field(HotSpotTargetMethod, targetMethod, "Lcom/oracle/graal/api/code/CompilationResult;") \
99 oop_field(HotSpotTargetMethod, method, "Lcom/oracle/graal/hotspot/meta/HotSpotMethodResolved;") \ 99 oop_field(HotSpotTargetMethod, method, "Lcom/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod;") \
100 oop_field(HotSpotTargetMethod, name, "Ljava/lang/String;") \ 100 oop_field(HotSpotTargetMethod, name, "Ljava/lang/String;") \
101 oop_field(HotSpotTargetMethod, sites, "[Lcom/oracle/graal/api/code/CompilationResult$Site;") \ 101 oop_field(HotSpotTargetMethod, sites, "[Lcom/oracle/graal/api/code/CompilationResult$Site;") \
102 oop_field(HotSpotTargetMethod, exceptionHandlers, "[Lcom/oracle/graal/api/code/CompilationResult$ExceptionHandler;") \ 102 oop_field(HotSpotTargetMethod, exceptionHandlers, "[Lcom/oracle/graal/api/code/CompilationResult$ExceptionHandler;") \
103 end_class \ 103 end_class \
104 start_class(RiExceptionHandler) \ 104 start_class(ExceptionHandler) \
105 int_field(RiExceptionHandler, startBCI) \ 105 int_field(ExceptionHandler, startBCI) \
106 int_field(RiExceptionHandler, endBCI) \ 106 int_field(ExceptionHandler, endBCI) \
107 int_field(RiExceptionHandler, handlerBCI) \ 107 int_field(ExceptionHandler, handlerBCI) \
108 int_field(RiExceptionHandler, catchTypeCPI) \ 108 int_field(ExceptionHandler, catchTypeCPI) \
109 oop_field(RiExceptionHandler, catchType, "Lcom/oracle/graal/api/meta/JavaType;") \ 109 oop_field(ExceptionHandler, catchType, "Lcom/oracle/graal/api/meta/JavaType;") \
110 end_class \ 110 end_class \
111 start_class(CiTargetMethod) \ 111 start_class(InstalledCode) \
112 int_field(CiTargetMethod, frameSize) \ 112 int_field(InstalledCode, frameSize) \
113 int_field(CiTargetMethod, customStackAreaOffset) \ 113 int_field(InstalledCode, customStackAreaOffset) \
114 oop_field(CiTargetMethod, targetCode, "[B") \ 114 oop_field(InstalledCode, targetCode, "[B") \
115 oop_field(CiTargetMethod, assumptions, "Lcom/oracle/graal/api/code/Assumptions;") \ 115 oop_field(InstalledCode, assumptions, "Lcom/oracle/graal/api/code/Assumptions;") \
116 int_field(CiTargetMethod, targetCodeSize) \ 116 int_field(InstalledCode, targetCodeSize) \
117 end_class \ 117 end_class \
118 start_class(CiAssumptions) \ 118 start_class(Assumptions) \
119 oop_field(CiAssumptions, list, "[Lcom/oracle/graal/api/code/Assumptions$Assumption;") \ 119 oop_field(Assumptions, list, "[Lcom/oracle/graal/api/code/Assumptions$Assumption;") \
120 end_class \ 120 end_class \
121 start_class(CiAssumptions_MethodContents) \ 121 start_class(Assumptions_MethodContents) \
122 oop_field(CiAssumptions_MethodContents, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \ 122 oop_field(Assumptions_MethodContents, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \
123 end_class \ 123 end_class \
124 start_class(CiAssumptions_ConcreteSubtype) \ 124 start_class(Assumptions_ConcreteSubtype) \
125 oop_field(CiAssumptions_ConcreteSubtype, context, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \ 125 oop_field(Assumptions_ConcreteSubtype, context, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \
126 oop_field(CiAssumptions_ConcreteSubtype, subtype, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \ 126 oop_field(Assumptions_ConcreteSubtype, subtype, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \
127 end_class \ 127 end_class \
128 start_class(CiAssumptions_ConcreteMethod) \ 128 start_class(Assumptions_ConcreteMethod) \
129 oop_field(CiAssumptions_ConcreteMethod, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \ 129 oop_field(Assumptions_ConcreteMethod, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \
130 oop_field(CiAssumptions_ConcreteMethod, context, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \ 130 oop_field(Assumptions_ConcreteMethod, context, "Lcom/oracle/graal/api/meta/ResolvedJavaType;") \
131 oop_field(CiAssumptions_ConcreteMethod, impl, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \ 131 oop_field(Assumptions_ConcreteMethod, impl, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \
132 end_class \ 132 end_class \
133 start_class(CiTargetMethod_Site) \ 133 start_class(InstalledCode_Site) \
134 int_field(CiTargetMethod_Site, pcOffset) \ 134 int_field(InstalledCode_Site, pcOffset) \
135 end_class \ 135 end_class \
136 start_class(CiTargetMethod_Call) \ 136 start_class(InstalledCode_Call) \
137 oop_field(CiTargetMethod_Call, target, "Ljava/lang/Object;") \ 137 oop_field(InstalledCode_Call, target, "Ljava/lang/Object;") \
138 oop_field(CiTargetMethod_Call, debugInfo, "Lcom/oracle/graal/api/code/DebugInfo;") \ 138 oop_field(InstalledCode_Call, debugInfo, "Lcom/oracle/graal/api/code/DebugInfo;") \
139 end_class \ 139 end_class \
140 start_class(CiTargetMethod_DataPatch) \ 140 start_class(InstalledCode_DataPatch) \
141 oop_field(CiTargetMethod_DataPatch, constant, "Lcom/oracle/graal/api/meta/Constant;") \ 141 oop_field(InstalledCode_DataPatch, constant, "Lcom/oracle/graal/api/meta/Constant;") \
142 int_field(CiTargetMethod_DataPatch, alignment) \ 142 int_field(InstalledCode_DataPatch, alignment) \
143 end_class \ 143 end_class \
144 start_class(CiTargetMethod_Safepoint) \ 144 start_class(InstalledCode_Safepoint) \
145 oop_field(CiTargetMethod_Safepoint, debugInfo, "Lcom/oracle/graal/api/code/DebugInfo;") \ 145 oop_field(InstalledCode_Safepoint, debugInfo, "Lcom/oracle/graal/api/code/DebugInfo;") \
146 end_class \ 146 end_class \
147 start_class(CiTargetMethod_ExceptionHandler) \ 147 start_class(InstalledCode_ExceptionHandler) \
148 int_field(CiTargetMethod_ExceptionHandler, handlerPos) \ 148 int_field(InstalledCode_ExceptionHandler, handlerPos) \
149 end_class \ 149 end_class \
150 start_class(CiTargetMethod_Mark) \ 150 start_class(InstalledCode_Mark) \
151 oop_field(CiTargetMethod_Mark, id, "Ljava/lang/Object;") \ 151 oop_field(InstalledCode_Mark, id, "Ljava/lang/Object;") \
152 oop_field(CiTargetMethod_Mark, references, "[Lcom/oracle/graal/api/code/CompilationResult$Mark;") \ 152 oop_field(InstalledCode_Mark, references, "[Lcom/oracle/graal/api/code/CompilationResult$Mark;") \
153 end_class \ 153 end_class \
154 start_class(CiDebugInfo) \ 154 start_class(DebugInfo) \
155 oop_field(CiDebugInfo, bytecodePosition, "Lcom/oracle/graal/api/code/BytecodePosition;") \ 155 oop_field(DebugInfo, bytecodePosition, "Lcom/oracle/graal/api/code/BytecodePosition;") \
156 oop_field(CiDebugInfo, registerRefMap, "Ljava/util/BitSet;") \ 156 oop_field(DebugInfo, registerRefMap, "Ljava/util/BitSet;") \
157 oop_field(CiDebugInfo, frameRefMap, "Ljava/util/BitSet;") \ 157 oop_field(DebugInfo, frameRefMap, "Ljava/util/BitSet;") \
158 end_class \ 158 end_class \
159 start_class(GraalBitMap) \ 159 start_class(GraalBitMap) \
160 oop_field(GraalBitMap, words, "[J") \ 160 oop_field(GraalBitMap, words, "[J") \
161 end_class \ 161 end_class \
162 start_class(CiFrame) \ 162 start_class(BytecodeFrame) \
163 oop_field(CiFrame, values, "[Lcom/oracle/graal/api/meta/Value;") \ 163 oop_field(BytecodeFrame, values, "[Lcom/oracle/graal/api/meta/Value;") \
164 int_field(CiFrame, numLocals) \ 164 int_field(BytecodeFrame, numLocals) \
165 int_field(CiFrame, numStack) \ 165 int_field(BytecodeFrame, numStack) \
166 int_field(CiFrame, numLocks) \ 166 int_field(BytecodeFrame, numLocks) \
167 long_field(CiFrame, leafGraphId) \ 167 long_field(BytecodeFrame, leafGraphId) \
168 boolean_field(CiFrame, rethrowException) \ 168 boolean_field(BytecodeFrame, rethrowException) \
169 boolean_field(CiFrame, duringCall) \ 169 boolean_field(BytecodeFrame, duringCall) \
170 end_class \ 170 end_class \
171 start_class(CiCodePos) \ 171 start_class(BytecodePosition) \
172 oop_field(CiCodePos, caller, "Lcom/oracle/graal/api/code/BytecodePosition;") \ 172 oop_field(BytecodePosition, caller, "Lcom/oracle/graal/api/code/BytecodePosition;") \
173 oop_field(CiCodePos, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \ 173 oop_field(BytecodePosition, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \
174 int_field(CiCodePos, bci) \ 174 int_field(BytecodePosition, bci) \
175 end_class \ 175 end_class \
176 start_class(CiConstant) \ 176 start_class(Constant) \
177 oop_field(CiConstant, kind, "Lcom/oracle/graal/api/meta/Kind;") \ 177 oop_field(Constant, kind, "Lcom/oracle/graal/api/meta/Kind;") \
178 oop_field(CiConstant, object, "Ljava/lang/Object;") \ 178 oop_field(Constant, object, "Ljava/lang/Object;") \
179 long_field(CiConstant, primitive) \ 179 long_field(Constant, primitive) \
180 end_class \ 180 end_class \
181 start_class(CiKind) \ 181 start_class(Kind) \
182 char_field(CiKind, typeChar) \ 182 char_field(Kind, typeChar) \
183 static_oop_field(CiKind, Boolean, "Lcom/oracle/graal/api/meta/Kind;"); \ 183 static_oop_field(Kind, Boolean, "Lcom/oracle/graal/api/meta/Kind;"); \
184 static_oop_field(CiKind, Byte, "Lcom/oracle/graal/api/meta/Kind;"); \ 184 static_oop_field(Kind, Byte, "Lcom/oracle/graal/api/meta/Kind;"); \
185 static_oop_field(CiKind, Char, "Lcom/oracle/graal/api/meta/Kind;"); \ 185 static_oop_field(Kind, Char, "Lcom/oracle/graal/api/meta/Kind;"); \
186 static_oop_field(CiKind, Short, "Lcom/oracle/graal/api/meta/Kind;"); \ 186 static_oop_field(Kind, Short, "Lcom/oracle/graal/api/meta/Kind;"); \
187 static_oop_field(CiKind, Int, "Lcom/oracle/graal/api/meta/Kind;"); \ 187 static_oop_field(Kind, Int, "Lcom/oracle/graal/api/meta/Kind;"); \
188 static_oop_field(CiKind, Long, "Lcom/oracle/graal/api/meta/Kind;"); \ 188 static_oop_field(Kind, Long, "Lcom/oracle/graal/api/meta/Kind;"); \
189 end_class \ 189 end_class \
190 start_class(CiRuntimeCall) \ 190 start_class(RuntimeCall) \
191 static_oop_field(CiRuntimeCall, UnwindException, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ 191 static_oop_field(RuntimeCall, UnwindException, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
192 static_oop_field(CiRuntimeCall, RegisterFinalizer, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ 192 static_oop_field(RuntimeCall, RegisterFinalizer, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
193 static_oop_field(CiRuntimeCall, SetDeoptInfo, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ 193 static_oop_field(RuntimeCall, SetDeoptInfo, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
194 static_oop_field(CiRuntimeCall, CreateNullPointerException, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ 194 static_oop_field(RuntimeCall, CreateNullPointerException, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
195 static_oop_field(CiRuntimeCall, CreateOutOfBoundsException, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ 195 static_oop_field(RuntimeCall, CreateOutOfBoundsException, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
196 static_oop_field(CiRuntimeCall, JavaTimeMillis, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ 196 static_oop_field(RuntimeCall, JavaTimeMillis, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
197 static_oop_field(CiRuntimeCall, JavaTimeNanos, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ 197 static_oop_field(RuntimeCall, JavaTimeNanos, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
198 static_oop_field(CiRuntimeCall, Debug, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ 198 static_oop_field(RuntimeCall, Debug, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
199 static_oop_field(CiRuntimeCall, ArithmeticFrem, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ 199 static_oop_field(RuntimeCall, ArithmeticFrem, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
200 static_oop_field(CiRuntimeCall, ArithmeticDrem, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ 200 static_oop_field(RuntimeCall, ArithmeticDrem, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
201 static_oop_field(CiRuntimeCall, ArithmeticCos, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ 201 static_oop_field(RuntimeCall, ArithmeticCos, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
202 static_oop_field(CiRuntimeCall, ArithmeticTan, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ 202 static_oop_field(RuntimeCall, ArithmeticTan, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
203 static_oop_field(CiRuntimeCall, ArithmeticSin, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ 203 static_oop_field(RuntimeCall, ArithmeticSin, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
204 static_oop_field(CiRuntimeCall, Deoptimize, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ 204 static_oop_field(RuntimeCall, Deoptimize, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
205 static_oop_field(CiRuntimeCall, GenericCallback, "Lcom/oracle/graal/api/code/RuntimeCall;"); \ 205 static_oop_field(RuntimeCall, GenericCallback, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
206 end_class \ 206 end_class \
207 start_class(RiMethod) \ 207 start_class(JavaMethod) \
208 end_class \ 208 end_class \
209 start_class(CiValue) \ 209 start_class(Value) \
210 oop_field(CiValue, kind, "Lcom/oracle/graal/api/meta/Kind;") \ 210 oop_field(Value, kind, "Lcom/oracle/graal/api/meta/Kind;") \
211 static_oop_field(CiValue, IllegalValue, "Lcom/oracle/graal/api/meta/Value;"); \ 211 static_oop_field(Value, IllegalValue, "Lcom/oracle/graal/api/meta/Value;"); \
212 end_class \ 212 end_class \
213 start_class(CiRegisterValue) \ 213 start_class(RegisterValue) \
214 oop_field(CiRegisterValue, reg, "Lcom/oracle/graal/api/code/Register;") \ 214 oop_field(RegisterValue, reg, "Lcom/oracle/graal/api/code/Register;") \
215 end_class \ 215 end_class \
216 start_class(CiRegister) \ 216 start_class(code_Register) \
217 int_field(CiRegister, number) \ 217 int_field(code_Register, number) \
218 end_class \ 218 end_class \
219 start_class(CiStackSlot) \ 219 start_class(StackSlot) \
220 int_field(CiStackSlot, offset) \ 220 int_field(StackSlot, offset) \
221 boolean_field(CiStackSlot, addFrameSize) \ 221 boolean_field(StackSlot, addFrameSize) \
222 end_class \ 222 end_class \
223 start_class(CiVirtualObject) \ 223 start_class(VirtualObject) \
224 int_field(CiVirtualObject, id) \ 224 int_field(VirtualObject, id) \
225 oop_field(CiVirtualObject, type, "Lcom/oracle/graal/api/meta/JavaType;") \ 225 oop_field(VirtualObject, type, "Lcom/oracle/graal/api/meta/JavaType;") \
226 oop_field(CiVirtualObject, values, "[Lcom/oracle/graal/api/meta/Value;") \ 226 oop_field(VirtualObject, values, "[Lcom/oracle/graal/api/meta/Value;") \
227 end_class \ 227 end_class \
228 start_class(CiMonitorValue) \ 228 start_class(code_MonitorValue) \
229 oop_field(CiMonitorValue, owner, "Lcom/oracle/graal/api/meta/Value;") \ 229 oop_field(code_MonitorValue, owner, "Lcom/oracle/graal/api/meta/Value;") \
230 oop_field(CiMonitorValue, lockData, "Lcom/oracle/graal/api/meta/Value;") \ 230 oop_field(code_MonitorValue, lockData, "Lcom/oracle/graal/api/meta/Value;") \
231 boolean_field(CiMonitorValue, eliminated) \ 231 boolean_field(code_MonitorValue, eliminated) \
232 end_class \ 232 end_class \
233 /* end*/ 233 /* end*/
234 234
235 #define START_CLASS(name) \ 235 #define START_CLASS(name) \
236 class name : AllStatic { \ 236 class name : AllStatic { \