* src/vm/jit/stacktrace.h (stackframeinfo): Renamed to

stackframeinfo_t.

* src/mm/cacao-gc/gc.c,
src/native/jvmti/jvmti.c,
src/threads/native/threads.h,
src/threads/threads-common.c,
src/vm/exceptions.c,
src/vm/jit/alpha/codegen.c,
src/vm/jit/arm/codegen.c,
src/vm/jit/codegen-common.c,
src/vm/jit/i386/codegen.c,
src/vm/jit/jit.c,
src/vm/jit/m68k/codegen.c,
src/vm/jit/m68k/patcher.c,
src/vm/jit/mips/codegen.c,
src/vm/jit/powerpc/codegen.c,
src/vm/jit/powerpc64/codegen.c,
src/vm/jit/replace.c,
src/vm/jit/replace.h,
src/vm/jit/s390/codegen.c,
src/vm/jit/sparc64/codegen.c,
src/vm/jit/sparc64/patcher.c,
src/vm/jit/stacktrace.c,
src/vm/jit/x86_64/codegen.c,
src/vm/signal.c: Likewise.

diff --git a/src/mm/cacao-gc/gc.c b/src/mm/cacao-gc/gc.c
index dc4487c1a060cc406069062a8c756790739ff73e..6a4ef9f93a78be45104a854828afc02500b78934 100644 (file)
--- a/src/mm/cacao-gc/gc.c
+++ b/src/mm/cacao-gc/gc.c
@@ -233,7 +233,7 @@ void gc_collect(s4 level)
        rootset_t    *rs;
        s4            dumpsize;
 #if !defined(NDEBUG)
-       stackframeinfo   *sfi;
+       stackframeinfo_t *sfi;
        stacktracebuffer *stb;
 #endif
 #if defined(ENABLE_RT_TIMING)

diff --git a/src/native/jvmti/jvmti.c b/src/native/jvmti/jvmti.c
index f4d613d389d500551cba4b2537f64341c5cf231a..4f1f2ad8b5ef3ca109affc90824452456e7aa21e 100644 (file)
--- a/src/native/jvmti/jvmti.c
+++ b/src/native/jvmti/jvmti.c
@@ -1,7 +1,7 @@
 /* src/native/jvmti/jvmti.c - implementation of the Java Virtual Machine 
                               Tool Interface functions
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   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
@@ -23,14 +23,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Author: Martin Platter
-
-   Changes: Edwin Steiner
-            Samuel Vinson
-            Christan Thalinger
-   
 */
 
 
