Merged branch subtype-trunk into default.

[cacao.git] / src / vm / jit / loop / graph.c

diff --git a/src/vm/jit/loop/graph.c b/src/vm/jit/loop/graph.c
index d93b84fe3c1f66f75075db14cc072cb879740b72..9c420e5b842c978b9d98c0d694892c67deea9a82 100644 (file)
--- a/src/vm/jit/loop/graph.c
+++ b/src/vm/jit/loop/graph.c
@@ -1,9 +1,9 @@
 /* src/vm/jit/loop/graph.c - control flow graph
 
-   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: Christopher Kruegel
 
@@ -31,16 +31,14 @@
    Contains the functions which build a list, that represents the
    control flow graph of the procedure, that is being analyzed.
 
-   $Id: graph.c 2495 2005-05-22 19:49:53Z twisti $
-
 */
 
 
 #include <assert.h>
 
-#include "mm/memory.h"
-#include "toolbox/logging.h"
-#include "vm/jit/jit.h"
+#include "mm/memory.hpp"
+#include "toolbox/logging.hpp"
+#include "vm/jit/jit.hpp"
 #include "vm/jit/loop/graph.h"
 #include "vm/jit/loop/loop.h"
 
@@ -75,10 +73,17 @@ void LoopContainerInit(methodinfo *m, struct LoopContainer *lc, int i)
    variable c_dTable 
 */
 
-void depthFirst(methodinfo *m, loopdata *ld)
+void depthFirst(jitdata *jd)
 {
+       methodinfo *m;
+       loopdata   *ld;
        int i;
 
+       /* get required compiler data */
+
+       m  = jd->m;
+       ld = jd->ld;
+
 /*     allocate memory and init gobal variables needed by function dF(m, int, int)     */
   
        ld->c_defnum = DMNEW(int, m->basicblockcount);