* src/vm/jit/stacktrace.c (stacktrace_create_stackframeinfo): Removed.

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

diff --git a/src/vm/jit/stacktrace.h b/src/vm/jit/stacktrace.h
index 7f62ba4c0f0fca1a03c6caabf9c2fe42a46e0806..c2531481c037302adc0296fcf60a1b588fa8991d 100644 (file)
--- a/src/vm/jit/stacktrace.h
+++ b/src/vm/jit/stacktrace.h
@@ -1,9 +1,9 @@
-/* vm/jit/stacktrace.h - header file for stacktrace generation
+/* src/vm/jit/stacktrace.h - header file for stacktrace generation
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
-   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
-   P. Tomsich, J. Wenninger
+   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
 
    This file is part of CACAO.
 
@@ -19,28 +19,118 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+*/
 
-   Authors: Christian Thalinger
 
-   Changes:
+#ifndef _STACKTRACE_H
+#define _STACKTRACE_H
 
-   $Id: stacktrace.h 1693 2004-12-06 12:30:35Z twisti $
+/* forward typedefs ***********************************************************/
 
-*/
+typedef struct stackframeinfo stackframeinfo;
+typedef struct stacktracebuffer stacktracebuffer;
+typedef struct stacktrace_entry stacktrace_entry;
 
+#include "config.h"
+#include "vm/types.h"
+
+#include "md-abi.h"
+
+#include "vmcore/class.h"
+#include "vmcore/method.h"
+
+
+/* stackframeinfo **************************************************************
+
+   ATTENTION: Keep the number of elements of this structure even, to
+   make sure that the stack keeps aligned (e.g. 16-bytes for x86_64).
+
+*******************************************************************************/
+
+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)             */
+#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];
+# else
+       ptrint          intregs[INT_SAV_CNT];
+# endif
+#endif
+};
+
+
+/* stacktrace_entry ***********************************************************/
+
+struct stacktrace_entry {
+#if SIZEOF_VOID_P == 8
+       u8          linenumber;
+#else
+       u4          linenumber;
+#endif
+       methodinfo *method;
+};
+
+
+/* stacktracebuffer ***********************************************************/
+
+#define STACKTRACE_CAPACITY_DEFAULT      80
+#define STACKTRACE_CAPACITY_INCREMENT    80
+
+struct stacktracebuffer {
+       s4               capacity;          /* size of the buffer                 */
+       s4               used;              /* current entries in the buffer      */
+       stacktrace_entry entries[80];       /* the actual entries                 */
+};
 
-#ifndef _STACKTRACE_H
-#define _STACKTRACE_H
 
 /* function prototypes ********************************************************/
 
-void cacao_stacktrace_NormalTrace(void **target);
-java_objectarray *cacao_createClassContextArray();
-java_objectheader *cacao_currentClassLoader();
+void stacktrace_stackframeinfo_add(stackframeinfo *sfi, u1 *pv, u1 *sp, u1 *ra, u1 *xpc);
+void stacktrace_stackframeinfo_remove(stackframeinfo *sfi);
+
+
+stacktracebuffer *stacktrace_create(stackframeinfo *sfi);
+
+java_handle_bytearray_t   *stacktrace_fillInStackTrace(void);
+
+#if defined(ENABLE_JAVASE)
+java_handle_objectarray_t *stacktrace_getClassContext(void);
+classinfo                 *stacktrace_getCurrentClass(void);
+java_handle_objectarray_t *stacktrace_getStack(void);
+#endif
+
+void stacktrace_print_trace_from_buffer(stacktracebuffer *stb);
+void stacktrace_print_trace(java_handle_t *xptr);
+
+/* machine dependent functions (code in ARCH_DIR/md.c) */
+
+#if defined(ENABLE_JIT)
+u1 *md_stacktrace_get_returnaddress(u1 *sp, u4 framesize);
+# if defined(__SPARC_64__)
+u1 *md_get_framepointer(u1 *sp);
+u1 *md_get_pv_from_stackframe(u1 *sp);
+# endif
+#endif
+
+#if defined(ENABLE_INTRP)
+u1 *intrp_md_stacktrace_get_returnaddress(u1 *sp, u4 framesize);
+#endif
+
+#if defined(ENABLE_CYCLES_STATS)
+void stacktrace_print_cycles_stats(FILE *file);
+#endif
 
 #endif /* _STACKTRACE_H */
 
@@ -56,4 +146,5 @@ java_objectheader *cacao_currentClassLoader();
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */