almost all required function implemented - first integration with jdwp - nothing...

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

diff --git a/src/vm/jit/stacktrace.c b/src/vm/jit/stacktrace.c
index 9260504638ca61fc6eb97e46de7088cf6a23dd29..7efb26565df152dd5fa551943db301587f466d86 100644 (file)
--- a/src/vm/jit/stacktrace.c
+++ b/src/vm/jit/stacktrace.c
@@ -28,7 +28,7 @@
 
    Changes: Christian Thalinger
 
-   $Id: stacktrace.c 3500 2005-10-26 20:22:30Z twisti $
+   $Id: stacktrace.c 3570 2005-11-04 16:58:36Z motse $
 
 */
 
@@ -75,8 +75,9 @@ typedef struct lineNumberTableEntryInlineBegin {
        methodinfo *method;
 } lineNumberTableEntryInlineBegin;
 
-
+#ifndef ENABLE_JVMTI
 typedef bool(*CacaoStackTraceCollector)(void **, stackTraceBuffer*);
+#endif
 
 #define BLOCK_INITIALSIZE 40
 #define BLOCK_SIZEINCREMENT 40
@@ -84,12 +85,8 @@ typedef bool(*CacaoStackTraceCollector)(void **, stackTraceBuffer*);
 
 /* global variables ***********************************************************/
 
-#if defined(USE_THREADS)
-#define STACKFRAMEINFO    (stackframeinfo **) (&THREADINFO->_stackframeinfo)
-#else
-THREADSPECIFIC stackframeinfo *_no_threads_stackframeinfo = NULL;
-
-#define STACKFRAMEINFO    (&_no_threads_stackframeinfo)
+#if !defined(USE_THREADS)
+stackframeinfo *_no_threads_stackframeinfo = NULL;
 #endif
 
 