@@ -1188,7 +1180,7 @@ static jvmtiError
 GetFrameLocation (jvmtiEnv * env, jthread thread, jint depth,
                  jmethodID * method_ptr, jlocation * location_ptr)
 {
-       stackframeinfo   *sfi;
+       stackframeinfo_t *sfi;
        int i;
        threadobject* th;
                

diff --git a/src/threads/native/threads.h b/src/threads/native/threads.h
index 060c29eb0bce32caca50bd28530b9581c58f465b..f9633b9969a8b20c395323fe38eed848efbf4132 100644 (file)
--- a/src/threads/native/threads.h
+++ b/src/threads/native/threads.h
@@ -139,7 +139,7 @@ struct threadobject {
        u1                   *pc;           /* current PC (used for profiling)    */
 
        java_object_t        *_exceptionptr;     /* current exception             */
-       stackframeinfo       *_stackframeinfo;   /* current native stackframeinfo */
+       stackframeinfo_t     *_stackframeinfo;   /* current native stackframeinfo */
        localref_table       *_localref_table;   /* JNI local references          */
 
 #if defined(ENABLE_INTRP)

diff --git a/src/threads/threads-common.c b/src/threads/threads-common.c
index bd02f9401af39c1a49cc82105cec133bb80f08cb..2e8ff22f795750551e4dc801f45abea3441b0177 100644 (file)
--- a/src/threads/threads-common.c
+++ b/src/threads/threads-common.c
@@ -868,7 +868,7 @@ void threads_dump(void)
 
 void threads_thread_print_stacktrace(threadobject *thread)
 {
-       stackframeinfo   *sfi;
+       stackframeinfo_t *sfi;
        stacktracebuffer *stb;
        s4                dumpsize;
 

diff --git a/src/vm/exceptions.c b/src/vm/exceptions.c
index d303ef80d5833e77994aa18f71844157b36ad645..fc0c5efe18bca0e5a0f128e17ed0721bcc7fe149 100644 (file)
--- a/src/vm/exceptions.c
+++ b/src/vm/exceptions.c
@@ -646,9 +646,9 @@ static java_handle_t *exceptions_new_error(utf *message)
 
 java_object_t *exceptions_asm_new_abstractmethoderror(u1 *sp, u1 *ra)
 {
-       stackframeinfo  sfi;
-       java_handle_t  *e;
-       java_object_t  *o;
+       stackframeinfo_t  sfi;
+       java_handle_t    *e;
+       java_object_t    *o;
 
        /* Fill and add a stackframeinfo (XPC is equal to RA). */
 
@@ -1709,7 +1709,7 @@ java_handle_t *exceptions_fillinstacktrace(void)
 #if defined(ENABLE_JIT)
 u1 *exceptions_handle_exception(java_object_t *xptro, u1 *xpc, u1 *pv, u1 *sp)
 {
-       stackframeinfo         sfi;
+       stackframeinfo_t       sfi;
        java_handle_t         *xptr;
        methodinfo            *m;
        codeinfo              *code;

diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c
index f352bdb59925d1b78ecd923cb1671f3dc61aff9f..d97819e1337aa39442cc879cb8f294b37f1cb4d9 100644 (file)
--- a/src/vm/jit/alpha/codegen.c
+++ b/src/vm/jit/alpha/codegen.c
@@ -3113,7 +3113,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
 
        cd->stackframesize =
                1 +                             /* return address                     */
-               sizeof(stackframeinfo) / SIZEOF_VOID_P +
+               sizeof(stackframeinfo_t) / SIZEOF_VOID_P +
                sizeof(localref_table) / SIZEOF_VOID_P +
                1 +                             /* methodinfo for call trace          */
                md->paramcount +
@@ -3146,8 +3146,8 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* Save callee saved integer registers in stackframeinfo (GC may
           need to recover them during a collection). */
 
-       disp = cd->stackframesize * 8 - SIZEOF_VOID_P - sizeof(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs);
+       disp = cd->stackframesize * 8 - SIZEOF_VOID_P - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs);
 
        for (i = 0; i < INT_SAV_CNT; i++)
                M_AST(abi_registers_integer_saved[i], REG_SP, disp + i * 8);
@@ -3332,8 +3332,8 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* Restore callee saved integer registers from stackframeinfo (GC
           might have modified them during a collection). */
         
-       disp = cd->stackframesize * 8 - SIZEOF_VOID_P - sizeof(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs);
+       disp = cd->stackframesize * 8 - SIZEOF_VOID_P - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs);
 
        for (i = 0; i < INT_SAV_CNT; i++)
                M_ALD(abi_registers_integer_saved[i], REG_SP, disp + i * 8);

diff --git a/src/vm/jit/arm/codegen.c b/src/vm/jit/arm/codegen.c
index 7146e0581e30ae8ae36123c102affbea599a363a..1209f91905e6d2db584f21fd5b9f0ed4488c82f5 100644 (file)
--- a/src/vm/jit/arm/codegen.c
+++ b/src/vm/jit/arm/codegen.c
@@ -2911,7 +2911,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
 
        cd->stackframesize =
                4 +                                                /* return address  */
-               sizeof(stackframeinfo) +                           /* stackframeinfo  */
+               sizeof(stackframeinfo_t) +                         /* stackframeinfo  */
                sizeof(localref_table) +                           /* localref_table  */
                nmd->memuse * 4;                                   /* stack arguments */
 
@@ -2951,8 +2951,8 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* Save callee saved integer registers in stackframeinfo (GC may
           need to recover them during a collection). */
 
-       disp = cd->stackframesize - SIZEOF_VOID_P - sizeof(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs);
+       disp = cd->stackframesize - SIZEOF_VOID_P - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs);
 
        for (i = 0; i < INT_SAV_CNT; i++)
                M_STR_INTERN(abi_registers_integer_saved[i], REG_SP, disp + i * 4);
@@ -3101,8 +3101,8 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* restore callee saved int registers from stackframeinfo (GC might have  */
        /* modified them during a collection).                                    */
 
-       disp = cd->stackframesize - SIZEOF_VOID_P - sizeof(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs);
+       disp = cd->stackframesize - SIZEOF_VOID_P - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs);
 
        for (i = 0; i < INT_SAV_CNT; i++)
                M_LDR_INTERN(abi_registers_integer_saved[i], REG_SP, disp + i * 4);

diff --git a/src/vm/jit/codegen-common.c b/src/vm/jit/codegen-common.c
index 35f87ba031a67accdcba9d6497a170d195971091..043043be68b775c93cc222da6519104f727551e6 100644 (file)
--- a/src/vm/jit/codegen-common.c
+++ b/src/vm/jit/codegen-common.c
@@ -1529,10 +1529,10 @@ void codegen_disassemble_stub(methodinfo *m, u1 *start, u1 *end)
 
 java_handle_t *codegen_start_native_call(u1 *sp, u1 *pv)
 {
-       stackframeinfo *sfi;
-       localref_table *lrt;
-       methodinfo     *m;
-       int32_t         framesize;
+       stackframeinfo_t *sfi;
+       localref_table   *lrt;
+       methodinfo       *m;
+       int32_t           framesize;
 
        uint8_t  *datasp;
        uint8_t  *javasp;
@@ -1549,7 +1549,7 @@ java_handle_t *codegen_start_native_call(u1 *sp, u1 *pv)
 
        framesize = *((int32_t *) (pv + FrameSize));
 
-       assert(framesize >= sizeof(stackframeinfo) + sizeof(localref_table));
+       assert(framesize >= sizeof(stackframeinfo_t) + sizeof(localref_table));
 
        /* calculate needed values */
 
@@ -1590,9 +1590,9 @@ java_handle_t *codegen_start_native_call(u1 *sp, u1 *pv)
 
        /* get data structures from stack */
 
-       sfi = (stackframeinfo *) (datasp - sizeof(stackframeinfo));
-       lrt = (localref_table *) (datasp - sizeof(stackframeinfo) - 
-                                                         sizeof(localref_table));
+       sfi = (stackframeinfo_t *) (datasp - sizeof(stackframeinfo_t));
+       lrt = (localref_table *)   (datasp - sizeof(stackframeinfo_t) - 
+                                                               sizeof(localref_table));
 
 #if defined(ENABLE_JNI)
        /* add current JNI local references table to this thread */
@@ -1642,12 +1642,12 @@ java_handle_t *codegen_start_native_call(u1 *sp, u1 *pv)
 
 java_object_t *codegen_finish_native_call(u1 *sp, u1 *pv)
 {
-       stackframeinfo *sfi;
-       java_handle_t  *e;
-       java_object_t  *o;
-       codeinfo       *code;
-       methodinfo     *m;
-       int32_t         framesize;
+       stackframeinfo_t *sfi;
+       java_handle_t    *e;
+       java_object_t    *o;
+       codeinfo         *code;
+       methodinfo       *m;
+       int32_t           framesize;
 
        uint8_t  *datasp;
        uint64_t *ret_regs;
@@ -1692,7 +1692,7 @@ java_object_t *codegen_finish_native_call(u1 *sp, u1 *pv)
 
        /* get data structures from stack */
 
-       sfi = (stackframeinfo *) (datasp - sizeof(stackframeinfo));
+       sfi = (stackframeinfo_t *) (datasp - sizeof(stackframeinfo_t));
 
        /* Remove current stackframeinfo from chain. */
 

diff --git a/src/vm/jit/i386/codegen.c b/src/vm/jit/i386/codegen.c
index c8c4db5b420af724ae2c5fe06b8887661dca3ca8..57a79435b113a92ed8f3f01f5240419229e44f11 100644 (file)
--- a/src/vm/jit/i386/codegen.c
+++ b/src/vm/jit/i386/codegen.c
@@ -3512,7 +3512,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* calculate stackframe size */
 
        cd->stackframesize =
-               sizeof(stackframeinfo) / SIZEOF_VOID_P +
+               sizeof(stackframeinfo_t) / SIZEOF_VOID_P +
                sizeof(localref_table) / SIZEOF_VOID_P +
                4 +                             /* 4 arguments (start_native_call)    */
                nmd->memuse;
@@ -3570,8 +3570,8 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* remember callee saved int registers in stackframeinfo (GC may need to  */
        /* recover them during a collection).                                     */
 
-       disp = cd->stackframesize * 8 - sizeof(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs);
+       disp = cd->stackframesize * 8 - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs);
 
        for (i = 0; i < INT_SAV_CNT; i++)
                M_AST(abi_registers_integer_saved[i], REG_SP, disp + i * 4);
@@ -3693,8 +3693,8 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* restore callee saved int registers from stackframeinfo (GC might have  */
        /* modified them during a collection).                                    */
 
-       disp = cd->stackframesize * 8 - sizeof(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs);
+       disp = cd->stackframesize * 8 - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs);
 
        for (i = 0; i < INT_SAV_CNT; i++)
                M_ALD(abi_registers_integer_saved[i], REG_SP, disp + i * 4);

diff --git a/src/vm/jit/jit.c b/src/vm/jit/jit.c
index 05cfe6faa109fbd563bfe62a9ef7e9f1b2dbd381..831865c3dac58c1b0152f758eeba8c3ef40bc941 100644 (file)
--- a/src/vm/jit/jit.c
+++ b/src/vm/jit/jit.c
@@ -1698,10 +1698,10 @@ codeinfo *jit_get_current_code(methodinfo *m)
 #if !defined(JIT_COMPILER_VIA_SIGNAL)
 u1 *jit_asm_compile(methodinfo *m, u1 *mptr, u1 *sp, u1 *ra)
 {
-       stackframeinfo  sfi;
-       u1             *entrypoint;
-       u1             *pa;
-       ptrint         *p;
+       stackframeinfo_t  sfi;
+       u1               *entrypoint;
+       u1               *pa;
+       ptrint           *p;
 
        /* create the stackframeinfo (subtract 1 from RA as it points to the */
        /* instruction after the call)                                       */

diff --git a/src/vm/jit/m68k/codegen.c b/src/vm/jit/m68k/codegen.c
index 636bfab795d43306debe2a5527abf3b9de61ea10..8f29667621addbfe6c69d3b647e4345a4102faca 100644 (file)
--- a/src/vm/jit/m68k/codegen.c
+++ b/src/vm/jit/m68k/codegen.c
@@ -2440,11 +2440,12 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        md = m->parseddesc;
 
        /* calc stackframe size */
-       cd->stackframesize =    sizeof(stackframeinfo) / SIZEOF_VOID_P +
-                               sizeof(localref_table) / SIZEOF_VOID_P +
-                               nmd->memuse +
-                               1 +                                             /* functionptr */
-                               4;                                              /* args for codegen_start_native_call */
+       cd->stackframesize =
+               sizeof(stackframeinfo_t) / SIZEOF_VOID_P +
+               sizeof(localref_table) / SIZEOF_VOID_P +
+               nmd->memuse +
+               1 +                                             /* functionptr */
+               4;                                              /* args for codegen_start_native_call */
 
        /* create method header */
        (void) dseg_add_unique_address(cd, code);                      /* CodeinfoPointer */

diff --git a/src/vm/jit/m68k/patcher.c b/src/vm/jit/m68k/patcher.c
index 9e8796b733a3663863a94d3374a6bc81244ffa3f..3192fcb41b0cec4243dec713ab12e665f1f14efe 100644 (file)
--- a/src/vm/jit/m68k/patcher.c
+++ b/src/vm/jit/m68k/patcher.c
@@ -65,7 +65,7 @@
 #if 0
 java_objectheader *patcher_wrapper(u1 *sp, u1 *pv, u1 *ra)
 {
-       stackframeinfo     sfi;
+       stackframeinfo_t   sfi;
        u1                *xpc;
        java_objectheader *o;
        functionptr        f;

diff --git a/src/vm/jit/mips/codegen.c b/src/vm/jit/mips/codegen.c
index 4bf2d0552a01e412c838f7393dc63171fe73086e..159887ef118ccb6216c7d39020be6d8a131a88fe 100644 (file)
--- a/src/vm/jit/mips/codegen.c
+++ b/src/vm/jit/mips/codegen.c
@@ -3676,7 +3676,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
 
        cd->stackframesize =
                1 +                             /* return address                     */
-               sizeof(stackframeinfo) / SIZEOF_VOID_P +
+               sizeof(stackframeinfo_t) / SIZEOF_VOID_P +
                sizeof(localref_table) / SIZEOF_VOID_P +
                md->paramcount +                /* for saving arguments over calls    */
 #if SIZEOF_VOID_P == 4

diff --git a/src/vm/jit/powerpc/codegen.c b/src/vm/jit/powerpc/codegen.c
index 96faa9adaf3ed3a18aaded3693a509d1dc152088..657a315b61c83f40500bfe3df3c6bd8f7a7783cd 100644 (file)
--- a/src/vm/jit/powerpc/codegen.c
+++ b/src/vm/jit/powerpc/codegen.c
@@ -2831,7 +2831,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* calculate stackframe size */
 
        cd->stackframesize =
-               sizeof(stackframeinfo) / SIZEOF_VOID_P +
+               sizeof(stackframeinfo_t) / SIZEOF_VOID_P +
                sizeof(localref_table) / SIZEOF_VOID_P +
                4 +                            /* 4 stackframeinfo arguments (darwin) */
                nmd->paramcount +
@@ -2862,8 +2862,8 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* Save callee saved integer registers in stackframeinfo (GC may
           need to recover them during a collection). */
 
-       disp = cd->stackframesize * 8 - sizeof(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs);
+       disp = cd->stackframesize * 8 - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs);
 
        for (i = 0; i < INT_SAV_CNT; i++)
                M_AST(abi_registers_integer_saved[i], REG_SP, disp + i * 4);
@@ -3052,8 +3052,8 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* Restore callee saved integer registers from stackframeinfo (GC
           might have modified them during a collection). */
         
-       disp = cd->stackframesize * 8 - sizeof(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs);
+       disp = cd->stackframesize * 8 - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs);
 
        for (i = 0; i < INT_SAV_CNT; i++)
                M_ALD(abi_registers_integer_saved[i], REG_SP, disp + i * 4);

diff --git a/src/vm/jit/powerpc64/codegen.c b/src/vm/jit/powerpc64/codegen.c
index 11eba8b4b0809218dbfae83fb2d2cd4f27a468e1..08c3bd142c1cc4cb2bf970cf99920159d34f8f13 100644 (file)
--- a/src/vm/jit/powerpc64/codegen.c
+++ b/src/vm/jit/powerpc64/codegen.c
@@ -2624,7 +2624,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* calculate stackframe size */
 
        cd->stackframesize =
-               sizeof(stackframeinfo) / SIZEOF_VOID_P +
+               sizeof(stackframeinfo_t) / SIZEOF_VOID_P +
                sizeof(localref_table) / SIZEOF_VOID_P +
                4 +                            /* 4 stackframeinfo arguments (darwin)*/
                nmd->paramcount  + 

diff --git a/src/vm/jit/replace.c b/src/vm/jit/replace.c
index 328c7b514133df27acfab1a2d2ead052d11f4ee5..70b5c4eba3b93dc254d220305bd15bc02fe8a144 100644 (file)
--- a/src/vm/jit/replace.c
+++ b/src/vm/jit/replace.c
@@ -114,7 +114,7 @@ typedef u8 stackslot_t;
 
 #if !defined(NDEBUG)
 static void java_value_print(s4 type, replace_val_t value);
-static void replace_stackframeinfo_println(stackframeinfo *sfi);
+static void replace_stackframeinfo_println(stackframeinfo_t *sfi);
 #endif
 
 #if !defined(NDEBUG)
@@ -2189,7 +2189,7 @@ rplpoint *replace_find_replacement_point_for_pc(codeinfo *code, u1 *pc)
 
 static void replace_pop_native_frame(executionstate_t *es,
                                                                         sourcestate_t *ss,
-                                                                        stackframeinfo *sfi)
+                                                                        stackframeinfo_t *sfi)
 {
        sourceframe_t *frame;
        codeinfo      *code;
@@ -2401,7 +2401,7 @@ static void replace_push_native_frame(executionstate_t *es, sourcestate_t *ss)
 *******************************************************************************/
 
 sourcestate_t *replace_recover_source_state(rplpoint *rp,
-                                                                                       stackframeinfo *sfi,
+                                                                                       stackframeinfo_t *sfi,
                                                                                    executionstate_t *es)
 {
        sourcestate_t *ss;
@@ -2755,7 +2755,7 @@ static void replace_build_execution_state(sourcestate_t *ss,
 
 static void replace_me(rplpoint *rp, executionstate_t *es)
 {
-       stackframeinfo      *sfi;
+       stackframeinfo_t    *sfi;
        sourcestate_t       *ss;
        sourceframe_t       *frame;
        s4                   dumpsize;
@@ -2946,7 +2946,7 @@ bool replace_me_wrapper(u1 *pc, void *context)
 #if defined(ENABLE_GC_CACAO)
 void replace_gc_from_native(threadobject *thread, u1 *pc, u1 *sp)
 {
-       stackframeinfo   *sfi;
+       stackframeinfo_t *sfi;
        executionstate_t *es;
        sourcestate_t    *ss;
 
@@ -3553,7 +3553,7 @@ void replace_sourcestate_println_short(sourcestate_t *ss)
 #endif
 
 #if !defined(NDEBUG)
-static void replace_stackframeinfo_println(stackframeinfo *sfi)
+static void replace_stackframeinfo_println(stackframeinfo_t *sfi)
 {
        printf("prev=%p pv=%p sp=%p ra=%p xpc=%p method=",
                        (void*)sfi->prev, (void*)sfi->pv, (void*)sfi->sp,

diff --git a/src/vm/jit/replace.h b/src/vm/jit/replace.h
index b1ca41c5ecf6b01d265dfc98e6617719f65d32d8..1037494089415627dff83b2a26fc6f60d5c56783 100644 (file)
--- a/src/vm/jit/replace.h
+++ b/src/vm/jit/replace.h
@@ -188,7 +188,7 @@ struct sourceframe_t {
        codeinfo      *tocode;            /* code this frame was mapped to */
 
        /* info for native frames */
-       stackframeinfo *sfi;      /* sfi for native frames, otherwise NULL */
+       stackframeinfo_t *sfi;      /* sfi for native frames, otherwise NULL */
        s4             nativeframesize;    /* size (bytes) of native frame */
        u1            *nativepc;
        ptrint         nativesavint[INT_SAV_CNT]; /* XXX temporary */

diff --git a/src/vm/jit/s390/codegen.c b/src/vm/jit/s390/codegen.c
index 7b2c7dd644e9440afcb30c15593ee726e7de3b9f..a15094e304fbdb9f3bc02e2f5c033412e153c62d 100644 (file)
--- a/src/vm/jit/s390/codegen.c
+++ b/src/vm/jit/s390/codegen.c
@@ -3559,7 +3559,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
 
        cd->stackframesize =
                1 + /* return address */
-               sizeof(stackframeinfo) / 8 +
+               sizeof(stackframeinfo_t) / 8 +
                sizeof(localref_table) / 8 +
                nmd->paramcount +
                nmd->memuse +
@@ -3600,8 +3600,8 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* Save callee saved integer registers in stackframeinfo (GC may
           need to recover them during a collection). */
 
-       disp = cd->stackframesize * 8 - sizeof(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs);
+       disp = cd->stackframesize * 8 - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs);
 
        for (i = 0; i < INT_SAV_CNT; i++)
                M_AST(abi_registers_integer_saved[i], REG_SP, disp + i * 4);
@@ -3784,8 +3784,8 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* Restore callee saved integer registers from stackframeinfo (GC
           might have modified them during a collection). */
         
-       disp = cd->stackframesize * 8 - sizeof(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs);
+       disp = cd->stackframesize * 8 - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs);
 
        for (i = 0; i < INT_SAV_CNT; i++)
                M_ALD(abi_registers_integer_saved[i], REG_SP, disp + i * 4);

diff --git a/src/vm/jit/sparc64/codegen.c b/src/vm/jit/sparc64/codegen.c
index c9ccc76e4ba44e7ec0ce4aca53809c92b2f93c73..ff5e41fc1443dc337afc4f53efcadcc801e485c7 100644 (file)
--- a/src/vm/jit/sparc64/codegen.c
+++ b/src/vm/jit/sparc64/codegen.c
@@ -3111,7 +3111,7 @@ void codegen_emit_stub_builtin(jitdata *jd, builtintable_entry *bte)
                WINSAVE_CNT +
                ABIPARAMS_CNT +
                FLT_ARG_CNT +
-               sizeof(stackframeinfo) / SIZEOF_VOID_P +
+               sizeof(stackframeinfo_t) / SIZEOF_VOID_P +
                4;                              /* 4 arguments or return value        */
 
 
@@ -3138,8 +3138,8 @@ void codegen_emit_stub_builtin(jitdata *jd, builtintable_entry *bte)
        /* Save callee saved integer registers in stackframeinfo (GC may
           need to recover them during a collection). */
 
-       disp = cd->stackframesize * 8 - sizeof(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs) + BIAS;
+       disp = cd->stackframesize * 8 - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs) + BIAS;
 
        for (i = 0; i < INT_SAV_CNT; i++)
                M_AST(abi_registers_integer_saved[i], REG_SP, disp + i * 8);
@@ -3240,8 +3240,8 @@ void codegen_emit_stub_builtin(jitdata *jd, builtintable_entry *bte)
        /* Restore callee saved integer registers from stackframeinfo (GC
           might have modified them during a collection). */
         
-       disp = cd->stackframesize * 8 - sizeof(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs) + BIAS;
+       disp = cd->stackframesize * 8 - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs) + BIAS;
 
        for (i = 0; i < INT_SAV_CNT; i++)
                M_ALD(abi_registers_integer_saved[i], REG_SP, disp + i * 8);

diff --git a/src/vm/jit/sparc64/patcher.c b/src/vm/jit/sparc64/patcher.c
index 5352114dc031997181cf8f71836bb959b01710fe..ea8122b2da54f621eb308782afd08be6be88e6be 100644 (file)
--- a/src/vm/jit/sparc64/patcher.c
+++ b/src/vm/jit/sparc64/patcher.c
@@ -69,7 +69,7 @@
 
 java_object_t *patcher_wrapper(u1 *sp, u1 *pv, u1 *ra)
 {
-       stackframeinfo     sfi;
+       stackframeinfo_t   sfi;
        u1                *xpc;
        u1                *javasp;
        java_object_t *o;

diff --git a/src/vm/jit/stacktrace.c b/src/vm/jit/stacktrace.c
index 8a58dce8c98c537a87b303d0bf8254bbae06b7ed..8dcaa58e3bba6a0875fc21d20c2b030d1a9eaba6 100644 (file)
--- a/src/vm/jit/stacktrace.c
+++ b/src/vm/jit/stacktrace.c
@@ -74,7 +74,7 @@
 
 /* global variables ***********************************************************/
 #if !defined(ENABLE_THREADS)
-stackframeinfo *_no_threads_stackframeinfo = NULL;
+stackframeinfo_t *_no_threads_stackframeinfo = NULL;
 #endif
 
 CYCLES_STATS_DECLARE(stacktrace_overhead        ,100,1)
@@ -91,15 +91,15 @@ CYCLES_STATS_DECLARE(stacktrace_getStack        ,40,10000)
 
 *******************************************************************************/
 
-void stacktrace_stackframeinfo_add(stackframeinfo *sfi, u1 *pv, u1 *sp, u1 *ra, u1 *xpc)
+void stacktrace_stackframeinfo_add(stackframeinfo_t *sfi, u1 *pv, u1 *sp, u1 *ra, u1 *xpc)
 {
-       stackframeinfo **psfi;
-       methodinfo      *m;
+       stackframeinfo_t **psfi;
+       methodinfo        *m;
 #if !defined(__I386__) && !defined(__X86_64__) && !defined(__S390__) && !defined(__M68K__)
-       bool             isleafmethod;
+       bool               isleafmethod;
 #endif
 #if defined(ENABLE_JIT)
-       s4               framesize;
+       s4                 framesize;
 #endif
 
        /* get current stackframe info pointer */
@@ -216,9 +216,9 @@ void stacktrace_stackframeinfo_add(stackframeinfo *sfi, u1 *pv, u1 *sp, u1 *ra,
 
 *******************************************************************************/
 
-void stacktrace_stackframeinfo_remove(stackframeinfo *sfi)
+void stacktrace_stackframeinfo_remove(stackframeinfo_t *sfi)
 {
-       stackframeinfo **psfi;
+       stackframeinfo_t **psfi;
 
        /* clear the native world flag for the current thread */
        /* ATTENTION: Clear this flag _before_ removing the stackframe info */
@@ -310,7 +310,7 @@ static inline stacktracebuffer *stacktrace_entry_add(stacktracebuffer *stb, meth
 
 *******************************************************************************/
 
-static inline stacktracebuffer *stacktrace_method_add(stacktracebuffer *stb, stackframeinfo *sfi)
+static inline stacktracebuffer *stacktrace_method_add(stacktracebuffer *stb, stackframeinfo_t *sfi)
 {
        methodinfo *m;
        void       *pv;
@@ -349,7 +349,7 @@ static inline stacktracebuffer *stacktrace_method_add(stacktracebuffer *stb, sta
 
 *******************************************************************************/
 
-static inline void stacktrace_stack_walk(stackframeinfo *sfi)
+static inline void stacktrace_stack_walk(stackframeinfo_t *sfi)
 {
        methodinfo *m;
        void       *pv;
@@ -463,10 +463,10 @@ static inline void stacktrace_stack_walk(stackframeinfo *sfi)
 
 *******************************************************************************/
 
-stacktracebuffer *stacktrace_create(stackframeinfo *sfi)
+stacktracebuffer *stacktrace_create(stackframeinfo_t *sfi)
 {
        stacktracebuffer *stb;
-       stackframeinfo    tmpsfi;
+       stackframeinfo_t  tmpsfi;
 
        /* Create a stacktracebuffer in dump memory. */
 

diff --git a/src/vm/jit/stacktrace.h b/src/vm/jit/stacktrace.h
index c2531481c037302adc0296fcf60a1b588fa8991d..5e41159cdd637b79477a5a8a62ab366bd33c91b9 100644 (file)
--- a/src/vm/jit/stacktrace.h
+++ b/src/vm/jit/stacktrace.h
@@ -30,11 +30,14 @@
 
 /* forward typedefs ***********************************************************/
 
-typedef struct stackframeinfo stackframeinfo;
+typedef struct stackframeinfo_t stackframeinfo_t;
 typedef struct stacktracebuffer stacktracebuffer;
 typedef struct stacktrace_entry stacktrace_entry;
 
 #include "config.h"
+
+#include <stdint.h>
+
 #include "vm/types.h"
 
 #include "md-abi.h"
@@ -50,22 +53,22 @@ typedef struct stacktrace_entry stacktrace_entry;
 
 *******************************************************************************/
 
-struct stackframeinfo {
-       stackframeinfo *prev;               /* pointer to prev stackframeinfo     */
-       methodinfo     *method;             /* methodinfo of current function     */
-       u1             *pv;                 /* PV of current function             */
-       u1             *sp;                 /* SP of parent Java function         */
-       u1             *ra;                 /* RA to parent Java function         */
-       u1             *xpc;                /* XPC (for inline stubs)             */
+struct stackframeinfo_t {
+       stackframeinfo_t *prev;             /* pointer to prev stackframeinfo     */
+       methodinfo       *method;           /* methodinfo of current function     */
+       u1               *pv;               /* PV of current function             */
+       u1               *sp;               /* SP of parent Java function         */
+       u1               *ra;               /* RA to parent Java function         */
+       u1               *xpc;              /* XPC (for inline stubs)             */
 #if defined(ENABLE_GC_CACAO)
        /* 
         * The exact GC needs to be able to recover saved registers, so the
         * native-stub saves these registers here
         */
 # if defined(HAS_ADDRESS_REGISTER_FILE)
-       ptrint          adrregs[ADR_SAV_CNT];
+       uintptr_t         adrregs[ADR_SAV_CNT];
 # else
-       ptrint          intregs[INT_SAV_CNT];
+       uintptr_t         intregs[INT_SAV_CNT];
 # endif
 #endif
 };
@@ -97,11 +100,11 @@ struct stacktracebuffer {
 
 /* function prototypes ********************************************************/
 
-void stacktrace_stackframeinfo_add(stackframeinfo *sfi, u1 *pv, u1 *sp, u1 *ra, u1 *xpc);
-void stacktrace_stackframeinfo_remove(stackframeinfo *sfi);
+void stacktrace_stackframeinfo_add(stackframeinfo_t *sfi, u1 *pv, u1 *sp, u1 *ra, u1 *xpc);
+void stacktrace_stackframeinfo_remove(stackframeinfo_t *sfi);
 
 
-stacktracebuffer *stacktrace_create(stackframeinfo *sfi);
+stacktracebuffer *stacktrace_create(stackframeinfo_t *sfi);
 
 java_handle_bytearray_t   *stacktrace_fillInStackTrace(void);
 

diff --git a/src/vm/jit/x86_64/codegen.c b/src/vm/jit/x86_64/codegen.c
index d33fc79548d8af72ef1cc6ac26a6dd3b5e240de7..05da87aa1fcaa8bd84fb6ddfb7d8b78ccddb859d 100644 (file)
--- a/src/vm/jit/x86_64/codegen.c
+++ b/src/vm/jit/x86_64/codegen.c
@@ -2916,7 +2916,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* calculate stack frame size */
 
        cd->stackframesize =
-               sizeof(stackframeinfo) / SIZEOF_VOID_P +
+               sizeof(stackframeinfo_t) / SIZEOF_VOID_P +
                sizeof(localref_table) / SIZEOF_VOID_P +
                md->paramcount +
                (md->returntype.type == TYPE_VOID ? 0 : 1) +
@@ -2954,8 +2954,8 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* Save callee saved integer registers in stackframeinfo (GC may
           need to recover them during a collection). */
 
-       disp = cd->stackframesize * 8 - sizeof(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs);
+       disp = cd->stackframesize * 8 - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs);
 
        for (i = 0; i < INT_SAV_CNT; i++)
                M_AST(abi_registers_integer_saved[i], REG_SP, disp + i * 8);
@@ -3120,8 +3120,8 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
        /* Restore callee saved integer registers from stackframeinfo (GC
           might have modified them during a collection). */
         
-       disp = cd->stackframesize * 8 - sizeof(stackframeinfo) +
-               OFFSET(stackframeinfo, intregs);
+       disp = cd->stackframesize * 8 - sizeof(stackframeinfo_t) +
+               OFFSET(stackframeinfo_t, intregs);
 
        for (i = 0; i < INT_SAV_CNT; i++)
                M_ALD(abi_registers_integer_saved[i], REG_SP, disp + i * 8);

diff --git a/src/vm/signal.c b/src/vm/signal.c
index fb700c19795f7be36b731f845703d7ed05d1fe7a..090b7ef169c0bfe077a47754804c6778c38c370c 100644 (file)
--- a/src/vm/signal.c
+++ b/src/vm/signal.c
@@ -230,11 +230,11 @@ void signal_register_signal(int signum, functionptr handler, int flags)
 void *signal_handle(int type, intptr_t val,
                                        void *pv, void *sp, void *ra, void *xpc, void *context)
 {
-       stackframeinfo  sfi;
-       int32_t         index;
-       java_handle_t  *o;
-       methodinfo     *m;
-       java_handle_t  *p;
+       stackframeinfo_t  sfi;
+       int32_t           index;
+       java_handle_t    *o;
+       methodinfo       *m;
+       java_handle_t    *p;
 
        /* wrap the value into a handle if it is a reference */
        /* BEFORE: creating stackframeinfo */