Mercurial > hg > truffle
comparison src/share/vm/classfile/vmSymbols.hpp @ 12356:359f7e70ae7f
Reduce HotSpot diff and fix previous merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 15:41:33 +0200 |
parents | cefad50507d8 |
children | f87c68d79f07 |
comparison
equal
deleted
inserted
replaced
12355:cefad50507d8 | 12356:359f7e70ae7f |
---|---|
393 template(initialize_name, "initialize") \ | 393 template(initialize_name, "initialize") \ |
394 template(getInstance_signature, "()Lcom/oracle/graal/hotspot/HotSpotGraalRuntime;") \ | 394 template(getInstance_signature, "()Lcom/oracle/graal/hotspot/HotSpotGraalRuntime;") \ |
395 template(forObject_name, "forObject") \ | 395 template(forObject_name, "forObject") \ |
396 template(callbackInternal_name, "callbackInternal") \ | 396 template(callbackInternal_name, "callbackInternal") \ |
397 template(callback_signature, "(Ljava/lang/Object;)Ljava/lang/Object;") \ | 397 template(callback_signature, "(Ljava/lang/Object;)Ljava/lang/Object;") \ |
398 /* graal.api.interpreter */ \ | |
399 template(com_oracle_graal_api_interpreter_Interpreter, "com/oracle/graal/api/interpreter/Interpreter") \ | |
400 template(interpreter_execute_name, "execute") \ | |
401 template(interpreter_execute_signature, "(Lcom/oracle/graal/api/meta/ResolvedJavaMethod;[Ljava/lang/Object;)Ljava/lang/Object;") \ | |
402 \ | |
403 \ | |
404 \ | 398 \ |
405 /* common method and field names */ \ | 399 /* common method and field names */ \ |
406 template(object_initializer_name, "<init>") \ | 400 template(object_initializer_name, "<init>") \ |
407 template(class_initializer_name, "<clinit>") \ | 401 template(class_initializer_name, "<clinit>") \ |
408 template(println_name, "println") \ | 402 template(println_name, "println") \ |