* vm/tables.h: Removed.

* codegen: Replaced c->initialized by (c->state & CLASS_INITIALIZED).

diff --git a/src/vm/jit/x86_64/codegen.c b/src/vm/jit/x86_64/codegen.c
index 3048052d0547c8b7d50e0588f68b7793be6b9aad..e858f8a6ab977aaea6aec5a84209e3d5a2bfe00b 100644 (file)
--- a/src/vm/jit/x86_64/codegen.c
+++ b/src/vm/jit/x86_64/codegen.c
@@ -29,7 +29,7 @@
 
    Changes: Christian Ullrich
 
-   $Id: codegen.c 3812 2005-11-28 18:00:47Z edwin $
+   $Id: codegen.c 3851 2005-12-03 12:33:19Z twisti $
 
 */
 
@@ -54,7 +54,6 @@
 #include "vm/loader.h"
 #include "vm/statistics.h"
 #include "vm/stringlocal.h"
-#include "vm/tables.h"
 #include "vm/jit/asmpart.h"
 #include "vm/jit/codegen.inc"
 #include "vm/jit/jit.h"
@@ -2285,7 +2284,7 @@ bool codegen(methodinfo *m, codegendata *cd, registerdata *rd)
 
                                disp = dseg_addaddress(cd, &(fi->value));
 
-                               if (!fi->class->initialized) {
+                               if (!(fi->class->state & CLASS_INITIALIZED)) {
                                        codegen_addpatchref(cd, cd->mcodeptr,
                                                                                PATCHER_clinit, fi->class, 0);
 
@@ -2342,7 +2341,7 @@ bool codegen(methodinfo *m, codegendata *cd, registerdata *rd)
 
                                disp = dseg_addaddress(cd, &(fi->value));
 
-                               if (!fi->class->initialized) {
+                               if (!(fi->class->state & CLASS_INITIALIZED)) {
                                        codegen_addpatchref(cd, cd->mcodeptr,
                                                                                PATCHER_clinit, fi->class, 0);
 
@@ -2397,7 +2396,7 @@ bool codegen(methodinfo *m, codegendata *cd, registerdata *rd)
 
                                disp = dseg_addaddress(cd, &(fi->value));
 
-                               if (!fi->class->initialized) {
+                               if (!(fi->class->state & CLASS_INITIALIZED)) {
                                        codegen_addpatchref(cd, cd->mcodeptr,
                                                                                PATCHER_clinit, fi->class, 0);