* Moved all files from vmcore/ to vm/.

[cacao.git] / src / vm / jit / code.c

diff --git a/src/vm/jit/code.c b/src/vm/jit/code.c
index 8fce23ec4a2bca89213a3287124f3024a51ea8bb..02c3a2d2fa594a39776796e745104a8de99f1a6d 100644 (file)
--- a/src/vm/jit/code.c
+++ b/src/vm/jit/code.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/code.c - codeinfo struct for representing compiled code
 
-   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.
 
@@ -22,31 +20,25 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id$
-
 */
 
 
 #include "config.h"
 
 #include <assert.h>
-
-#include "vm/types.h"
+#include <stdint.h>
 
 #include "arch.h"
 
 #include "mm/memory.h"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#endif
+#include "vm/options.h"
+#include "vm/vm.hpp"
 
 #include "vm/jit/code.h"
 #include "vm/jit/codegen-common.h"
-#include "vm/jit/methodheader.h"
 #include "vm/jit/patcher-common.h"
-
-#include "vmcore/options.h"
+#include "vm/jit/methodtree.h"
 
 
 /* code_init *******************************************************************
@@ -55,15 +47,12 @@
 
 *******************************************************************************/
 
-bool code_init(void)
+void code_init(void)
 {
-       /* check for offset of code->m == 0 (see comment in code.h) */
+       /* Check if offset of codeinfo.m == 0 (see comment in code.h). */
 
-       assert(OFFSET(codeinfo, m) == 0);
-
-       /* everything's ok */
-
-       return true;
+       if (OFFSET(codeinfo, m) != 0)
+               vm_abort("code_init: offset of codeinfo.m != 0: %d != 0", OFFSET(codeinfo, m));
 }
 
 
@@ -108,7 +97,7 @@ codeinfo *code_codeinfo_new(methodinfo *m)
    Return the codeinfo for the compilation unit that contains the
    given PC.
 
-   IN:
+   ARGUMENTS:
        pc...............machine code position
 
    RETURN VALUE:
@@ -116,14 +105,40 @@ codeinfo *code_codeinfo_new(methodinfo *m)
 
 *******************************************************************************/
 
-codeinfo *code_find_codeinfo_for_pc(u1 *pc)
+codeinfo *code_find_codeinfo_for_pc(void *pc)
+{
+       void *pv;
+
+       pv = methodtree_find(pc);
+
+       return code_get_codeinfo_for_pv(pv);
+}
+
+
+/* code_find_codeinfo_for_pc ***************************************************
+
+   Return the codeinfo for the compilation unit that contains the
+   given PC. This method does not check the return value and is used
+   by the GC.
+
+   IN:
+       pc...............machine code position
+
+   RETURN VALUE:
+       the codeinfo * for the given PC, or NULL
+
+*******************************************************************************/
+
+codeinfo *code_find_codeinfo_for_pc_nocheck(void *pc)
 {
-       u1 *pv;
+       void *pv;
+
+       pv = methodtree_find_nocheck(pc);
 
-       pv = codegen_get_pv_from_pc(pc);
-       assert(pv);
+       if (pv == NULL)
+               return NULL;
 
-       return *(codeinfo **)(pv + CodeinfoPointer);
+       return code_get_codeinfo_for_pv(pv);
 }
 
 
@@ -139,11 +154,16 @@ codeinfo *code_find_codeinfo_for_pc(u1 *pc)
 
 *******************************************************************************/
 
-methodinfo *code_get_methodinfo_for_pv(u1 *pv)
+methodinfo *code_get_methodinfo_for_pv(void *pv)
 {
        codeinfo *code;
 
-       code = *((codeinfo **) (pv + CodeinfoPointer));
+       code = code_get_codeinfo_for_pv(pv);
+
+       /* This is the case for asm_vm_call_method. */
+
+       if (code == NULL)
+               return NULL;
 
        return code->m;
 }
@@ -174,7 +194,7 @@ int code_get_sync_slot_count(codeinfo *code)
        if (!checksync)
                return 0;
 
-       if (!(code->m->flags & ACC_SYNCHRONIZED))
+       if (!code_is_synchronized(code))
                return 0;
 
        count = 1;