Mercurial > hg > truffle
changeset 19794:00c4aa355659
Simplify STATIC_PRIMITIVE_FIELD macro
| author | Tom Rodriguez <tom.rodriguez@oracle.com> |
|---|---|
| date | Wed, 11 Mar 2015 16:06:35 -0700 |
| parents | 9cfcbadec537 |
| children | 3362ba500371 |
| files | src/share/vm/graal/graalJavaAccess.hpp |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/graal/graalJavaAccess.hpp Wed Mar 11 21:01:10 2015 +0100 +++ b/src/share/vm/graal/graalJavaAccess.hpp Wed Mar 11 16:06:35 2015 -0700 @@ -317,21 +317,21 @@ oop_store((oop*)addr, x); \ } \ } -#define STATIC_PRIMITIVE_FIELD(klassName, name, typename, jtypename, boolCompare) \ +#define STATIC_PRIMITIVE_FIELD(klassName, name, jtypename) \ static int _##name##_offset; \ - static typename name() { \ + static jtypename name() { \ InstanceKlass* ik = InstanceKlass::cast(klassName::klass()); \ address addr = ik->static_field_addr(_##name##_offset - InstanceMirrorKlass::offset_of_static_fields()); \ - return *((jtypename *)addr) boolCompare; \ + return *((jtypename *)addr); \ } \ - static void set_##name(typename x) { \ + static void set_##name(jtypename x) { \ InstanceKlass* ik = InstanceKlass::cast(klassName::klass()); \ address addr = ik->static_field_addr(_##name##_offset - InstanceMirrorKlass::offset_of_static_fields()); \ *((jtypename *)addr) = x; \ } -#define STATIC_INT_FIELD(klassName, name) STATIC_PRIMITIVE_FIELD(klassName, name, int, jint,) -#define STATIC_BOOLEAN_FIELD(klassName, name) STATIC_PRIMITIVE_FIELD(klassName, name, bool, jboolean, != 0) +#define STATIC_INT_FIELD(klassName, name) STATIC_PRIMITIVE_FIELD(klassName, name, jint) +#define STATIC_BOOLEAN_FIELD(klassName, name) STATIC_PRIMITIVE_FIELD(klassName, name, jboolean) COMPILER_CLASSES_DO(START_CLASS, END_CLASS, CHAR_FIELD, INT_FIELD, BOOLEAN_FIELD, LONG_FIELD, FLOAT_FIELD, OOP_FIELD, TYPEARRAYOOP_FIELD, OBJARRAYOOP_FIELD, STATIC_OOP_FIELD, STATIC_INT_FIELD, STATIC_BOOLEAN_FIELD) #undef START_CLASS