Mercurial > hg > truffle
changeset 19772:b3f566135b56
Fix broken windows build.
| author | Christian Humer <christian.humer@gmail.com> |
|---|---|
| date | Wed, 11 Mar 2015 15:44:32 +0100 |
| parents | b249bdba508b |
| children | e66a6f8d63e3 |
| files | src/share/vm/graal/graalJavaAccess.hpp |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/graal/graalJavaAccess.hpp Wed Mar 11 15:44:32 2015 +0100 +++ b/src/share/vm/graal/graalJavaAccess.hpp Wed Mar 11 15:44:32 2015 +0100 @@ -317,20 +317,21 @@ oop_store((oop*)addr, x); \ } \ } -#define STATIC_PRIMITIVE_FIELD(klassName, name, typename, jtypename) \ +#define STATIC_PRIMITIVE_FIELD(klassName, name, typename, jtypename, boolCompare) \ static int _##name##_offset; \ static typename name() { \ InstanceKlass* ik = InstanceKlass::cast(klassName::klass()); \ address addr = ik->static_field_addr(_##name##_offset - InstanceMirrorKlass::offset_of_static_fields()); \ - return *((jtypename *)addr); \ + return *((jtypename *)addr) boolCompare; \ } \ static void set_##name(typename 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) + +#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) 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