From 4182ddbf8aca6b667627fd88fcbed404ef3deb2a Mon Sep 17 00:00:00 2001 From: Christian Thalinger Date: Tue, 15 Apr 2008 17:22:58 +0200 Subject: [PATCH] * src/vmcore/field.h (fieldinfo): Renamed class to clazz. * src/native/vm/reflect.c, src/vm/access.c, src/vm/jit/alpha/codegen.c, src/vm/jit/alpha/patcher.c, src/vm/jit/arm/codegen.c, src/vm/jit/arm/patcher.c, src/vm/jit/i386/codegen.c, src/vm/jit/i386/patcher.c, src/vm/jit/intrp/codegen.c, src/vm/jit/intrp/disass.c, src/vm/jit/intrp/patcher.c, src/vm/jit/m68k/codegen.c, src/vm/jit/m68k/patcher.c, src/vm/jit/mips/codegen.c, src/vm/jit/mips/patcher.c, src/vm/jit/powerpc/codegen.c, src/vm/jit/powerpc/patcher.c, src/vm/jit/powerpc64/codegen.c, src/vm/jit/powerpc64/patcher.c, src/vm/jit/python.c, src/vm/jit/s390/codegen.c, src/vm/jit/s390/patcher.c, src/vm/jit/sparc64/codegen.c, src/vm/jit/sparc64/patcher.c, src/vm/jit/verify/typecheck-fields.inc, src/vm/jit/x86_64/codegen.c, src/vm/jit/x86_64/patcher.c, src/vm/resolve.c, src/vmcore/annotation.c, src/vmcore/field.c, src/vmcore/references.h: Likewise. --- src/native/vm/reflect.c | 6 +++--- src/vm/access.c | 8 ++++---- src/vm/jit/alpha/codegen.c | 12 ++++++------ src/vm/jit/alpha/patcher.c | 4 ++-- src/vm/jit/arm/codegen.c | 8 ++++---- src/vm/jit/arm/patcher.c | 4 ++-- src/vm/jit/i386/codegen.c | 12 ++++++------ src/vm/jit/i386/patcher.c | 4 ++-- src/vm/jit/intrp/codegen.c | 16 ++++++++-------- src/vm/jit/intrp/disass.c | 2 +- src/vm/jit/intrp/patcher.c | 8 ++++---- src/vm/jit/m68k/codegen.c | 8 ++++---- src/vm/jit/m68k/patcher.c | 4 ++-- src/vm/jit/mips/codegen.c | 12 ++++++------ src/vm/jit/mips/patcher.c | 4 ++-- src/vm/jit/powerpc/codegen.c | 8 ++++---- src/vm/jit/powerpc/patcher.c | 4 ++-- src/vm/jit/powerpc64/codegen.c | 8 ++++---- src/vm/jit/powerpc64/patcher.c | 4 ++-- src/vm/jit/python.c | 2 +- src/vm/jit/s390/codegen.c | 8 ++++---- src/vm/jit/s390/patcher.c | 6 +++--- src/vm/jit/sparc64/codegen.c | 12 ++++++------ src/vm/jit/sparc64/patcher.c | 4 ++-- src/vm/jit/verify/typecheck-fields.inc | 4 ++-- src/vm/jit/x86_64/codegen.c | 12 ++++++------ src/vm/jit/x86_64/patcher.c | 4 ++-- src/vm/resolve.c | 6 +++--- src/vmcore/annotation.c | 6 +++--- src/vmcore/field.c | 8 ++++---- src/vmcore/field.h | 8 +++----- src/vmcore/references.h | 2 +- 32 files changed, 108 insertions(+), 110 deletions(-) diff --git a/src/native/vm/reflect.c b/src/native/vm/reflect.c index c62382e47..156bc097f 100644 --- a/src/native/vm/reflect.c +++ b/src/native/vm/reflect.c @@ -175,7 +175,7 @@ java_lang_reflect_Field *reflect_field_new(fieldinfo *f) /* Calculate the slot. */ - slot = f - f->class->fields; + slot = f - f->clazz->fields; #if defined(WITH_CLASSPATH_GNU) @@ -195,7 +195,7 @@ java_lang_reflect_Field *reflect_field_new(fieldinfo *f) /* Set the Java object fields. */ - LLNI_field_set_cls(rvmf, clazz, f->class); + LLNI_field_set_cls(rvmf, clazz, f->clazz); /* The name needs to be interned */ /* XXX implement me better! */ @@ -208,7 +208,7 @@ java_lang_reflect_Field *reflect_field_new(fieldinfo *f) /* Set the Java object fields. */ - LLNI_field_set_cls(rf, clazz, f->class); + LLNI_field_set_cls(rf, clazz, f->clazz); /* The name needs to be interned */ /* XXX implement me better! */ diff --git a/src/vm/access.c b/src/vm/access.c index 2b6f64f86..c0d1ca816 100644 --- a/src/vm/access.c +++ b/src/vm/access.c @@ -215,7 +215,7 @@ bool access_check_field(fieldinfo *f, int callerdepth) /* If everything is public, there is nothing to check. */ - if ((f->class->flags & ACC_PUBLIC) && (f->flags & ACC_PUBLIC)) + if ((f->clazz->flags & ACC_PUBLIC) && (f->flags & ACC_PUBLIC)) return true; /* Get the caller's class. */ @@ -227,9 +227,9 @@ bool access_check_field(fieldinfo *f, int callerdepth) /* Check access rights. */ - if (!access_is_accessible_member(callerclass, f->class, f->flags)) { + if (!access_is_accessible_member(callerclass, f->clazz, f->flags)) { msglen = - utf_bytes(f->class->name) + + utf_bytes(f->clazz->name) + strlen(".") + utf_bytes(f->name) + strlen(" not accessible from ") + @@ -238,7 +238,7 @@ bool access_check_field(fieldinfo *f, int callerdepth) msg = MNEW(char, msglen); - utf_copy_classname(msg, f->class->name); + utf_copy_classname(msg, f->clazz->name); strcat(msg, "."); utf_cat_classname(msg, f->name); strcat(msg, " not accessible from "); diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c index 6e10c766b..28775f76b 100644 --- a/src/vm/jit/alpha/codegen.c +++ b/src/vm/jit/alpha/codegen.c @@ -1784,8 +1784,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) - patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, 0); } @@ -1829,8 +1829,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) - patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, 0); } @@ -1875,8 +1875,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) - patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, 0); } diff --git a/src/vm/jit/alpha/patcher.c b/src/vm/jit/alpha/patcher.c index ebdd35358..f990bbe99 100644 --- a/src/vm/jit/alpha/patcher.c +++ b/src/vm/jit/alpha/patcher.c @@ -217,8 +217,8 @@ bool patcher_get_putstatic(patchref_t *pr) /* check if the field's class is initialized */ - if (!(fi->class->state & CLASS_INITIALIZED)) - if (!initialize_class(fi->class)) + if (!(fi->clazz->state & CLASS_INITIALIZED)) + if (!initialize_class(fi->clazz)) return false; PATCH_BACK_ORIGINAL_MCODE; diff --git a/src/vm/jit/arm/codegen.c b/src/vm/jit/arm/codegen.c index 078664f23..00a37a242 100644 --- a/src/vm/jit/arm/codegen.c +++ b/src/vm/jit/arm/codegen.c @@ -1383,9 +1383,9 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) { + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) { patcher_add_patch_ref(jd, PATCHER_initialize_class, - fi->class, 0); + fi->clazz, 0); } } @@ -1436,9 +1436,9 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) { + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) { patcher_add_patch_ref(jd, PATCHER_initialize_class, - fi->class, 0); + fi->clazz, 0); } } diff --git a/src/vm/jit/arm/patcher.c b/src/vm/jit/arm/patcher.c index 0aad1ca2c..84e8287c5 100644 --- a/src/vm/jit/arm/patcher.c +++ b/src/vm/jit/arm/patcher.c @@ -104,8 +104,8 @@ bool patcher_get_putstatic(patchref_t *pr) /* check if the field's class is initialized */ - if (!(fi->class->state & CLASS_INITIALIZED)) - if (!initialize_class(fi->class)) + if (!(fi->clazz->state & CLASS_INITIALIZED)) + if (!initialize_class(fi->clazz)) return false; PATCH_BACK_ORIGINAL_MCODE; diff --git a/src/vm/jit/i386/codegen.c b/src/vm/jit/i386/codegen.c index 22f4aae67..a1a642166 100644 --- a/src/vm/jit/i386/codegen.c +++ b/src/vm/jit/i386/codegen.c @@ -2193,8 +2193,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = (intptr_t) fi->value; - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) - patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, 0); + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, 0); } M_MOV_IMM(disp, REG_ITMP1); @@ -2234,8 +2234,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = (intptr_t) fi->value; - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) - patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, 0); + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, 0); } M_MOV_IMM(disp, REG_ITMP1); @@ -2276,8 +2276,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = (intptr_t) fi->value; - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) - patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, 0); + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, 0); } M_MOV_IMM(disp, REG_ITMP1); diff --git a/src/vm/jit/i386/patcher.c b/src/vm/jit/i386/patcher.c index e311ca110..661c245e4 100644 --- a/src/vm/jit/i386/patcher.c +++ b/src/vm/jit/i386/patcher.c @@ -91,8 +91,8 @@ bool patcher_get_putstatic(patchref_t *pr) /* check if the field's class is initialized */ - if (!(fi->class->state & CLASS_INITIALIZED)) - if (!initialize_class(fi->class)) + if (!(fi->clazz->state & CLASS_INITIALIZED)) + if (!initialize_class(fi->clazz)) return false; PATCH_BACK_ORIGINAL_MCODE; diff --git a/src/vm/jit/intrp/codegen.c b/src/vm/jit/intrp/codegen.c index 10c0b3850..6fe3cc727 100644 --- a/src/vm/jit/intrp/codegen.c +++ b/src/vm/jit/intrp/codegen.c @@ -1104,7 +1104,7 @@ dont_opt_IF_LCMPxx: case TYPE_INT: if (fi == NULL) gen_PATCHER_GETSTATIC_INT(cd, 0, uf); - else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) + else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) gen_PATCHER_GETSTATIC_CLINIT_INT(cd, 0, fi); else gen_GETSTATIC_INT(cd, (u1 *) &(fi->value.i), fi); @@ -1112,7 +1112,7 @@ dont_opt_IF_LCMPxx: case TYPE_FLT: if (fi == NULL) gen_PATCHER_GETSTATIC_FLOAT(cd, 0, uf); - else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) + else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) gen_PATCHER_GETSTATIC_CLINIT_FLOAT(cd, 0, fi); else gen_GETSTATIC_FLOAT(cd, (u1 *) &(fi->value.i), fi); @@ -1121,7 +1121,7 @@ dont_opt_IF_LCMPxx: case TYPE_DBL: if (fi == NULL) gen_PATCHER_GETSTATIC_LONG(cd, 0, uf); - else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) + else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) gen_PATCHER_GETSTATIC_CLINIT_LONG(cd, 0, fi); else gen_GETSTATIC_LONG(cd, (u1 *) &(fi->value.l), fi); @@ -1129,7 +1129,7 @@ dont_opt_IF_LCMPxx: case TYPE_ADR: if (fi == NULL) gen_PATCHER_GETSTATIC_CELL(cd, 0, uf); - else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) + else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) gen_PATCHER_GETSTATIC_CLINIT_CELL(cd, 0, fi); else gen_GETSTATIC_CELL(cd, (u1 *) &(fi->value.a), fi); @@ -1155,7 +1155,7 @@ dont_opt_IF_LCMPxx: case TYPE_INT: if (fi == NULL) gen_PATCHER_PUTSTATIC_INT(cd, 0, uf); - else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) + else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) gen_PATCHER_PUTSTATIC_CLINIT_INT(cd, 0, fi); else gen_PUTSTATIC_INT(cd, (u1 *) &(fi->value.i), fi); @@ -1163,7 +1163,7 @@ dont_opt_IF_LCMPxx: case TYPE_FLT: if (fi == NULL) gen_PATCHER_PUTSTATIC_FLOAT(cd, 0, uf); - else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) + else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) gen_PATCHER_PUTSTATIC_CLINIT_FLOAT(cd, 0, fi); else gen_PUTSTATIC_FLOAT(cd, (u1 *) &(fi->value.i), fi); @@ -1172,7 +1172,7 @@ dont_opt_IF_LCMPxx: case TYPE_DBL: if (fi == NULL) gen_PATCHER_PUTSTATIC_LONG(cd, 0, uf); - else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) + else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) gen_PATCHER_PUTSTATIC_CLINIT_LONG(cd, 0, fi); else gen_PUTSTATIC_LONG(cd, (u1 *) &(fi->value.l), fi); @@ -1180,7 +1180,7 @@ dont_opt_IF_LCMPxx: case TYPE_ADR: if (fi == NULL) gen_PATCHER_PUTSTATIC_CELL(cd, 0, uf); - else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) + else if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) gen_PATCHER_PUTSTATIC_CLINIT_CELL(cd, 0, fi); else gen_PUTSTATIC_CELL(cd, (u1 *) &(fi->value.a), fi); diff --git a/src/vm/jit/intrp/disass.c b/src/vm/jit/intrp/disass.c index a49918ac7..4219f0012 100644 --- a/src/vm/jit/intrp/disass.c +++ b/src/vm/jit/intrp/disass.c @@ -164,7 +164,7 @@ void printarg_af (functionptr af ) void printarg_afi (fieldinfo * afi ) { if (afi) { - utf_fprint_printable_ascii_classname(vm_out, afi->class->name); + utf_fprint_printable_ascii_classname(vm_out, afi->clazz->name); fprintf(vm_out, "."); utf_fprint_printable_ascii(vm_out, afi->name); utf_fprint_printable_ascii(vm_out, afi->descriptor); diff --git a/src/vm/jit/intrp/patcher.c b/src/vm/jit/intrp/patcher.c index 811005c8d..a8f7107b2 100644 --- a/src/vm/jit/intrp/patcher.c +++ b/src/vm/jit/intrp/patcher.c @@ -65,8 +65,8 @@ bool intrp_patcher_get_putstatic(u1 *sp) /* check if the field's class is initialized */ - if (!(fi->class->state & CLASS_INITIALIZED)) - if (!initialize_class(fi->class)) + if (!(fi->clazz->state & CLASS_INITIALIZED)) + if (!initialize_class(fi->clazz)) return false; /* patch the field's address */ @@ -98,8 +98,8 @@ bool intrp_patcher_get_putstatic_clinit(u1 *sp) /* check if the field's class is initialized */ - if (!(fi->class->state & CLASS_INITIALIZED)) - if (!initialize_class(fi->class)) + if (!(fi->clazz->state & CLASS_INITIALIZED)) + if (!initialize_class(fi->clazz)) return false; /* patch the field's address */ diff --git a/src/vm/jit/m68k/codegen.c b/src/vm/jit/m68k/codegen.c index ead85452b..0e622a328 100644 --- a/src/vm/jit/m68k/codegen.c +++ b/src/vm/jit/m68k/codegen.c @@ -1117,8 +1117,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = (intptr_t) fi->value; - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) { - patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) { + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, 0); } } @@ -1171,8 +1171,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = (intptr_t) fi->value; - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) - patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, 0); } diff --git a/src/vm/jit/m68k/patcher.c b/src/vm/jit/m68k/patcher.c index 47f1fc38a..71607c7f4 100644 --- a/src/vm/jit/m68k/patcher.c +++ b/src/vm/jit/m68k/patcher.c @@ -242,8 +242,8 @@ bool patcher_get_putstatic(patchref_t *pr) return false; /* check if the field's class is initialized */ - if (!(fi->class->state & CLASS_INITIALIZED)) - if (!initialize_class(fi->class)) + if (!(fi->clazz->state & CLASS_INITIALIZED)) + if (!initialize_class(fi->clazz)) return false; /* patch back original code */ diff --git a/src/vm/jit/mips/codegen.c b/src/vm/jit/mips/codegen.c index 24675ac35..2a4d10ad9 100644 --- a/src/vm/jit/mips/codegen.c +++ b/src/vm/jit/mips/codegen.c @@ -1975,9 +1975,9 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) patcher_add_patch_ref(jd, PATCHER_initialize_class, - fi->class, disp); + fi->clazz, disp); } M_ALD(REG_ITMP1, REG_PV, disp); @@ -2025,9 +2025,9 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) patcher_add_patch_ref(jd, PATCHER_initialize_class, - fi->class, disp); + fi->clazz, disp); } M_ALD(REG_ITMP1, REG_PV, disp); @@ -2074,9 +2074,9 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) patcher_add_patch_ref(jd, PATCHER_initialize_class, - fi->class, disp); + fi->clazz, disp); } M_ALD(REG_ITMP1, REG_PV, disp); diff --git a/src/vm/jit/mips/patcher.c b/src/vm/jit/mips/patcher.c index 81ab6f30b..ef4f476b7 100644 --- a/src/vm/jit/mips/patcher.c +++ b/src/vm/jit/mips/patcher.c @@ -96,8 +96,8 @@ bool patcher_get_putstatic(patchref_t *pr) /* check if the field's class is initialized */ - if (!(fi->class->state & CLASS_INITIALIZED)) - if (!initialize_class(fi->class)) + if (!(fi->clazz->state & CLASS_INITIALIZED)) + if (!initialize_class(fi->clazz)) return false; PATCH_BACK_ORIGINAL_MCODE; diff --git a/src/vm/jit/powerpc/codegen.c b/src/vm/jit/powerpc/codegen.c index 9f82e0317..f010d98f4 100644 --- a/src/vm/jit/powerpc/codegen.c +++ b/src/vm/jit/powerpc/codegen.c @@ -1498,9 +1498,9 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) patcher_add_patch_ref(jd, PATCHER_initialize_class, - fi->class, disp); + fi->clazz, disp); } M_ALD(REG_ITMP1, REG_PV, disp); @@ -1544,9 +1544,9 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) patcher_add_patch_ref(jd, PATCHER_initialize_class, - fi->class, disp); + fi->clazz, disp); } M_ALD(REG_ITMP1, REG_PV, disp); diff --git a/src/vm/jit/powerpc/patcher.c b/src/vm/jit/powerpc/patcher.c index 62c92e548..f87a1a99d 100644 --- a/src/vm/jit/powerpc/patcher.c +++ b/src/vm/jit/powerpc/patcher.c @@ -247,8 +247,8 @@ bool patcher_get_putstatic(patchref_t *pr) /* check if the field's class is initialized */ - if (!(fi->class->state & CLASS_INITIALIZED)) - if (!initialize_class(fi->class)) + if (!(fi->clazz->state & CLASS_INITIALIZED)) + if (!initialize_class(fi->clazz)) return false; PATCH_BACK_ORIGINAL_MCODE; diff --git a/src/vm/jit/powerpc64/codegen.c b/src/vm/jit/powerpc64/codegen.c index 9c0ef9f33..17967ebbb 100644 --- a/src/vm/jit/powerpc64/codegen.c +++ b/src/vm/jit/powerpc64/codegen.c @@ -1453,8 +1453,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) { - patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, disp); + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) { + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, disp); } } @@ -1500,8 +1500,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) { - patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, disp); + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) { + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, disp); } } diff --git a/src/vm/jit/powerpc64/patcher.c b/src/vm/jit/powerpc64/patcher.c index d8c279fd2..8f6f160ad 100644 --- a/src/vm/jit/powerpc64/patcher.c +++ b/src/vm/jit/powerpc64/patcher.c @@ -102,8 +102,8 @@ bool patcher_get_putstatic(patchref_t *pr) /* check if the field's class is initialized */ - if (!(fi->class->state & CLASS_INITIALIZED)) - if (!initialize_class(fi->class)) + if (!(fi->clazz->state & CLASS_INITIALIZED)) + if (!initialize_class(fi->clazz)) return false; /* patch back original code */ diff --git a/src/vm/jit/python.c b/src/vm/jit/python.c index 1467bf2f0..025c11f62 100644 --- a/src/vm/jit/python.c +++ b/src/vm/jit/python.c @@ -869,7 +869,7 @@ CLASS_FUNC(fieldinfo_func) { case F_NAME: return get_string(arg->get.result, fi->name->text); case F_KLASS: - return get_obj(arg->get.result, classinfo_func, state->root, fi->class); + return get_obj(arg->get.result, classinfo_func, state->root, fi->clazz); } } diff --git a/src/vm/jit/s390/codegen.c b/src/vm/jit/s390/codegen.c index 25e2c1983..f53b1427e 100644 --- a/src/vm/jit/s390/codegen.c +++ b/src/vm/jit/s390/codegen.c @@ -1999,10 +1999,10 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) { + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) { PROFILE_CYCLE_STOP; - patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, 0); + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, 0); PROFILE_CYCLE_START; } @@ -2051,9 +2051,9 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) { + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) { PROFILE_CYCLE_STOP; - patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->class, disp); + patcher_add_patch_ref(jd, PATCHER_initialize_class, fi->clazz, disp); PROFILE_CYCLE_START; } } diff --git a/src/vm/jit/s390/patcher.c b/src/vm/jit/s390/patcher.c index 766557b42..871bb311d 100644 --- a/src/vm/jit/s390/patcher.c +++ b/src/vm/jit/s390/patcher.c @@ -88,8 +88,8 @@ bool patcher_get_putstatic(patchref_t *pr) /* check if the field's class is initialized */ - if (!(fi->class->state & CLASS_INITIALIZED)) - if (!initialize_class(fi->class)) + if (!(fi->clazz->state & CLASS_INITIALIZED)) + if (!initialize_class(fi->clazz)) return false; PATCH_BACK_ORIGINAL_MCODE; @@ -281,7 +281,7 @@ bool patcher_invokeinterface(patchref_t *pr) /* get method offset */ off = - (s4) (sizeof(methodptr) * (m - m->clazz->methods)); + (s4) (sizeof(methodptr) * (m - m->class->methods)); ASSERT_VALID_DISP(off); diff --git a/src/vm/jit/sparc64/codegen.c b/src/vm/jit/sparc64/codegen.c index 14377f540..970101b85 100644 --- a/src/vm/jit/sparc64/codegen.c +++ b/src/vm/jit/sparc64/codegen.c @@ -1621,8 +1621,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) - codegen_add_patch_ref(cd, PATCHER_clinit, fi->class, disp); + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + codegen_add_patch_ref(cd, PATCHER_clinit, fi->clazz, disp); } M_ALD(REG_ITMP1, REG_PV, disp); @@ -1666,8 +1666,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) - codegen_add_patch_ref(cd, PATCHER_clinit, fi->class, disp); + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + codegen_add_patch_ref(cd, PATCHER_clinit, fi->clazz, disp); } M_ALD(REG_ITMP1, REG_PV, disp); @@ -1712,8 +1712,8 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) - codegen_add_patch_ref(cd, PATCHER_clinit, fi->class, disp); + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) + codegen_add_patch_ref(cd, PATCHER_clinit, fi->clazz, disp); } M_ALD(REG_ITMP1, REG_PV, disp); diff --git a/src/vm/jit/sparc64/patcher.c b/src/vm/jit/sparc64/patcher.c index 9956d6246..576e710c9 100644 --- a/src/vm/jit/sparc64/patcher.c +++ b/src/vm/jit/sparc64/patcher.c @@ -191,8 +191,8 @@ bool patcher_get_putstatic(u1 *sp) /* check if the field's class is initialized */ - if (!(fi->class->state & CLASS_INITIALIZED)) - if (!initialize_class(fi->class)) + if (!(fi->clazz->state & CLASS_INITIALIZED)) + if (!initialize_class(fi->clazz)) return false; /* patch the field value's address */ diff --git a/src/vm/jit/verify/typecheck-fields.inc b/src/vm/jit/verify/typecheck-fields.inc index 0de654279..9bd5df526 100644 --- a/src/vm/jit/verify/typecheck-fields.inc +++ b/src/vm/jit/verify/typecheck-fields.inc @@ -66,7 +66,7 @@ fi = fieldref->p.field; result = resolve_field_verifier_checks( - state->m, fieldref, fi->class, fi, + state->m, fieldref, fi->clazz, fi, instanceti, valueti, (instance == NULL), (value != NULL)); @@ -97,7 +97,7 @@ TYPECHECK_COUNTIF(INSTRUCTION_IS_UNRESOLVED(state->iptr),stat_ins_field_unresolved); TYPECHECK_COUNTIF(INSTRUCTION_IS_RESOLVED(state->iptr) && - !state->iptr->sx.s23.s3.fmiref->p.field->class->initialized, + !state->iptr->sx.s23.s3.fmiref->p.field->clazz->initialized, stat_ins_field_uninitialized); } #endif /* !defined(TYPECHECK_TYPEINFERER) */ diff --git a/src/vm/jit/x86_64/codegen.c b/src/vm/jit/x86_64/codegen.c index 03135b5aa..9d238bdda 100644 --- a/src/vm/jit/x86_64/codegen.c +++ b/src/vm/jit/x86_64/codegen.c @@ -1750,11 +1750,11 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) { + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) { PROFILE_CYCLE_STOP; patcher_add_patch_ref(jd, PATCHER_initialize_class, - fi->class, 0); + fi->clazz, 0); PROFILE_CYCLE_START; } @@ -1805,11 +1805,11 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) { + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) { PROFILE_CYCLE_STOP; patcher_add_patch_ref(jd, PATCHER_initialize_class, - fi->class, 0); + fi->clazz, 0); PROFILE_CYCLE_START; } @@ -1861,11 +1861,11 @@ bool codegen_emit(jitdata *jd) fieldtype = fi->type; disp = dseg_add_address(cd, fi->value); - if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) { + if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->clazz)) { PROFILE_CYCLE_STOP; patcher_add_patch_ref(jd, PATCHER_initialize_class, - fi->class, 0); + fi->clazz, 0); PROFILE_CYCLE_START; } diff --git a/src/vm/jit/x86_64/patcher.c b/src/vm/jit/x86_64/patcher.c index 7a6711784..2ab929aaf 100644 --- a/src/vm/jit/x86_64/patcher.c +++ b/src/vm/jit/x86_64/patcher.c @@ -216,8 +216,8 @@ bool patcher_get_putstatic(patchref_t *pr) /* check if the field's class is initialized */ - if (!(fi->class->state & CLASS_INITIALIZED)) - if (!initialize_class(fi->class)) + if (!(fi->clazz->state & CLASS_INITIALIZED)) + if (!initialize_class(fi->clazz)) return false; PATCH_BACK_ORIGINAL_MCODE; diff --git a/src/vm/resolve.c b/src/vm/resolve.c index 11607850b..b536ad4d2 100644 --- a/src/vm/resolve.c +++ b/src/vm/resolve.c @@ -1125,7 +1125,7 @@ resolve_result_t resolve_field_verifier_checks(methodinfo *refmethod, referer = refmethod->clazz; assert(referer); - declarer = fi->class; + declarer = fi->clazz; assert(declarer); assert(referer->state & CLASS_LINKED); @@ -1400,7 +1400,7 @@ bool resolve_field(unresolved_field *ref, /* check if the field itself is already resolved */ if (IS_FMIREF_RESOLVED(ref->fieldref)) { fi = ref->fieldref->p.field; - container = fi->class; + container = fi->clazz; goto resolved_the_field; } @@ -1463,7 +1463,7 @@ resolved_the_field: if (checkresult != resolveSucceeded) return (bool) checkresult; - declarer = fi->class; + declarer = fi->clazz; assert(declarer); assert(declarer->state & CLASS_LOADED); assert(declarer->state & CLASS_LINKED); diff --git a/src/vmcore/annotation.c b/src/vmcore/annotation.c index 9a1776015..b71a28a27 100644 --- a/src/vmcore/annotation.c +++ b/src/vmcore/annotation.c @@ -554,7 +554,7 @@ bool annotation_load_field_attribute_runtimevisibleannotations( assert(f != NULL); LLNI_classinfo_field_get( - f->class, field_annotations, field_annotations); + f->clazz, field_annotations, field_annotations); if (!annotation_load_attribute_body( cb, &annotations, @@ -563,7 +563,7 @@ bool annotation_load_field_attribute_runtimevisibleannotations( } if (annotations != NULL) { - slot = f - f->class->fields; + slot = f - f->clazz->fields; field_annotations = annotation_bytearrays_insert( field_annotations, slot, annotations); @@ -572,7 +572,7 @@ bool annotation_load_field_attribute_runtimevisibleannotations( } LLNI_classinfo_field_set( - f->class, field_annotations, field_annotations); + f->clazz, field_annotations, field_annotations); } return true; diff --git a/src/vmcore/field.c b/src/vmcore/field.c index 8d822c761..7f71aeccf 100644 --- a/src/vmcore/field.c +++ b/src/vmcore/field.c @@ -74,7 +74,7 @@ bool field_load(classbuffer *cb, fieldinfo *f, descriptor_pool *descpool) c = cb->class; - f->class = c; + f->clazz = c; /* Get access flags. */ @@ -361,7 +361,7 @@ classinfo *field_get_type(fieldinfo *f) /* load the class of the field-type with the field's classloader */ - c = load_class_from_classloader(u, f->class->classloader); + c = load_class_from_classloader(u, f->clazz->classloader); } else { c = primitive_class_get_by_type(td->decltype); @@ -410,7 +410,7 @@ java_handle_bytearray_t *field_get_annotations(fieldinfo *f) java_handle_t *field_annotations; /* array of unparsed */ /* annotations of all fields of the declaring class */ - c = f->class; + c = f->clazz; slot = f - c->fields; annotations = NULL; @@ -475,7 +475,7 @@ void field_print(fieldinfo *f) return; } - utf_display_printable_ascii_classname(f->class->name); + utf_display_printable_ascii_classname(f->clazz->name); printf("."); utf_display_printable_ascii(f->name); printf(" "); diff --git a/src/vmcore/field.h b/src/vmcore/field.h index 4f9dcd121..32c3871c4 100644 --- a/src/vmcore/field.h +++ b/src/vmcore/field.h @@ -1,9 +1,7 @@ /* src/vmcore/field.h - field functions header - Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel, - C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring, - E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, - J. Wenninger, Institut f. Computersprachen - TU Wien + Copyright (C) 1996-2005, 2006, 2007, 2008 + CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO This file is part of CACAO. @@ -53,7 +51,7 @@ struct fieldinfo { /* field of a class */ /* value as CLASSREF_PSEUDO_VFTBL! This is used to check whether */ /* a constant_FMIref has been resolved. */ - classinfo *class; /* needed by typechecker. Could be optimized */ + classinfo *clazz; /* needed by typechecker. Could be optimized */ /* away by using constant_FMIref instead of */ /* fieldinfo throughout the compiler. */ diff --git a/src/vmcore/references.h b/src/vmcore/references.h index de4f7bfb0..eb21dca41 100644 --- a/src/vmcore/references.h +++ b/src/vmcore/references.h @@ -140,7 +140,7 @@ struct constant_FMIref{ /* Fieldref, Methodref and InterfaceMethodref */ /* macro for accessing the class name of a method reference */ #define FIELDREF_CLASSNAME(fmiref) \ - (IS_FMIREF_RESOLVED(fmiref) ? (fmiref)->p.field->class->name \ + (IS_FMIREF_RESOLVED(fmiref) ? (fmiref)->p.field->clazz->name \ : (fmiref)->p.classref->name) /* initialize a constant_classref with referer `ref` and name `classname` */ -- 2.25.1