Mercurial > hg > truffle

comparison src/share/vm/graal/graalJavaAccess.hpp @ 5508:22fe762332af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changes in C++ part for the Java renamings.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Thu, 07 Jun 2012 18:37:15 +0200
parents 28af6dff047f
children 18f51ca0070f
comparison
equal deleted inserted replaced
5507:dc71b06d09f8 5508:22fe762332af
63 oop_field(HotSpotKlassOop, javaMirror, "Ljava/lang/Class;") \ 63 oop_field(HotSpotKlassOop, javaMirror, "Ljava/lang/Class;") \
64 end_class \ 64 end_class \
65 start_class(HotSpotMethodResolved) \ 65 start_class(HotSpotMethodResolved) \
66 oop_field(HotSpotMethodResolved, compiler, "Lcom/oracle/graal/hotspot/Compiler;") \ 66 oop_field(HotSpotMethodResolved, compiler, "Lcom/oracle/graal/hotspot/Compiler;") \
67 oop_field(HotSpotMethodResolved, name, "Ljava/lang/String;") \ 67 oop_field(HotSpotMethodResolved, name, "Ljava/lang/String;") \
68 oop_field(HotSpotMethodResolved, holder, "Lcom/oracle/max/cri/ri/RiResolvedType;") \ 68 oop_field(HotSpotMethodResolved, holder, "Lcom/oracle/graal/api/meta/RiResolvedType;") \
69 oop_field(HotSpotMethodResolved, javaMirror, "Ljava/lang/Object;") \ 69 oop_field(HotSpotMethodResolved, javaMirror, "Ljava/lang/Object;") \
70 int_field(HotSpotMethodResolved, codeSize) \ 70 int_field(HotSpotMethodResolved, codeSize) \
71 int_field(HotSpotMethodResolved, accessFlags) \ 71 int_field(HotSpotMethodResolved, accessFlags) \
72 int_field(HotSpotMethodResolved, maxLocals) \ 72 int_field(HotSpotMethodResolved, maxLocals) \
73 int_field(HotSpotMethodResolved, maxStackSize) \ 73 int_field(HotSpotMethodResolved, maxStackSize) \
81 end_class \ 81 end_class \
82 start_class(HotSpotType) \ 82 start_class(HotSpotType) \
83 oop_field(HotSpotType, name, "Ljava/lang/String;") \ 83 oop_field(HotSpotType, name, "Ljava/lang/String;") \
84 end_class \ 84 end_class \
85 start_class(HotSpotField) \ 85 start_class(HotSpotField) \
86 oop_field(HotSpotField, constant, "Lcom/oracle/max/cri/ri/RiConstant;") \ 86 oop_field(HotSpotField, constant, "Lcom/oracle/graal/api/meta/RiConstant;") \
87 int_field(HotSpotField, offset) \ 87 int_field(HotSpotField, offset) \
88 int_field(HotSpotField, accessFlags) \ 88 int_field(HotSpotField, accessFlags) \
89 end_class \ 89 end_class \
90 start_class(HotSpotCompiledMethod) \ 90 start_class(HotSpotCompiledMethod) \
91 oop_field(HotSpotCompiledMethod, compiler, "Lcom/oracle/graal/hotspot/Compiler;") \ 91 oop_field(HotSpotCompiledMethod, compiler, "Lcom/oracle/graal/hotspot/Compiler;") \
92 long_field(HotSpotCompiledMethod, nmethod) \ 92 long_field(HotSpotCompiledMethod, nmethod) \
93 oop_field(HotSpotCompiledMethod, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;")\ 93 oop_field(HotSpotCompiledMethod, method, "Lcom/oracle/graal/api/meta/RiResolvedMethod;")\
94 end_class \ 94 end_class \
95 start_class(HotSpotCodeInfo) \ 95 start_class(HotSpotCodeInfo) \
96 long_field(HotSpotCodeInfo, start) \ 96 long_field(HotSpotCodeInfo, start) \
97 oop_field(HotSpotCodeInfo, code, "[B") \ 97 oop_field(HotSpotCodeInfo, code, "[B") \
98 end_class \ 98 end_class \
109 start_class(HotSpotExceptionHandler) \ 109 start_class(HotSpotExceptionHandler) \
110 int_field(HotSpotExceptionHandler, startBci) \ 110 int_field(HotSpotExceptionHandler, startBci) \
111 int_field(HotSpotExceptionHandler, endBci) \ 111 int_field(HotSpotExceptionHandler, endBci) \
112 int_field(HotSpotExceptionHandler, handlerBci) \ 112 int_field(HotSpotExceptionHandler, handlerBci) \
113 int_field(HotSpotExceptionHandler, catchClassIndex) \ 113 int_field(HotSpotExceptionHandler, catchClassIndex) \
114 oop_field(HotSpotExceptionHandler, catchClass, "Lcom/oracle/max/cri/ri/RiType;") \ 114 oop_field(HotSpotExceptionHandler, catchClass, "Lcom/oracle/graal/api/meta/RiType;") \
115 end_class \ 115 end_class \
116 start_class(CiTargetMethod) \ 116 start_class(CiTargetMethod) \
117 int_field(CiTargetMethod, frameSize) \ 117 int_field(CiTargetMethod, frameSize) \
118 int_field(CiTargetMethod, customStackAreaOffset) \ 118 int_field(CiTargetMethod, customStackAreaOffset) \
119 oop_field(CiTargetMethod, targetCode, "[B") \ 119 oop_field(CiTargetMethod, targetCode, "[B") \
122 end_class \ 122 end_class \
123 start_class(CiAssumptions) \ 123 start_class(CiAssumptions) \
124 oop_field(CiAssumptions, list, "[Lcom/oracle/max/cri/ci/CiAssumptions$Assumption;") \ 124 oop_field(CiAssumptions, list, "[Lcom/oracle/max/cri/ci/CiAssumptions$Assumption;") \
125 end_class \ 125 end_class \
126 start_class(CiAssumptions_MethodContents) \ 126 start_class(CiAssumptions_MethodContents) \
127 oop_field(CiAssumptions_MethodContents, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ 127 oop_field(CiAssumptions_MethodContents, method, "Lcom/oracle/graal/api/meta/RiResolvedMethod;") \
128 end_class \ 128 end_class \
129 start_class(CiAssumptions_ConcreteSubtype) \ 129 start_class(CiAssumptions_ConcreteSubtype) \
130 oop_field(CiAssumptions_ConcreteSubtype, context, "Lcom/oracle/max/cri/ri/RiResolvedType;") \ 130 oop_field(CiAssumptions_ConcreteSubtype, context, "Lcom/oracle/graal/api/meta/RiResolvedType;") \
131 oop_field(CiAssumptions_ConcreteSubtype, subtype, "Lcom/oracle/max/cri/ri/RiResolvedType;") \ 131 oop_field(CiAssumptions_ConcreteSubtype, subtype, "Lcom/oracle/graal/api/meta/RiResolvedType;") \
132 end_class \ 132 end_class \
133 start_class(CiAssumptions_ConcreteMethod) \ 133 start_class(CiAssumptions_ConcreteMethod) \
134 oop_field(CiAssumptions_ConcreteMethod, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ 134 oop_field(CiAssumptions_ConcreteMethod, method, "Lcom/oracle/graal/api/meta/RiResolvedMethod;") \
135 oop_field(CiAssumptions_ConcreteMethod, context, "Lcom/oracle/max/cri/ri/RiResolvedType;") \ 135 oop_field(CiAssumptions_ConcreteMethod, context, "Lcom/oracle/graal/api/meta/RiResolvedType;") \
136 oop_field(CiAssumptions_ConcreteMethod, impl, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ 136 oop_field(CiAssumptions_ConcreteMethod, impl, "Lcom/oracle/graal/api/meta/RiResolvedMethod;") \
137 end_class \ 137 end_class \
138 start_class(CiTargetMethod_Site) \ 138 start_class(CiTargetMethod_Site) \
139 int_field(CiTargetMethod_Site, pcOffset) \ 139 int_field(CiTargetMethod_Site, pcOffset) \
140 end_class \ 140 end_class \
141 start_class(CiTargetMethod_Call) \ 141 start_class(CiTargetMethod_Call) \
142 oop_field(CiTargetMethod_Call, target, "Ljava/lang/Object;") \ 142 oop_field(CiTargetMethod_Call, target, "Ljava/lang/Object;") \
143 oop_field(CiTargetMethod_Call, debugInfo, "Lcom/oracle/max/cri/ci/CiDebugInfo;") \ 143 oop_field(CiTargetMethod_Call, debugInfo, "Lcom/oracle/max/cri/ci/CiDebugInfo;") \
144 end_class \ 144 end_class \
145 start_class(CiTargetMethod_DataPatch) \ 145 start_class(CiTargetMethod_DataPatch) \
146 oop_field(CiTargetMethod_DataPatch, constant, "Lcom/oracle/max/cri/ri/RiConstant;") \ 146 oop_field(CiTargetMethod_DataPatch, constant, "Lcom/oracle/graal/api/meta/RiConstant;") \
147 int_field(CiTargetMethod_DataPatch, alignment) \ 147 int_field(CiTargetMethod_DataPatch, alignment) \
148 end_class \ 148 end_class \
149 start_class(CiTargetMethod_Safepoint) \ 149 start_class(CiTargetMethod_Safepoint) \
150 oop_field(CiTargetMethod_Safepoint, debugInfo, "Lcom/oracle/max/cri/ci/CiDebugInfo;") \ 150 oop_field(CiTargetMethod_Safepoint, debugInfo, "Lcom/oracle/max/cri/ci/CiDebugInfo;") \
151 end_class \ 151 end_class \
156 oop_field(CiTargetMethod_Mark, id, "Ljava/lang/Object;") \ 156 oop_field(CiTargetMethod_Mark, id, "Ljava/lang/Object;") \
157 oop_field(CiTargetMethod_Mark, references, "[Lcom/oracle/max/cri/ci/CiTargetMethod$Mark;") \ 157 oop_field(CiTargetMethod_Mark, references, "[Lcom/oracle/max/cri/ci/CiTargetMethod$Mark;") \
158 end_class \ 158 end_class \
159 start_class(CiDebugInfo) \ 159 start_class(CiDebugInfo) \
160 oop_field(CiDebugInfo, codePos, "Lcom/oracle/max/cri/ci/CiCodePos;") \ 160 oop_field(CiDebugInfo, codePos, "Lcom/oracle/max/cri/ci/CiCodePos;") \
161 oop_field(CiDebugInfo, registerRefMap, "Lcom/oracle/max/cri/ci/CiBitMap;") \ 161 oop_field(CiDebugInfo, registerRefMap, "Lcom/oracle/graal/api/meta/RiBitMap;") \
162 oop_field(CiDebugInfo, frameRefMap, "Lcom/oracle/max/cri/ci/CiBitMap;") \ 162 oop_field(CiDebugInfo, frameRefMap, "Lcom/oracle/graal/api/meta/RiBitMap;") \
163 end_class \ 163 end_class \
164 start_class(GraalBitMap) \ 164 start_class(GraalBitMap) \
165 int_field(GraalBitMap, size) \ 165 int_field(GraalBitMap, size) \
166 long_field(GraalBitMap, low) \ 166 long_field(GraalBitMap, low) \
167 oop_field(GraalBitMap, extra, "[J") \ 167 oop_field(GraalBitMap, extra, "[J") \
168 end_class \ 168 end_class \
169 start_class(CiFrame) \ 169 start_class(CiFrame) \
170 oop_field(CiFrame, values, "[Lcom/oracle/max/cri/ci/CiValue;") \ 170 oop_field(CiFrame, values, "[Lcom/oracle/graal/api/meta/RiValue;") \
171 int_field(CiFrame, numLocals) \ 171 int_field(CiFrame, numLocals) \
172 int_field(CiFrame, numStack) \ 172 int_field(CiFrame, numStack) \
173 int_field(CiFrame, numLocks) \ 173 int_field(CiFrame, numLocks) \
174 long_field(CiFrame, leafGraphId) \ 174 long_field(CiFrame, leafGraphId) \
175 boolean_field(CiFrame, rethrowException) \ 175 boolean_field(CiFrame, rethrowException) \
176 boolean_field(CiFrame, duringCall) \ 176 boolean_field(CiFrame, duringCall) \
177 end_class \ 177 end_class \
178 start_class(CiCodePos) \ 178 start_class(CiCodePos) \
179 oop_field(CiCodePos, caller, "Lcom/oracle/max/cri/ci/CiCodePos;") \ 179 oop_field(CiCodePos, caller, "Lcom/oracle/max/cri/ci/CiCodePos;") \
180 oop_field(CiCodePos, method, "Lcom/oracle/max/cri/ri/RiResolvedMethod;") \ 180 oop_field(CiCodePos, method, "Lcom/oracle/graal/api/meta/RiResolvedMethod;") \
181 int_field(CiCodePos, bci) \ 181 int_field(CiCodePos, bci) \
182 end_class \ 182 end_class \
183 start_class(CiConstant) \ 183 start_class(CiConstant) \
184 oop_field(CiConstant, kind, "Lcom/oracle/max/cri/ri/RiKind;") \ 184 oop_field(CiConstant, kind, "Lcom/oracle/graal/api/meta/RiKind;") \
185 oop_field(CiConstant, object, "Ljava/lang/Object;") \ 185 oop_field(CiConstant, object, "Ljava/lang/Object;") \
186 long_field(CiConstant, primitive) \ 186 long_field(CiConstant, primitive) \
187 end_class \ 187 end_class \
188 start_class(CiKind) \ 188 start_class(CiKind) \
189 char_field(CiKind, typeChar) \ 189 char_field(CiKind, typeChar) \
190 static_oop_field(CiKind, Boolean, "Lcom/oracle/max/cri/ri/RiKind;"); \ 190 static_oop_field(CiKind, Boolean, "Lcom/oracle/graal/api/meta/RiKind;"); \
191 static_oop_field(CiKind, Byte, "Lcom/oracle/max/cri/ri/RiKind;"); \ 191 static_oop_field(CiKind, Byte, "Lcom/oracle/graal/api/meta/RiKind;"); \
192 static_oop_field(CiKind, Char, "Lcom/oracle/max/cri/ri/RiKind;"); \ 192 static_oop_field(CiKind, Char, "Lcom/oracle/graal/api/meta/RiKind;"); \
193 static_oop_field(CiKind, Short, "Lcom/oracle/max/cri/ri/RiKind;"); \ 193 static_oop_field(CiKind, Short, "Lcom/oracle/graal/api/meta/RiKind;"); \
194 static_oop_field(CiKind, Int, "Lcom/oracle/max/cri/ri/RiKind;"); \ 194 static_oop_field(CiKind, Int, "Lcom/oracle/graal/api/meta/RiKind;"); \
195 static_oop_field(CiKind, Long, "Lcom/oracle/max/cri/ri/RiKind;"); \ 195 static_oop_field(CiKind, Long, "Lcom/oracle/graal/api/meta/RiKind;"); \
196 end_class \ 196 end_class \
197 start_class(CiRuntimeCall) \ 197 start_class(CiRuntimeCall) \
198 static_oop_field(CiRuntimeCall, UnwindException, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 198 static_oop_field(CiRuntimeCall, UnwindException, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \
199 static_oop_field(CiRuntimeCall, RegisterFinalizer, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 199 static_oop_field(CiRuntimeCall, RegisterFinalizer, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \
200 static_oop_field(CiRuntimeCall, SetDeoptInfo, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 200 static_oop_field(CiRuntimeCall, SetDeoptInfo, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \
212 static_oop_field(CiRuntimeCall, GenericCallback, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 212 static_oop_field(CiRuntimeCall, GenericCallback, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \
213 end_class \ 213 end_class \
214 start_class(RiMethod) \ 214 start_class(RiMethod) \
215 end_class \ 215 end_class \
216 start_class(CiValue) \ 216 start_class(CiValue) \
217 oop_field(CiValue, kind, "Lcom/oracle/max/cri/ri/RiKind;") \ 217 oop_field(CiValue, kind, "Lcom/oracle/graal/api/meta/RiKind;") \
218 static_oop_field(CiValue, IllegalValue, "Lcom/oracle/max/cri/ci/CiValue;"); \ 218 static_oop_field(CiValue, IllegalValue, "Lcom/oracle/graal/api/meta/RiValue;"); \
219 end_class \ 219 end_class \
220 start_class(CiRegisterValue) \ 220 start_class(CiRegisterValue) \
221 oop_field(CiRegisterValue, reg, "Lcom/oracle/max/cri/ci/CiRegister;") \ 221 oop_field(CiRegisterValue, reg, "Lcom/oracle/max/cri/ci/CiRegister;") \
222 end_class \ 222 end_class \
223 start_class(CiRegister) \ 223 start_class(CiRegister) \
227 int_field(CiStackSlot, offset) \ 227 int_field(CiStackSlot, offset) \
228 boolean_field(CiStackSlot, addFrameSize) \ 228 boolean_field(CiStackSlot, addFrameSize) \
229 end_class \ 229 end_class \
230 start_class(CiVirtualObject) \ 230 start_class(CiVirtualObject) \
231 int_field(CiVirtualObject, id) \ 231 int_field(CiVirtualObject, id) \
232 oop_field(CiVirtualObject, type, "Lcom/oracle/max/cri/ri/RiType;") \ 232 oop_field(CiVirtualObject, type, "Lcom/oracle/graal/api/meta/RiType;") \
233 oop_field(CiVirtualObject, values, "[Lcom/oracle/max/cri/ci/CiValue;") \ 233 oop_field(CiVirtualObject, values, "[Lcom/oracle/graal/api/meta/RiValue;") \
234 end_class \ 234 end_class \
235 start_class(CiMonitorValue) \ 235 start_class(CiMonitorValue) \
236 oop_field(CiMonitorValue, owner, "Lcom/oracle/max/cri/ci/CiValue;") \ 236 oop_field(CiMonitorValue, owner, "Lcom/oracle/graal/api/meta/RiValue;") \
237 oop_field(CiMonitorValue, lockData, "Lcom/oracle/max/cri/ci/CiValue;") \ 237 oop_field(CiMonitorValue, lockData, "Lcom/oracle/graal/api/meta/RiValue;") \
238 boolean_field(CiMonitorValue, eliminated) \ 238 boolean_field(CiMonitorValue, eliminated) \
239 end_class \ 239 end_class \
240 /* end*/ 240 /* end*/
241 241
242 #define START_CLASS(name) \ 242 #define START_CLASS(name) \