/* src/vm/jit/arm/patcher.c - ARM 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.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: patcher.c 8268 2007-08-07 13:24:43Z twisti $
-
*/
#include "vm/types.h"
+#include "vm/jit/arm/md.h"
+
#include "mm/memory.h"
#include "native/native.h"
#include "vm/initialize.h"
#include "vm/jit/asmpart.h"
-#include "vm/jit/md.h"
#include "vm/jit/patcher-common.h"
#include "vmcore/field.h"
}
+/* patcher_patch_code **********************************************************
+
+ Just patches back the original machine code.
+
+*******************************************************************************/
+
+void patcher_patch_code(patchref_t *pr)
+{
+ PATCH_BACK_ORIGINAL_MCODE;
+}
+
+
/* 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;
/* if we show disassembly, we have to skip the nop */
- if (opt_showdisassemble)
+ if (opt_shownops)
ra = ra + 1 * 4;
/* patch the field's offset into the instruction */
/* if we show disassembly, we have to skip the nop */
- if (opt_showdisassemble)
+ if (opt_shownops)
ra = ra + 1 * 4;
/* patch vftbl index */
/* if we show disassembly, we have to skip the nop */
- if (opt_showdisassemble)
+ if (opt_shownops)
ra = ra + 1 * 4;
/* patch interfacetable index */
- gen_resolveload(*((s4 *) (ra + 1 * 4)), (s4) (OFFSET(vftbl_t, interfacetable[0]) - sizeof(methodptr*) * m->class->index));
+ gen_resolveload(*((s4 *) (ra + 1 * 4)), (s4) (OFFSET(vftbl_t, interfacetable[0]) - sizeof(methodptr*) * m->clazz->index));
/* patch method offset */
- gen_resolveload(*((s4 *) (ra + 2 * 4)), (s4) (sizeof(methodptr) * (m - m->class->methods)));
+ gen_resolveload(*((s4 *) (ra + 2 * 4)), (s4) (sizeof(methodptr) * (m - m->clazz->methods)));
/* synchronize instruction cache */
}
-/* patcher_initialize_class ****************************************************
-
- XXX
-
-*******************************************************************************/
-
-bool patcher_initialize_class(patchref_t *pr)
-{
- classinfo *c;
-
- /* get stuff from the stack */
-
- c = (classinfo *) pr->ref;
-
- /* check if the class is initialized */
-
- if (!(c->state & CLASS_INITIALIZED))
- if (!initialize_class(c))
- return false;
-
- PATCH_BACK_ORIGINAL_MCODE;
-
- return true;
-}
-
-
-/* patcher_resolve_class *******************************************************
-
- Machine code:
-
- <patched call position>
-
-*******************************************************************************/
-
-#ifdef ENABLE_VERIFIER
-bool patcher_resolve_class(patchref_t *pr)
-{
- unresolved_class *uc;
-
- /* get stuff from the stack */
-
- uc = (unresolved_class *) pr->ref;
-
- /* resolve the class and check subtype constraints */
-
- if (!resolve_class_eager_no_access_check(uc))
- return false;
-
- PATCH_BACK_ORIGINAL_MCODE;
-
- return true;
-}
-#endif /* ENABLE_VERIFIER */
-
-
-/* patcher_resolve_native_function *********************************************
-
- XXX
-
-*******************************************************************************/
-
-#if !defined(WITH_STATIC_CLASSPATH)
-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;
-
- return true;
-}
-#endif /* !defined(WITH_STATIC_CLASSPATH) */
-
-
/*
* These are local overrides for various environment variables in Emacs.
* Please do not remove this and leave it at the end of the file, where