/* 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.
#include "vm/types.h"
+#include "vm/jit/powerpc/md.h"
+
#include "mm/memory.h"
+
#include "native/native.h"
#include "vm/builtin.h"
#include "vm/initialize.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"
}
-/* patcher_resolve_native_function *********************************************
-
- XXX
-
-*******************************************************************************/
-
-bool patcher_resolve_native_function(patchref_t *pr)
-{
- methodinfo *m;
- u1 *datap;
- functionptr f;
-
- /* get stuff from the stack */
-
- m = (methodinfo *) pr->ref;
- datap = (u1 *) pr->datap;
-
- /* resolve native function */
-
- if (!(f = native_resolve_function(m)))
- return false;
-
- PATCH_BACK_ORIGINAL_MCODE;
-
- /* patch native function pointer */
-
- *((ptrint *) datap) = (ptrint) f;
-
- /* synchronize data cache */
-
- md_dcacheflush(datap, SIZEOF_VOID_P);
-
- return true;
-}
-
-
/* patcher_get_putstatic *******************************************************
Machine code:
/* 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;
/* patch interfacetable index */
disp = OFFSET(vftbl_t, interfacetable[0]) -
- sizeof(methodptr*) * m->class->index;
+ sizeof(methodptr*) * m->clazz->index;
/* XXX TWISTI: check displacement */
/* patch method offset */
- disp = sizeof(methodptr) * (m - m->class->methods);
+ disp = sizeof(methodptr) * (m - m->clazz->methods);
/* XXX TWISTI: check displacement */