Merged.

[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 cb032b8e66bc46937643a2a908ed81471fd544b0..9b292e64e4c72497e3eadfbc5401164cf79697be 100644 (file)
--- a/src/vm/jit/optimizing/ifconv.c
+++ b/src/vm/jit/optimizing/ifconv.c
@@ -1,9 +1,7 @@
-/* src/vm/jit/ifconv/ifconv.c - if-conversion
+/* src/vm/jit/optimizing/ifconv.c - if-conversion
 
-   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
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,8 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: stack.c 4455 2006-02-06 01:02:59Z edwin $
-
 */
 
 
@@ -33,14 +29,13 @@
 
 #include "vm/types.h"
 
-#include "vm/vm.h"
+#include "vm/method.hpp"
+#include "vm/vm.hpp"
 
-#include "vm/jit/codegen-common.h"
-#include "vm/jit/jit.h"
+#include "vm/jit/codegen-common.hpp"
+#include "vm/jit/jit.hpp"
 #include "vm/jit/reg.h"
-#include "vm/jit/show.h"
-
-#include "vmcore/method.h"
+#include "vm/jit/show.hpp"
 
 
 /* patterns for a total number of 3 instructions ******************************/