Merged revisions 7940-8026 via svnmerge from

[cacao.git] / src / vm / jit / optimizing / ifconv.c

diff --git a/src/vm/jit/optimizing/ifconv.c b/src/vm/jit/optimizing/ifconv.c
index 2a778ac2ee2ed2edbe7439ab147e8a03a792f88f..cb032b8e66bc46937643a2a908ed81471fd544b0 100644 (file)
--- a/src/vm/jit/optimizing/ifconv.c
+++ b/src/vm/jit/optimizing/ifconv.c
@@ -1,6 +1,6 @@
 /* src/vm/jit/ifconv/ifconv.c - if-conversion
 
-   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
@@ -22,12 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes:
-
    $Id: stack.c 4455 2006-02-06 01:02:59Z edwin $
 
 */
@@ -39,12 +33,15 @@
 
 #include "vm/types.h"
 
-#include "vm/method.h"
+#include "vm/vm.h"
+
 #include "vm/jit/codegen-common.h"
 #include "vm/jit/jit.h"
 #include "vm/jit/reg.h"
 #include "vm/jit/show.h"
 
+#include "vmcore/method.h"
+
 
 /* patterns for a total number of 3 instructions ******************************/
 
@@ -244,10 +241,11 @@ bool ifconv_static(jitdata *jd)
                                /* keep compiler happy */
 
                                pattern     = NULL;
+                               patternsize = 0;
 
                                /* that should not happen */
 
-                               assert(0);
+                               vm_abort("ifconv_static: invalid instruction count %d", icount);
                        }
 
                        /* Iterate over all patterns of the given pattern. */
@@ -339,7 +337,7 @@ bool ifconv_static(jitdata *jd)
 
                                        condition = 0;
 
-                                       assert(0);
+                                       vm_abort("ifconv_static: invalid opcode: %d", iptr->opc);
                                }
 
                                /* get the condition array index */