* doc/inlining_stacktrace.txt: Added.

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

diff --git a/src/vm/jit/dseg.h b/src/vm/jit/dseg.h
index cb8e6686645d165f0d52fc89600896cb263949ba..0b567704118b3ae9b9ace1911ea6e8a8186fb447 100644 (file)
--- a/src/vm/jit/dseg.h
+++ b/src/vm/jit/dseg.h
@@ -1,9 +1,9 @@
 /* src/vm/jit/dseg.c - data segment handling stuff
 
-   Copyright (C) 1996-2005 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 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,10 +19,10 @@
 
    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
+   Contact: cacao@cacaojvm.org
 
    Authors: Reinhard Grafl
             Andreas  Krall
@@ -30,7 +30,7 @@
    Changes: Christian Thalinger
             Joseph Wenninger
 
-   $Id: dseg.h 4198 2006-01-13 15:28:34Z twisti $
+   $Id: dseg.h 4445 2006-02-05 15:26:34Z edwin $
 
 */
 
@@ -95,10 +95,16 @@ struct patchref {
 
 struct linenumberref {
        s4             tablepos;    /* patching position in data segment          */
-       s4             targetmpc;   /* machine code program counter of first      */
+       s4             linenumber;  /* line number, used for inserting into the   */
+                                   /* table and for validity checking            */
+                                   /* -1......start of inlined body              */
+                                   /* -2......end of inlined body                */
+                                   /* <= -3...special entry with methodinfo *    */
+                                                               /* (see doc/inlining_stacktrace.txt)          */
+       ptrint         targetmpc;   /* machine code program counter of first      */
                                    /* instruction for given line                 */
-       u2             linenumber;  /* line number, used for inserting into the   */
-                                   /* table and for validty checking             */
+                                                               /* NOTE: for linenumber <= -3 this is a the   */
+                                   /* (methodinfo *) of the inlined method       */
        linenumberref *next;        /* next element in linenumberref list         */
 };
 
@@ -123,6 +129,8 @@ void dseg_addtarget(codegendata *cd, basicblock *target);
 
 void dseg_addlinenumbertablesize(codegendata *cd);
 void dseg_addlinenumber(codegendata *cd, u2 linenumber, u1 *ptr);
+void dseg_addlinenumber_inline_start(codegendata *cd, instruction *iptr, u1 *ptr);
+void dseg_addlinenumber_inline_end(codegendata *cd, instruction *iptr);
 
 void dseg_createlinenumbertable(codegendata *cd);
 
@@ -149,4 +157,5 @@ void dseg_display(methodinfo *m, codegendata *cd);
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */