* Updated header: Added 2006. Changed address of FSF. Changed email

[cacao.git] / src / vm / jit / mips / patcher.c

diff --git a/src/vm/jit/mips/patcher.c b/src/vm/jit/mips/patcher.c
index a3eb90bd83676d343f2c3a3bf3b8eb4ef45688a7..1f015072ea92d06731d6938a50c82ed1d1d9dc71 100644 (file)
--- a/src/vm/jit/mips/patcher.c
+++ b/src/vm/jit/mips/patcher.c
@@ -1,9 +1,9 @@
 /* src/vm/jit/mips/patcher.c - MIPS code patching functions
 
-   Copyright (C) 1996-2005 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 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
 
    This file is part of CACAO.
 
@@ -19,16 +19,16 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Christian Thalinger
 
    Changes:
 
-   $Id: patcher.c 3812 2005-11-28 18:00:47Z edwin $
+   $Id: patcher.c 4357 2006-01-22 23:33:38Z twisti $
 
 */
 
@@ -41,6 +41,7 @@
 #include "mm/memory.h"
 #include "native/native.h"
 #include "vm/builtin.h"
+#include "vm/class.h"
 #include "vm/field.h"
 #include "vm/initialize.h"
 #include "vm/options.h"
@@ -100,7 +101,7 @@ bool patcher_get_putstatic(u1 *sp)
 
        /* check if the field's class is initialized */
 
-       if (!fi->class->initialized) {
+       if (!(fi->class->state & CLASS_INITIALIZED)) {
                if (!initialize_class(fi->class)) {
                        PATCHER_MONITOREXIT;
 
@@ -971,7 +972,7 @@ bool patcher_clinit(u1 *sp)
 
        /* check if the class is initialized */
 
-       if (!c->initialized) {
+       if (!(c->state & CLASS_INITIALIZED)) {
                if (!initialize_class(c)) {
                        PATCHER_MONITOREXIT;