comparison src/share/vm/graal/graalJavaAccess.hpp @ 5512:18f51ca0070f

Changes in the C++ part according to the Java renamings.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Thu, 07 Jun 2012 19:02:39 +0200
parents 22fe762332af
children 35753b8c098a
comparison
equal deleted inserted replaced
5511:fe3288796132 5512:18f51ca0070f
98 end_class \ 98 end_class \
99 start_class(HotSpotProxy) \ 99 start_class(HotSpotProxy) \
100 static_oop_field(HotSpotProxy, DUMMY_CONSTANT_OBJ, "Ljava/lang/Long;") \ 100 static_oop_field(HotSpotProxy, DUMMY_CONSTANT_OBJ, "Ljava/lang/Long;") \
101 end_class \ 101 end_class \
102 start_class(HotSpotTargetMethod) \ 102 start_class(HotSpotTargetMethod) \
103 oop_field(HotSpotTargetMethod, targetMethod, "Lcom/oracle/max/cri/ci/CiTargetMethod;") \ 103 oop_field(HotSpotTargetMethod, targetMethod, "Lcom/oracle/graal/api/code/CiTargetMethod;") \
104 oop_field(HotSpotTargetMethod, method, "Lcom/oracle/graal/hotspot/ri/HotSpotMethodResolved;") \ 104 oop_field(HotSpotTargetMethod, method, "Lcom/oracle/graal/hotspot/ri/HotSpotMethodResolved;") \
105 oop_field(HotSpotTargetMethod, name, "Ljava/lang/String;") \ 105 oop_field(HotSpotTargetMethod, name, "Ljava/lang/String;") \
106 oop_field(HotSpotTargetMethod, sites, "[Lcom/oracle/max/cri/ci/CiTargetMethod$Site;") \ 106 oop_field(HotSpotTargetMethod, sites, "[Lcom/oracle/graal/api/code/CiTargetMethod$Site;") \
107 oop_field(HotSpotTargetMethod, exceptionHandlers, "[Lcom/oracle/max/cri/ci/CiTargetMethod$ExceptionHandler;") \ 107 oop_field(HotSpotTargetMethod, exceptionHandlers, "[Lcom/oracle/graal/api/code/CiTargetMethod$ExceptionHandler;") \
108 end_class \ 108 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) \
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") \
120 oop_field(CiTargetMethod, assumptions, "Lcom/oracle/max/cri/ci/CiAssumptions;") \ 120 oop_field(CiTargetMethod, assumptions, "Lcom/oracle/graal/api/code/CiAssumptions;") \
121 int_field(CiTargetMethod, targetCodeSize) \ 121 int_field(CiTargetMethod, targetCodeSize) \
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/graal/api/code/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/graal/api/meta/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) \
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/graal/api/code/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/graal/api/meta/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/graal/api/code/CiDebugInfo;") \
151 end_class \ 151 end_class \
152 start_class(CiTargetMethod_ExceptionHandler) \ 152 start_class(CiTargetMethod_ExceptionHandler) \
153 int_field(CiTargetMethod_ExceptionHandler, handlerPos) \ 153 int_field(CiTargetMethod_ExceptionHandler, handlerPos) \
154 end_class \ 154 end_class \
155 start_class(CiTargetMethod_Mark) \ 155 start_class(CiTargetMethod_Mark) \
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/graal/api/code/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/graal/api/code/CiCodePos;") \
161 oop_field(CiDebugInfo, registerRefMap, "Lcom/oracle/graal/api/meta/RiBitMap;") \ 161 oop_field(CiDebugInfo, registerRefMap, "Lcom/oracle/graal/api/meta/RiBitMap;") \
162 oop_field(CiDebugInfo, frameRefMap, "Lcom/oracle/graal/api/meta/RiBitMap;") \ 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) \
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/graal/api/code/CiCodePos;") \
180 oop_field(CiCodePos, method, "Lcom/oracle/graal/api/meta/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/graal/api/meta/RiKind;") \ 184 oop_field(CiConstant, kind, "Lcom/oracle/graal/api/meta/RiKind;") \
193 static_oop_field(CiKind, Short, "Lcom/oracle/graal/api/meta/RiKind;"); \ 193 static_oop_field(CiKind, Short, "Lcom/oracle/graal/api/meta/RiKind;"); \
194 static_oop_field(CiKind, Int, "Lcom/oracle/graal/api/meta/RiKind;"); \ 194 static_oop_field(CiKind, Int, "Lcom/oracle/graal/api/meta/RiKind;"); \
195 static_oop_field(CiKind, Long, "Lcom/oracle/graal/api/meta/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/graal/api/code/CiRuntimeCall;"); \
199 static_oop_field(CiRuntimeCall, RegisterFinalizer, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 199 static_oop_field(CiRuntimeCall, RegisterFinalizer, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \
200 static_oop_field(CiRuntimeCall, SetDeoptInfo, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 200 static_oop_field(CiRuntimeCall, SetDeoptInfo, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \
201 static_oop_field(CiRuntimeCall, CreateNullPointerException, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 201 static_oop_field(CiRuntimeCall, CreateNullPointerException, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \
202 static_oop_field(CiRuntimeCall, CreateOutOfBoundsException, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 202 static_oop_field(CiRuntimeCall, CreateOutOfBoundsException, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \
203 static_oop_field(CiRuntimeCall, JavaTimeMillis, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 203 static_oop_field(CiRuntimeCall, JavaTimeMillis, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \
204 static_oop_field(CiRuntimeCall, JavaTimeNanos, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 204 static_oop_field(CiRuntimeCall, JavaTimeNanos, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \
205 static_oop_field(CiRuntimeCall, Debug, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 205 static_oop_field(CiRuntimeCall, Debug, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \
206 static_oop_field(CiRuntimeCall, ArithmeticFrem, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 206 static_oop_field(CiRuntimeCall, ArithmeticFrem, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \
207 static_oop_field(CiRuntimeCall, ArithmeticDrem, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 207 static_oop_field(CiRuntimeCall, ArithmeticDrem, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \
208 static_oop_field(CiRuntimeCall, ArithmeticCos, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 208 static_oop_field(CiRuntimeCall, ArithmeticCos, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \
209 static_oop_field(CiRuntimeCall, ArithmeticTan, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 209 static_oop_field(CiRuntimeCall, ArithmeticTan, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \
210 static_oop_field(CiRuntimeCall, ArithmeticSin, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 210 static_oop_field(CiRuntimeCall, ArithmeticSin, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \
211 static_oop_field(CiRuntimeCall, Deoptimize, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 211 static_oop_field(CiRuntimeCall, Deoptimize, "Lcom/oracle/graal/api/code/CiRuntimeCall;"); \
212 static_oop_field(CiRuntimeCall, GenericCallback, "Lcom/oracle/max/cri/ci/CiRuntimeCall;"); \ 212 static_oop_field(CiRuntimeCall, GenericCallback, "Lcom/oracle/graal/api/code/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/graal/api/meta/RiKind;") \ 217 oop_field(CiValue, kind, "Lcom/oracle/graal/api/meta/RiKind;") \
218 static_oop_field(CiValue, IllegalValue, "Lcom/oracle/graal/api/meta/RiValue;"); \ 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/graal/api/code/CiRegister;") \
222 end_class \ 222 end_class \
223 start_class(CiRegister) \ 223 start_class(CiRegister) \
224 int_field(CiRegister, number) \ 224 int_field(CiRegister, number) \
225 end_class \ 225 end_class \
226 start_class(CiStackSlot) \ 226 start_class(CiStackSlot) \