comparison src/share/vm/graal/graalJavaAccess.hpp @ 5547:b6617d13ea44

Dropping Ci* prefixes. Some additional renamings in the api.code interface.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 09 Jun 2012 20:10:05 +0200
parents e42c0df7212a
children 8872bc0eebdf
comparison
equal deleted inserted replaced
5546:e42c0df7212a 5547:b6617d13ea44
99 oop_field(HotSpotTargetMethod, method, "Lcom/oracle/graal/hotspot/ri/HotSpotMethodResolved;") \ 99 oop_field(HotSpotTargetMethod, method, "Lcom/oracle/graal/hotspot/ri/HotSpotMethodResolved;") \
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(HotSpotExceptionHandler) \ 104 start_class(RiExceptionHandler) \
105 int_field(HotSpotExceptionHandler, startBCI) \ 105 int_field(RiExceptionHandler, startBCI) \
106 int_field(HotSpotExceptionHandler, endBCI) \ 106 int_field(RiExceptionHandler, endBCI) \
107 int_field(HotSpotExceptionHandler, handlerBCI) \ 107 int_field(RiExceptionHandler, handlerBCI) \
108 int_field(HotSpotExceptionHandler, catchTypeCPI) \ 108 int_field(RiExceptionHandler, catchTypeCPI) \
109 oop_field(HotSpotExceptionHandler, catchType, "Lcom/oracle/graal/api/meta/JavaType;") \ 109 oop_field(RiExceptionHandler, catchType, "Lcom/oracle/graal/api/meta/JavaType;") \
110 end_class \ 110 end_class \
111 start_class(CiTargetMethod) \ 111 start_class(CiTargetMethod) \
112 int_field(CiTargetMethod, frameSize) \ 112 int_field(CiTargetMethod, frameSize) \
113 int_field(CiTargetMethod, customStackAreaOffset) \ 113 int_field(CiTargetMethod, customStackAreaOffset) \
114 oop_field(CiTargetMethod, targetCode, "[B") \ 114 oop_field(CiTargetMethod, targetCode, "[B") \
115 oop_field(CiTargetMethod, assumptions, "Lcom/oracle/graal/api/code/CiAssumptions;") \ 115 oop_field(CiTargetMethod, assumptions, "Lcom/oracle/graal/api/code/Assumptions;") \
116 int_field(CiTargetMethod, targetCodeSize) \ 116 int_field(CiTargetMethod, targetCodeSize) \
117 end_class \ 117 end_class \
118 start_class(CiAssumptions) \ 118 start_class(CiAssumptions) \
119 oop_field(CiAssumptions, list, "[Lcom/oracle/graal/api/code/CiAssumptions$Assumption;") \ 119 oop_field(CiAssumptions, list, "[Lcom/oracle/graal/api/code/Assumptions$Assumption;") \
120 end_class \ 120 end_class \
121 start_class(CiAssumptions_MethodContents) \ 121 start_class(CiAssumptions_MethodContents) \
122 oop_field(CiAssumptions_MethodContents, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \ 122 oop_field(CiAssumptions_MethodContents, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \
123 end_class \ 123 end_class \
124 start_class(CiAssumptions_ConcreteSubtype) \ 124 start_class(CiAssumptions_ConcreteSubtype) \
133 start_class(CiTargetMethod_Site) \ 133 start_class(CiTargetMethod_Site) \
134 int_field(CiTargetMethod_Site, pcOffset) \ 134 int_field(CiTargetMethod_Site, pcOffset) \
135 end_class \ 135 end_class \
136 start_class(CiTargetMethod_Call) \ 136 start_class(CiTargetMethod_Call) \
137 oop_field(CiTargetMethod_Call, target, "Ljava/lang/Object;") \ 137 oop_field(CiTargetMethod_Call, target, "Ljava/lang/Object;") \
138 oop_field(CiTargetMethod_Call, debugInfo, "Lcom/oracle/graal/api/code/CiDebugInfo;") \ 138 oop_field(CiTargetMethod_Call, debugInfo, "Lcom/oracle/graal/api/code/DebugInfo;") \
139 end_class \ 139 end_class \
140 start_class(CiTargetMethod_DataPatch) \ 140 start_class(CiTargetMethod_DataPatch) \
141 oop_field(CiTargetMethod_DataPatch, constant, "Lcom/oracle/graal/api/meta/Constant;") \ 141 oop_field(CiTargetMethod_DataPatch, constant, "Lcom/oracle/graal/api/meta/Constant;") \
142 int_field(CiTargetMethod_DataPatch, alignment) \ 142 int_field(CiTargetMethod_DataPatch, alignment) \
143 end_class \ 143 end_class \
144 start_class(CiTargetMethod_Safepoint) \ 144 start_class(CiTargetMethod_Safepoint) \
145 oop_field(CiTargetMethod_Safepoint, debugInfo, "Lcom/oracle/graal/api/code/CiDebugInfo;") \ 145 oop_field(CiTargetMethod_Safepoint, debugInfo, "Lcom/oracle/graal/api/code/DebugInfo;") \
146 end_class \ 146 end_class \
147 start_class(CiTargetMethod_ExceptionHandler) \ 147 start_class(CiTargetMethod_ExceptionHandler) \
148 int_field(CiTargetMethod_ExceptionHandler, handlerPos) \ 148 int_field(CiTargetMethod_ExceptionHandler, handlerPos) \
149 end_class \ 149 end_class \
150 start_class(CiTargetMethod_Mark) \ 150 start_class(CiTargetMethod_Mark) \
151 oop_field(CiTargetMethod_Mark, id, "Ljava/lang/Object;") \ 151 oop_field(CiTargetMethod_Mark, id, "Ljava/lang/Object;") \
152 oop_field(CiTargetMethod_Mark, references, "[Lcom/oracle/graal/api/code/CompilationResult$Mark;") \ 152 oop_field(CiTargetMethod_Mark, references, "[Lcom/oracle/graal/api/code/CompilationResult$Mark;") \
153 end_class \ 153 end_class \
154 start_class(CiDebugInfo) \ 154 start_class(CiDebugInfo) \
155 oop_field(CiDebugInfo, codePos, "Lcom/oracle/graal/api/code/CiCodePos;") \ 155 oop_field(CiDebugInfo, codePos, "Lcom/oracle/graal/api/code/BytecodePosition;") \
156 oop_field(CiDebugInfo, registerRefMap, "Ljava/util/BitSet;") \ 156 oop_field(CiDebugInfo, registerRefMap, "Ljava/util/BitSet;") \
157 oop_field(CiDebugInfo, frameRefMap, "Ljava/util/BitSet;") \ 157 oop_field(CiDebugInfo, 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") \
167 long_field(CiFrame, leafGraphId) \ 167 long_field(CiFrame, leafGraphId) \
168 boolean_field(CiFrame, rethrowException) \ 168 boolean_field(CiFrame, rethrowException) \
169 boolean_field(CiFrame, duringCall) \ 169 boolean_field(CiFrame, duringCall) \
170 end_class \ 170 end_class \
171 start_class(CiCodePos) \ 171 start_class(CiCodePos) \
172 oop_field(CiCodePos, caller, "Lcom/oracle/graal/api/code/CiCodePos;") \ 172 oop_field(CiCodePos, caller, "Lcom/oracle/graal/api/code/BytecodePosition;") \
173 oop_field(CiCodePos, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \ 173 oop_field(CiCodePos, method, "Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \
174 int_field(CiCodePos, bci) \ 174 int_field(CiCodePos, bci) \
175 end_class \ 175 end_class \
176 start_class(CiConstant) \ 176 start_class(CiConstant) \
177 oop_field(CiConstant, kind, "Lcom/oracle/graal/api/meta/Kind;") \ 177 oop_field(CiConstant, kind, "Lcom/oracle/graal/api/meta/Kind;") \
186 static_oop_field(CiKind, Short, "Lcom/oracle/graal/api/meta/Kind;"); \ 186 static_oop_field(CiKind, Short, "Lcom/oracle/graal/api/meta/Kind;"); \
187 static_oop_field(CiKind, Int, "Lcom/oracle/graal/api/meta/Kind;"); \ 187 static_oop_field(CiKind, Int, "Lcom/oracle/graal/api/meta/Kind;"); \
188 static_oop_field(CiKind, Long, "Lcom/oracle/graal/api/meta/Kind;"); \ 188 static_oop_field(CiKind, Long, "Lcom/oracle/graal/api/meta/Kind;"); \
189 end_class \ 189 end_class \
190 start_class(CiRuntimeCall) \ 190 start_class(CiRuntimeCall) \
191 static_oop_field(CiRuntimeCall, UnwindException, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ 191 static_oop_field(CiRuntimeCall, UnwindException, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
192 static_oop_field(CiRuntimeCall, RegisterFinalizer, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ 192 static_oop_field(CiRuntimeCall, RegisterFinalizer, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
193 static_oop_field(CiRuntimeCall, SetDeoptInfo, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ 193 static_oop_field(CiRuntimeCall, SetDeoptInfo, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
194 static_oop_field(CiRuntimeCall, CreateNullPointerException, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ 194 static_oop_field(CiRuntimeCall, CreateNullPointerException, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
195 static_oop_field(CiRuntimeCall, CreateOutOfBoundsException, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ 195 static_oop_field(CiRuntimeCall, CreateOutOfBoundsException, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
196 static_oop_field(CiRuntimeCall, JavaTimeMillis, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ 196 static_oop_field(CiRuntimeCall, JavaTimeMillis, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
197 static_oop_field(CiRuntimeCall, JavaTimeNanos, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ 197 static_oop_field(CiRuntimeCall, JavaTimeNanos, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
198 static_oop_field(CiRuntimeCall, Debug, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ 198 static_oop_field(CiRuntimeCall, Debug, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
199 static_oop_field(CiRuntimeCall, ArithmeticFrem, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ 199 static_oop_field(CiRuntimeCall, ArithmeticFrem, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
200 static_oop_field(CiRuntimeCall, ArithmeticDrem, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ 200 static_oop_field(CiRuntimeCall, ArithmeticDrem, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
201 static_oop_field(CiRuntimeCall, ArithmeticCos, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ 201 static_oop_field(CiRuntimeCall, ArithmeticCos, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
202 static_oop_field(CiRuntimeCall, ArithmeticTan, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ 202 static_oop_field(CiRuntimeCall, ArithmeticTan, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
203 static_oop_field(CiRuntimeCall, ArithmeticSin, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ 203 static_oop_field(CiRuntimeCall, ArithmeticSin, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
204 static_oop_field(CiRuntimeCall, Deoptimize, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ 204 static_oop_field(CiRuntimeCall, Deoptimize, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
205 static_oop_field(CiRuntimeCall, GenericCallback, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \ 205 static_oop_field(CiRuntimeCall, GenericCallback, "Lcom/oracle/graal/api/code/RuntimeCall;"); \
206 end_class \ 206 end_class \
207 start_class(RiMethod) \ 207 start_class(RiMethod) \
208 end_class \ 208 end_class \
209 start_class(CiValue) \ 209 start_class(CiValue) \
210 oop_field(CiValue, kind, "Lcom/oracle/graal/api/meta/Kind;") \ 210 oop_field(CiValue, kind, "Lcom/oracle/graal/api/meta/Kind;") \
211 static_oop_field(CiValue, IllegalValue, "Lcom/oracle/graal/api/meta/Value;"); \ 211 static_oop_field(CiValue, IllegalValue, "Lcom/oracle/graal/api/meta/Value;"); \
212 end_class \ 212 end_class \
213 start_class(CiRegisterValue) \ 213 start_class(CiRegisterValue) \
214 oop_field(CiRegisterValue, reg, "Lcom/oracle/graal/api/code/CiRegister;") \ 214 oop_field(CiRegisterValue, reg, "Lcom/oracle/graal/api/code/Register;") \
215 end_class \ 215 end_class \
216 start_class(CiRegister) \ 216 start_class(CiRegister) \
217 int_field(CiRegister, number) \ 217 int_field(CiRegister, number) \
218 end_class \ 218 end_class \
219 start_class(CiStackSlot) \ 219 start_class(CiStackSlot) \