* src/vm/jit/i386/asmpart.S: Replaced codegen_get_pv_from_pc with

methodtree_find.
* src/vm/jit/i386/cygwin/md-asm.h
src/vm/jit/i386/darwin/md-asm.h,
src/vm/jit/i386/md.h: Likewise.

--HG--
branch : methodtree-branch

diff --git a/src/vm/jit/i386/asmpart.S b/src/vm/jit/i386/asmpart.S
index c02885c4f8ca5ef6c354e36186c2c89b783a61e5..af29ffea9606000826c987576f71b1724c1ee063 100644 (file)
--- a/src/vm/jit/i386/asmpart.S
+++ b/src/vm/jit/i386/asmpart.S
@@ -1,9 +1,7 @@
 /* src/vm/jit/i386/asmpart.S - Java-C interface functions for i386
 
-   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.
 
@@ -217,7 +215,7 @@ L_asm_handle_exception_stack_loop:
        mov     t0,8*4(sp)                  /* save maybe-leaf flag               */
 
        mov     xpc,0*4(sp)                 /* pass exception pc                  */
-       call    codegen_get_pv_from_pc
+       call    methodtree_find
        mov     v0,6*4(sp)                  /* save data segment pointer          */
 
        mov     4*4(sp),itmp3               /* pass exception pointer             */

diff --git a/src/vm/jit/i386/cygwin/md-asm.h b/src/vm/jit/i386/cygwin/md-asm.h
index 1e226a302626b06cbe016f49467da74ca8b8fe76..f1ab297dbc357d9ecb94be464f9b04370fcefb29 100644 (file)
--- a/src/vm/jit/i386/cygwin/md-asm.h
+++ b/src/vm/jit/i386/cygwin/md-asm.h
@@ -1,9 +1,7 @@
 /* src/vm/jit/i386/cygwin/md-asm.h - assembler defines for Cygwin i386 ABI
 
-   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
+   Copyright (C) 1996-2005, 2006, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,12 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Michael Starzinger
-
-   Changes:
-
 */
 
 
@@ -109,7 +101,7 @@
 #define exceptions_get_and_clear_exception    _exceptions_get_and_clear_exception
 
 #define builtin_throw_exception               _builtin_throw_exception
-#define codegen_get_pv_from_pc                _codegen_get_pv_from_pc
+#define methodtree_find                       _methodtree_find
 #define exceptions_handle_exception           _exceptions_handle_exception
 #define jit_asm_compile                       _jit_asm_compile
 

diff --git a/src/vm/jit/i386/darwin/md-asm.h b/src/vm/jit/i386/darwin/md-asm.h
index 0668c2f6a74ba9621e0e0e54a23525db87b6e89c..f1a1a545bd613ce169a5bb7277122a73824b2411 100644 (file)
--- a/src/vm/jit/i386/darwin/md-asm.h
+++ b/src/vm/jit/i386/darwin/md-asm.h
@@ -1,9 +1,7 @@
 /* src/vm/jit/i386/darwin/md-asm.h - assembler defines for i386 Darwin ABI
 
-   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
+   Copyright (C) 1996-2005, 2006, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,12 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes:
-
 */
 
 
@@ -110,7 +102,7 @@
 #define exceptions_get_and_clear_exception    _exceptions_get_and_clear_exception
 
 #define builtin_throw_exception               _builtin_throw_exception
-#define codegen_get_pv_from_pc                _codegen_get_pv_from_pc
+#define methodtree_find                       _methodtree_find
 #define exceptions_handle_exception           _exceptions_handle_exception
 #define jit_asm_compile                       _jit_asm_compile
 

diff --git a/src/vm/jit/i386/md.h b/src/vm/jit/i386/md.h
index f5289c8179f4bf6f20554fe64c49b58e0067c5c7..568f8e934d0115ac9bb15754eedc4e32cbb2346e 100644 (file)
--- a/src/vm/jit/i386/md.h
+++ b/src/vm/jit/i386/md.h
@@ -1,9 +1,7 @@
 /* src/vm/jit/i386/md.h - machine dependent i386 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.
 
@@ -34,6 +32,7 @@
 #include <stdint.h>
 
 #include "vm/jit/codegen-common.h"
+#include "vm/jit/methodtree.h"
 
 
 /* inline functions ***********************************************************/
@@ -60,7 +59,7 @@ inline static void *md_stacktrace_get_returnaddress(void *sp, int32_t stackframe
 /* md_codegen_get_pv_from_pc ***************************************************
 
    On this architecture just a wrapper function to
-   codegen_get_pv_from_pc.
+   methodtree_find.
 
 *******************************************************************************/
 
@@ -71,7 +70,7 @@ inline static void *md_codegen_get_pv_from_pc(void *ra)
        /* Get the start address of the function which contains this
        address from the method table. */
 
-       pv = codegen_get_pv_from_pc(ra);
+       pv = methodtree_find(ra);
 
        return pv;
 }