* 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.

diff --git a/src/native/vm/reflect.c b/src/native/vm/reflect.c
index c62382e47e3b75585fc9057139e1dfc587e142ba..156bc097fa0fe2dbeb23355e55f969374f8f19f9 100644 (file)
--- 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 2b6f64f86692ea597bd30dcfe1371afdaa07539a..c0d1ca816a4849538b28de7c923f933b20f04aee 100644 (file)
--- 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 6e10c766b1aae621f89a97a2c91916454bc68403..28775f76bc3aa68aa315ab5180ea21790e8922bc 100644 (file)
--- 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 ebdd3535829d25c2cd9df0b89f07341324a88592..f990bbe99fdcac16251520844b4b0d69f25646fd 100644 (file)
--- 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 078664f232d78073e15394b85a9d34888b05306c..00a37a24206fb919ebe14e382dd6f2a6148977ae 100644 (file)
--- 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 0aad1ca2c043873c1e0cd7da9c6f6b6bfff1c48f..84e8287c502cb4a1b5f509a1e77f70daa1462aef 100644 (file)
--- 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 22f4aae67e61337ad7dc094389cc98f1b3d3762a..a1a642166e1697aebd6edb4e8bc63ff45b4b4272 100644 (file)
--- 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 e311ca1103708a511c6b09101a2192f72428eaf4..661c245e4ad0851dac5d088a938b982937d924aa 100644 (file)
--- 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 10c0b3850ea77a7af351d4abdf0b4f2d5deb3c24..6fe3cc7270a935a532f0651a0c7e09e188b727e7 100644 (file)
--- 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 a49918ac769f382d1d387c235b27041af707a1ae..4219f0012aca3e5d91b97aa0be9bdf07ffe15608 100644 (file)
--- 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 811005c8db49cb66ee1c5a7466200f485ead8c9f..a8f7107b24cc446510260953ff71047c1b45dac7 100644 (file)
--- 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 ead85452bd48427fab593f88bcaaba343baa960e..0e622a328e856b3100ce1e24219cce1c31e243cf 100644 (file)
--- 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 47f1fc38aef7f81e4247dfdd9b19a9672f754055..71607c7f42010a38a489cde522f59c4533c31759 100644 (file)
--- 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 24675ac35fd318e13c8b0961dd8e8671c43d39df..2a4d10ad9c0f763f21a72f9e2d2aadb536e52c70 100644 (file)
--- 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 81ab6f30b5ba66b3229f22c0919effe0e1bbba0f..ef4f476b778cfda22773a1b01e5323a007735af3 100644 (file)
--- 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 9f82e03174bb274ea9b142906d580384be8d321c..f010d98f489255c1cb97983b094fa09c9d6d2877 100644 (file)
--- 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 62c92e548e59109f8b4bc36982225ffaec845d05..f87a1a99dc0a9b8c89fe739fffae0948071c1bb7 100644 (file)
--- 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 9c0ef9f33b1d45421b2676fae09dda6634ce9a30..17967ebbb6e4bd613dc369ed7297816c794c98c3 100644 (file)
--- 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 d8c279fd2bba9f953f0131067d90a1d8cec289b5..8f6f160ad37bf1e942993e94e7206f5df6121fd4 100644 (file)
--- 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 1467bf2f0819ec797bdf582c1691338d35356458..025c11f62e1e7207e72b2a76e2089f8bef7c9965 100644 (file)
--- 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 25e2c1983dee70e721a61d59ab206535e1e59f24..f53b1427ea1174e835a48df5ff934b7a55a3abbc 100644 (file)
--- 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 766557b42e317b453e5b56dc0785a103335ca15b..871bb311d0202874d707aff27a23631ef87a1171 100644 (file)
--- 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 14377f5405d81a46efd1655e882c47262031be6c..970101b85fe528457b874f59904f542dd845fe67 100644 (file)
--- 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 9956d624645d042bb922558f43327c0e55ea9fdc..576e710c918b8b8bf324722167953d0121066f21 100644 (file)
--- 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 0de65427969014cbd1d9adcda8a261f807f85fcd..9bd5df52615ff46824ec356eddf3f0a063f3da86 100644 (file)
--- 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 03135b5aa9acf4e6ebe04eca8e954dd064afbdf6..9d238bddaeb8b08a0622c24971fc0c2a5c56d2b2 100644 (file)
--- 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 7a671178470b0029c3177a8c0218cb334d68ea21..2ab929aaf413c546d722f315c9e416adf84140df 100644 (file)
--- 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 11607850b0fc644ad5758df6700ad9bf24206915..b536ad4d212814c261a824c8ad2d157f41cd59d8 100644 (file)
--- 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 9a1776015f030f0139dbcc181887e17a7f33b43f..b71a28a27e524c36daaf4e1c062dd0844b8984f9 100644 (file)
--- 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 8d822c761a62aac0a86d9a6b7c772f928a64d0fe..7f71aeccf5a0c5de320f11c11b696c3482f75eca 100644 (file)
--- 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 4f9dcd121ffe8076674a1ba7c0c12f9679a3da36..32c3871c4a54e968702a43d120dcdfb5b4f761e1 100644 (file)
--- 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 de4f7bfb0035d10050086cb8fa917b89d090724b..eb21dca41c6f158743e21461ed588d21eb373346 100644 (file)
--- 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`     */