comparison src/share/vm/classfile/vmSymbols.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 8872bc0eebdf
children 120820e30baa
comparison
equal deleted inserted replaced
5553:511612d1b5c1 5554:70f715dfbb41
265 template(setTargetVolatile_name, "setTargetVolatile") \ 265 template(setTargetVolatile_name, "setTargetVolatile") \
266 template(setTarget_signature, "(Ljava/lang/invoke/MethodHandle;)V") \ 266 template(setTarget_signature, "(Ljava/lang/invoke/MethodHandle;)V") \
267 NOT_LP64( do_alias(intptr_signature, int_signature) ) \ 267 NOT_LP64( do_alias(intptr_signature, int_signature) ) \
268 LP64_ONLY( do_alias(intptr_signature, long_signature) ) \ 268 LP64_ONLY( do_alias(intptr_signature, long_signature) ) \
269 template(selectAlternative_signature, "(ZLjava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;") \ 269 template(selectAlternative_signature, "(ZLjava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;") \
270 \ 270 \
271 /* Support for Graal */ \ 271 /* Support for Graal */ \
272 template(com_oracle_graal_hotspot_bridge_VMToCompiler, "com/oracle/graal/hotspot/bridge/VMToCompiler") \ 272 template(java_util_BitSet, "java/util/BitSet") \
273 template(com_oracle_graal_hotspot_ri_HotSpotMethodResolved, "com/oracle/graal/hotspot/meta/HotSpotMethodResolvedImpl") \ 273 /* graal.hotspot */ \
274 template(com_oracle_graal_hotspot_HotSpotTargetMethod, "com/oracle/graal/hotspot/HotSpotTargetMethod") \ 274 template(com_oracle_graal_hotspot_HotSpotGraalRuntime, "com/oracle/graal/hotspot/HotSpotGraalRuntime") \
275 template(com_oracle_graal_hotspot_ri_HotSpotMethodData, "com/oracle/graal/hotspot/meta/HotSpotMethodData") \ 275 template(com_oracle_graal_hotspot_HotSpotKlassOop, "com/oracle/graal/hotspot/HotSpotKlassOop") \
276 template(com_oracle_graal_hotspot_HotSpotCodeInfo, "com/oracle/graal/hotspot/meta/HotSpotCodeInfo") \ 276 template(com_oracle_graal_hotspot_HotSpotOptions, "com/oracle/graal/hotspot/HotSpotOptions") \
277 template(com_oracle_graal_hotspot_HotSpotField, "com/oracle/graal/hotspot/meta/HotSpotField") \ 277 template(com_oracle_graal_hotspot_HotSpotProxy, "com/oracle/graal/hotspot/HotSpotProxy") \
278 template(com_oracle_graal_hotspot_HotSpotCompiledMethod, "com/oracle/graal/hotspot/meta/HotSpotCompiledMethod") \ 278 template(com_oracle_graal_hotspot_HotSpotTargetMethod, "com/oracle/graal/hotspot/HotSpotTargetMethod") \
279 template(com_oracle_graal_hotspot_HotSpotOptions, "com/oracle/graal/hotspot/HotSpotOptions") \ 279 template(com_oracle_graal_hotspot_bridge_VMToCompiler, "com/oracle/graal/hotspot/bridge/VMToCompiler") \
280 template(com_oracle_graal_hotspot_HotSpotTypeResolved, "com/oracle/graal/hotspot/meta/HotSpotTypeResolvedImpl") \ 280 template(com_oracle_graal_hotspot_meta_HotSpotCodeInfo, "com/oracle/graal/hotspot/meta/HotSpotCodeInfo") \
281 template(com_oracle_graal_hotspot_HotSpotType, "com/oracle/graal/hotspot/meta/HotSpotType") \ 281 template(com_oracle_graal_hotspot_meta_HotSpotCompiledMethod, "com/oracle/graal/hotspot/meta/HotSpotCompiledMethod") \
282 template(com_oracle_graal_hotspot_HotSpotKlassOop, "com/oracle/graal/hotspot/meta/HotSpotKlassOop") \ 282 template(com_oracle_graal_hotspot_meta_HotSpotJavaType, "com/oracle/graal/hotspot/meta/HotSpotJavaType") \
283 template(com_oracle_graal_hotspot_HotSpotProxy, "com/oracle/graal/hotspot/HotSpotProxy") \ 283 template(com_oracle_graal_hotspot_meta_HotSpotMethodData, "com/oracle/graal/hotspot/meta/HotSpotMethodData") \
284 template(com_oracle_graal_hotspot_CompilerImpl, "com/oracle/graal/hotspot/HotSpotGraalRuntime") \ 284 template(com_oracle_graal_hotspot_meta_HotSpotResolvedJavaField, "com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField") \
285 template(com_oracle_max_cri_ri_RiMethod, "com/oracle/graal/api/meta/JavaMethod") \ 285 template(com_oracle_graal_hotspot_meta_HotSpotResolvedJavaMethod, "com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod") \
286 template(com_oracle_max_cri_ri_RiResolvedField, "com/oracle/graal/api/meta/ResolvedJavaField") \ 286 template(com_oracle_graal_hotspot_meta_HotSpotResolvedJavaType, "com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType") \
287 template(com_oracle_max_cri_ri_RiType, "com/oracle/graal/api/meta/JavaType") \ 287 /* graal.api.meta */ \
288 template(com_oracle_max_cri_ri_RiConstantPool, "com/oracle/graal/api/meta/ConstantPool") \ 288 template(com_oracle_graal_api_meta_Constant, "com/oracle/graal/api/meta/Constant") \
289 template(com_oracle_max_cri_ri_RiExceptionHandler, "com/oracle/graal/api/meta/ExceptionHandler") \ 289 template(com_oracle_graal_api_meta_ConstantPool, "com/oracle/graal/api/meta/ConstantPool") \
290 template(com_oracle_max_cri_ci_CiAssumptions, "com/oracle/graal/api/code/Assumptions") \ 290 template(com_oracle_graal_api_meta_ExceptionHandler, "com/oracle/graal/api/meta/ExceptionHandler") \
291 template(com_oracle_max_cri_ci_CiAssumptions_MethodContents, "com/oracle/graal/api/code/Assumptions$MethodContents") \ 291 template(com_oracle_graal_api_meta_JavaMethod, "com/oracle/graal/api/meta/JavaMethod") \
292 template(com_oracle_max_cri_ci_CiAssumptions_ConcreteSubtype, "com/oracle/graal/api/code/Assumptions$ConcreteSubtype") \ 292 template(com_oracle_graal_api_meta_JavaType, "com/oracle/graal/api/meta/JavaType") \
293 template(com_oracle_max_cri_ci_CiAssumptions_ConcreteMethod, "com/oracle/graal/api/code/Assumptions$ConcreteMethod") \ 293 template(com_oracle_graal_api_meta_Kind, "com/oracle/graal/api/meta/Kind") \
294 template(com_oracle_max_cri_ci_CiGenericCallback, "com/oracle/graal/api/code/GenericCallback") \ 294 template(com_oracle_graal_api_meta_ResolvedJavaField, "com/oracle/graal/api/meta/ResolvedJavaField") \
295 template(com_oracle_max_cri_ci_CiTargetMethod, "com/oracle/graal/api/code/CompilationResult") \ 295 template(com_oracle_graal_api_meta_Value, "com/oracle/graal/api/meta/Value") \
296 template(com_oracle_max_cri_ci_CiTargetMethod_Site, "com/oracle/graal/api/code/CompilationResult$Site") \ 296 /* graal.api.code */ \
297 template(com_oracle_max_cri_ci_CiTargetMethod_Call, "com/oracle/graal/api/code/CompilationResult$Call") \ 297 template(com_oracle_graal_api_code_Assumptions, "com/oracle/graal/api/code/Assumptions") \
298 template(com_oracle_max_cri_ci_CiTargetMethod_DataPatch, "com/oracle/graal/api/code/CompilationResult$DataPatch") \ 298 template(com_oracle_graal_api_code_Assumptions_MethodContents, "com/oracle/graal/api/code/Assumptions$MethodContents") \
299 template(com_oracle_max_cri_ci_CiTargetMethod_Safepoint, "com/oracle/graal/api/code/CompilationResult$Safepoint") \ 299 template(com_oracle_graal_api_code_Assumptions_ConcreteSubtype, "com/oracle/graal/api/code/Assumptions$ConcreteSubtype") \
300 template(com_oracle_max_cri_ci_CiTargetMethod_ExceptionHandler, "com/oracle/graal/api/code/CompilationResult$ExceptionHandler") \ 300 template(com_oracle_graal_api_code_Assumptions_ConcreteMethod, "com/oracle/graal/api/code/Assumptions$ConcreteMethod") \
301 template(com_oracle_max_cri_ci_CiTargetMethod_Mark, "com/oracle/graal/api/code/CompilationResult$Mark") \ 301 template(com_oracle_graal_api_code_GenericCallback, "com/oracle/graal/api/code/GenericCallback") \
302 template(com_oracle_max_cri_ci_CiBitMap, "java/util/BitSet") \ 302 template(com_oracle_graal_api_code_InstalledCode, "com/oracle/graal/api/code/CompilationResult") \
303 template(com_oracle_max_cri_ci_CiDebugInfo, "com/oracle/graal/api/code/DebugInfo") \ 303 template(com_oracle_graal_api_code_InstalledCode_Call, "com/oracle/graal/api/code/CompilationResult$Call") \
304 template(com_oracle_max_cri_ci_CiFrame, "com/oracle/graal/api/code/BytecodeFrame") \ 304 template(com_oracle_graal_api_code_InstalledCode_DataPatch, "com/oracle/graal/api/code/CompilationResult$DataPatch") \
305 template(com_oracle_max_cri_ci_CiValue, "com/oracle/graal/api/meta/Value") \ 305 template(com_oracle_graal_api_code_InstalledCode_ExceptionHandler, "com/oracle/graal/api/code/CompilationResult$ExceptionHandler") \
306 template(com_oracle_max_cri_ci_CiStackSlot, "com/oracle/graal/api/code/StackSlot") \ 306 template(com_oracle_graal_api_code_InstalledCode_Mark, "com/oracle/graal/api/code/CompilationResult$Mark") \
307 template(com_oracle_max_cri_ci_CiRegisterValue, "com/oracle/graal/api/code/RegisterValue") \ 307 template(com_oracle_graal_api_code_InstalledCode_Safepoint, "com/oracle/graal/api/code/CompilationResult$Safepoint") \
308 template(com_oracle_max_cri_ci_CiRegister, "com/oracle/graal/api/code/Register") \ 308 template(com_oracle_graal_api_code_InstalledCode_Site, "com/oracle/graal/api/code/CompilationResult$Site") \
309 template(com_oracle_max_cri_ci_CiCodePos, "com/oracle/graal/api/code/BytecodePosition") \ 309 template(com_oracle_graal_api_code_BytecodeFrame, "com/oracle/graal/api/code/BytecodeFrame") \
310 template(com_oracle_max_cri_ci_CiConstant, "com/oracle/graal/api/meta/Constant") \ 310 template(com_oracle_graal_api_code_BytecodePosition, "com/oracle/graal/api/code/BytecodePosition") \
311 template(com_oracle_max_cri_ci_CiVirtualObject, "com/oracle/graal/api/code/VirtualObject") \ 311 template(com_oracle_graal_api_code_DebugInfo, "com/oracle/graal/api/code/DebugInfo") \
312 template(com_oracle_max_cri_ci_CiMonitorValue, "com/oracle/graal/api/code/MonitorValue") \ 312 template(com_oracle_graal_api_code_MonitorValue, "com/oracle/graal/api/code/MonitorValue") \
313 template(com_oracle_max_cri_ci_CiKind, "com/oracle/graal/api/meta/Kind") \ 313 template(com_oracle_graal_api_code_Register, "com/oracle/graal/api/code/Register") \
314 template(com_oracle_max_cri_ci_CiRuntimeCall, "com/oracle/graal/api/code/RuntimeCall") \ 314 template(com_oracle_graal_api_code_RegisterValue, "com/oracle/graal/api/code/RegisterValue") \
315 template(startCompiler_name, "startCompiler") \ 315 template(com_oracle_graal_api_code_RuntimeCall, "com/oracle/graal/api/code/RuntimeCall") \
316 template(bootstrap_name, "bootstrap") \ 316 template(com_oracle_graal_api_code_StackSlot, "com/oracle/graal/api/code/StackSlot") \
317 template(shutdownCompiler_name, "shutdownCompiler") \ 317 template(com_oracle_graal_api_code_VirtualObject, "com/oracle/graal/api/code/VirtualObject") \
318 template(compileMethod_name, "compileMethod") \ 318 template(startCompiler_name, "startCompiler") \
319 template(compileMethod_signature, "(Lcom/oracle/graal/hotspot/meta/HotSpotMethodResolved;IZI)Z") \ 319 template(bootstrap_name, "bootstrap") \
320 template(setOption_name, "setOption") \ 320 template(shutdownCompiler_name, "shutdownCompiler") \
321 template(setDefaultOptions_name, "setDefaultOptions") \ 321 template(compileMethod_name, "compileMethod") \
322 template(setOption_signature, "(Ljava/lang/String;)Z") \ 322 template(compileMethod_signature, "(Lcom/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod;IZI)Z") \
323 template(createRiMethodResolved_name, "createRiMethodResolved") \ 323 template(setOption_name, "setOption") \
324 template(createRiMethodResolved_signature, "(JLjava/lang/String;)Lcom/oracle/graal/api/meta/JavaMethod;") \ 324 template(setDefaultOptions_name, "setDefaultOptions") \
325 template(createRiMethodUnresolved_name, "createRiMethodUnresolved") \ 325 template(setOption_signature, "(Ljava/lang/String;)Z") \
326 template(createRiMethodUnresolved_signature, "(Ljava/lang/String;Ljava/lang/String;Lcom/oracle/graal/api/meta/JavaType;)Lcom/oracle/graal/api/meta/JavaMethod;") \ 326 template(createResolvedJavaMethod_name, "createResolvedJavaMethod") \
327 template(createRiSignature_name, "createRiSignature") \ 327 template(createResolvedJavaMethod_signature, "(JLjava/lang/String;)Lcom/oracle/graal/api/meta/JavaMethod;") \
328 template(createRiSignature_signature, "(Ljava/lang/String;)Lcom/oracle/graal/api/meta/Signature;") \ 328 template(createJavaMethod_name, "createJavaMethod") \
329 template(createRiField_name, "createRiField") \ 329 template(createJavaMethod_signature, "(Ljava/lang/String;Ljava/lang/String;Lcom/oracle/graal/api/meta/JavaType;)Lcom/oracle/graal/api/meta/JavaMethod;") \
330 template(createRiField_signature, "(Lcom/oracle/graal/api/meta/JavaType;Ljava/lang/String;Lcom/oracle/graal/api/meta/JavaType;II)Lcom/oracle/graal/api/meta/JavaField;") \ 330 template(createSignature_name, "createSignature") \
331 template(createRiType_name, "createRiType") \ 331 template(createSignature_signature, "(Ljava/lang/String;)Lcom/oracle/graal/api/meta/Signature;") \
332 template(createRiType_signature, "(JLjava/lang/String;)Lcom/oracle/graal/api/meta/JavaType;") \ 332 template(createJavaField_name, "createJavaField") \
333 template(createRiTypePrimitive_name, "createRiTypePrimitive") \ 333 template(createJavaField_signature, "(Lcom/oracle/graal/api/meta/JavaType;Ljava/lang/String;Lcom/oracle/graal/api/meta/JavaType;II)Lcom/oracle/graal/api/meta/JavaField;") \
334 template(createRiTypePrimitive_signature, "(I)Lcom/oracle/graal/api/meta/JavaType;") \ 334 template(createJavaType_name, "createJavaType") \
335 template(createRiTypeUnresolved_name, "createRiTypeUnresolved") \ 335 template(createJavaType_signature, "(Ljava/lang/String;)Lcom/oracle/graal/api/meta/JavaType;") \
336 template(createRiTypeUnresolved_signature, "(Ljava/lang/String;)Lcom/oracle/graal/api/meta/JavaType;") \ 336 template(createPrimitiveJavaType_name, "createPrimitiveJavaType") \
337 template(createCiConstant_name, "createCiConstant") \ 337 template(createPrimitiveJavaType_signature, "(I)Lcom/oracle/graal/api/meta/JavaType;") \
338 template(createCiConstant_signature, "(Lcom/oracle/graal/api/meta/Kind;J)Lcom/oracle/graal/api/meta/Constant;") \ 338 template(createConstant_name, "createConstant") \
339 template(createCiConstantFloat_name, "createCiConstantFloat") \ 339 template(createConstant_signature, "(Lcom/oracle/graal/api/meta/Kind;J)Lcom/oracle/graal/api/meta/Constant;") \
340 template(createCiConstantFloat_signature, "(F)Lcom/oracle/graal/api/meta/Constant;") \ 340 template(createConstantFloat_name, "createConstantFloat") \
341 template(createCiConstantDouble_name, "createCiConstantDouble") \ 341 template(createConstantFloat_signature, "(F)Lcom/oracle/graal/api/meta/Constant;") \
342 template(createCiConstantDouble_signature, "(D)Lcom/oracle/graal/api/meta/Constant;") \ 342 template(createConstantDouble_name, "createConstantDouble") \
343 template(createCiConstantObject_name, "createCiConstantObject") \ 343 template(createConstantDouble_signature, "(D)Lcom/oracle/graal/api/meta/Constant;") \
344 template(createCiConstantObject_signature, "(Ljava/lang/Object;)Lcom/oracle/graal/api/meta/Constant;") \ 344 template(createConstantObject_name, "createConstantObject") \
345 template(getVMToCompiler_name, "getVMToCompiler") \ 345 template(createConstantObject_signature, "(Ljava/lang/Object;)Lcom/oracle/graal/api/meta/Constant;") \
346 template(getVMToCompiler_signature, "()Lcom/oracle/graal/hotspot/bridge/VMToCompiler;") \ 346 template(getVMToCompiler_name, "getVMToCompiler") \
347 template(getInstance_name, "getInstance") \ 347 template(getVMToCompiler_signature, "()Lcom/oracle/graal/hotspot/bridge/VMToCompiler;") \
348 template(initialize_name, "initialize") \ 348 template(getInstance_name, "getInstance") \
349 template(getInstance_signature, "()Lcom/oracle/graal/hotspot/HotSpotGraalRuntime;") \ 349 template(initialize_name, "initialize") \
350 template(forObject_name, "forObject") \ 350 template(getInstance_signature, "()Lcom/oracle/graal/hotspot/HotSpotGraalRuntime;") \
351 template(callbackInternal_name, "callbackInternal") \ 351 template(forObject_name, "forObject") \
352 template(callback_signature, "(Ljava/lang/Object;)Ljava/lang/Object;") \ 352 template(callbackInternal_name, "callbackInternal") \
353 template(MethodInvalidatedException, "com/oracle/graal/api/meta/InstalledCode$MethodInvalidatedException") \ 353 template(callback_signature, "(Ljava/lang/Object;)Ljava/lang/Object;") \
354 \ 354 template(MethodInvalidatedException, "com/oracle/graal/api/meta/InstalledCode$MethodInvalidatedException") \
355 \
355 \ 356 \
356 /* common method and field names */ \ 357 /* common method and field names */ \
357 template(object_initializer_name, "<init>") \ 358 template(object_initializer_name, "<init>") \
358 template(class_initializer_name, "<clinit>") \ 359 template(class_initializer_name, "<clinit>") \
359 template(println_name, "println") \ 360 template(println_name, "println") \