@@ -716,9 +713,15 @@ static void stacktrace_fillInStackTrace_method(stackTraceBuffer *buffer,
    XXX
 
 *******************************************************************************/
-
+#ifdef ENABLE_JVMTI
+bool cacao_stacktrace_fillInStackTrace(void **target,
+                                                                          CacaoStackTraceCollector coll,
+                                                                          threadobject* thread)
+#else
 static bool cacao_stacktrace_fillInStackTrace(void **target,
-                                                                                         CacaoStackTraceCollector coll)
+                                                                          CacaoStackTraceCollector coll)
+#endif
+
 {
        stacktraceelement primaryBlock[BLOCK_INITIALSIZE*sizeof(stacktraceelement)];
        stackTraceBuffer  buffer;
@@ -748,7 +751,14 @@ static bool cacao_stacktrace_fillInStackTrace(void **target,
        /* the first element in the stackframe chain must always be a native      */
        /* stackframeinfo (VMThrowable.fillInStackTrace is a native function)     */
 
+#ifdef ENABLE_JVMTI
+       if (thread == NULL) 
+               sfi = *STACKFRAMEINFO; /* invocation from Throwable */
+       else
+               sfi = thread->info._stackframeinfo; /* invocation from JVMTI */
+#else
        sfi = *STACKFRAMEINFO;
+#endif
 
        if (!sfi) {
                *target = NULL;
@@ -759,6 +769,7 @@ static bool cacao_stacktrace_fillInStackTrace(void **target,
 
 #if PRINTMETHODS
        printf("\n\nfillInStackTrace start:\n");
+       fflush(stdout);
 #endif
 
        /* loop while we have a method pointer (asm_calljavafunction has NULL) or */
@@ -790,6 +801,7 @@ static bool cacao_stacktrace_fillInStackTrace(void **target,
                                utf_display(m->name);
                                utf_display(m->descriptor);
                                printf(": native stub\n");
+                               fflush(stdout);
 #endif
                                /* this is an native stub stackframe info, so we can get the */
                                /* parent pv from the return address (ICMD_INVOKE*) */
@@ -817,6 +829,7 @@ static bool cacao_stacktrace_fillInStackTrace(void **target,
 
 #if PRINTMETHODS
                                printf("NULL: inline stub\n");
+                               fflush(stdout);
 #endif
 
                                /* get methodinfo from current Java method */
@@ -832,6 +845,7 @@ static bool cacao_stacktrace_fillInStackTrace(void **target,
                                        utf_display(m->name);
                                        utf_display(m->descriptor);
                                        printf(": inline stub parent\n");
+                                       fflush(stdout);
 #endif
 
 #if defined(ENABLE_INTRP)
@@ -866,6 +880,12 @@ static bool cacao_stacktrace_fillInStackTrace(void **target,
                                        }
 #endif
                                }
+#if PRINTMETHODS
+                               else {
+                                       printf("asm_calljavafunction\n");
+                                       fflush(stdout);
+                               }
+#endif
                        }
 
                        /* get previous stackframeinfo in the chain */
@@ -933,8 +953,11 @@ static bool cacao_stacktrace_fillInStackTrace(void **target,
    XXX
 
 *******************************************************************************/
-
+#ifdef ENABLE_JVMTI
+bool stackTraceCollector(void **target, stackTraceBuffer *buffer)
+#else
 static bool stackTraceCollector(void **target, stackTraceBuffer *buffer)
+#endif
 {
        stackTraceBuffer *dest;
 
@@ -956,7 +979,12 @@ static bool stackTraceCollector(void **target, stackTraceBuffer *buffer)
 
 bool cacao_stacktrace_NormalTrace(void **target)
 {
+#ifdef ENABLE_JVMTI
+       return cacao_stacktrace_fillInStackTrace(target, &stackTraceCollector, NULL);
+#else
        return cacao_stacktrace_fillInStackTrace(target, &stackTraceCollector);
+#endif
+
 }
 
 
@@ -1016,8 +1044,13 @@ java_objectarray *cacao_createClassContextArray(void)
 {
        java_objectarray *array = NULL;
 
+#ifdef ENABLE_JVMTI
+       if (!cacao_stacktrace_fillInStackTrace((void **) &array,
+                                                                                  &classContextCollector, NULL))
+#else
        if (!cacao_stacktrace_fillInStackTrace((void **) &array,
                                                                                   &classContextCollector))
+#endif
                return NULL;
 
        return array;
@@ -1075,8 +1108,15 @@ java_objectheader *cacao_currentClassLoader(void)
 {
        java_objectheader *header = NULL;
 
+
+#ifdef ENABLE_JVMTI
+       if (!cacao_stacktrace_fillInStackTrace((void**)&header,
+                                                                                  &stacktrace_classLoaderCollector,
+                                                                                  NULL))
+#else
        if (!cacao_stacktrace_fillInStackTrace((void**)&header,
                                                                                   &stacktrace_classLoaderCollector))
+#endif
                return NULL;
 
        return header;
@@ -1139,8 +1179,13 @@ java_objectarray *cacao_getStackForVMAccessController(void)
 {
        java_objectarray *result = NULL;
 
+#ifdef ENABLE_JVMTI
+       if (!cacao_stacktrace_fillInStackTrace((void **) &result,
+                                                                                  &getStackCollector,NULL))
+#else
        if (!cacao_stacktrace_fillInStackTrace((void **) &result,
                                                                                   &getStackCollector))
+#endif
                return NULL;
 
        return result;
@@ -1180,8 +1225,13 @@ void stacktrace_dump_trace(void)
 
        /* print stacktrace */
 
-       if (buffer)
+       if (buffer) {
                stacktrace_print_trace(buffer);
+
+       } else {
+               puts("\t<<No stacktrace available>>");
+               fflush(stdout);
+       }
 }
 
 
@@ -1211,7 +1261,7 @@ void stacktrace_print_trace(stackTraceBuffer *stb)
                utf_display(m->descriptor);
 
                if (m->flags & ACC_NATIVE) {
-                       printf("(Native Method)\n");
+                       puts("(Native Method)");
 
                } else {
                        printf("(");