* Moved all files from vmcore/ to vm/.

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

diff --git a/src/vm/jit/powerpc/patcher.c b/src/vm/jit/powerpc/patcher.c
index a543d00a25592ac27efb00ad8639375e3faa9e4c..13b50d814ca6df25c48ce7438fc3fbb07404fc59 100644 (file)
--- a/src/vm/jit/powerpc/patcher.c
+++ b/src/vm/jit/powerpc/patcher.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/powerpc/patcher.c - PowerPC code patching functions
 
-   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.
 
@@ -32,24 +30,23 @@
 
 #include "vm/types.h"
 
+#include "vm/jit/powerpc/md.h"
+
 #include "mm/memory.h"
+
 #include "native/native.h"
 
 #include "vm/builtin.h"
-#include "vm/exceptions.h"
+#include "vm/class.h"
+#include "vm/field.h"
 #include "vm/initialize.h"
+#include "vm/options.h"
+#include "vm/references.h"
+#include "vm/resolve.h"
 
 #include "vm/jit/asmpart.h"
-#include "vm/jit/md.h"
 #include "vm/jit/methodheader.h"
 #include "vm/jit/patcher-common.h"
-#include "vm/jit/stacktrace.h"
-
-#include "vmcore/class.h"
-#include "vmcore/field.h"
-#include "vmcore/options.h"
-#include "vm/resolve.h"
-#include "vmcore/references.h"
 
 
 #define PATCH_BACK_ORIGINAL_MCODE \
@@ -247,8 +244,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;
@@ -459,7 +456,7 @@ bool patcher_invokeinterface(patchref_t *pr)
        /* patch interfacetable index */
 
        disp = OFFSET(vftbl_t, interfacetable[0]) -
-               sizeof(methodptr*) * m->class->index;
+               sizeof(methodptr*) * m->clazz->index;
 
        /* XXX TWISTI: check displacement */
 
@@ -467,7 +464,7 @@ bool patcher_invokeinterface(patchref_t *pr)
 
        /* patch method offset */
 
-       disp = sizeof(methodptr) * (m - m->class->methods);
+       disp = sizeof(methodptr) * (m - m->clazz->methods);
 
        /* XXX TWISTI: check displacement */