* src/vm/builtin.c (builtin_canstore): Throw an ArrayStoreException.

[cacao.git] / src / vm / jit / intrp / peephole.c

diff --git a/src/vm/jit/intrp/peephole.c b/src/vm/jit/intrp/peephole.c
index a37363873c42382290651659f87af946e6a8531c..a190f35045711020722f19a7021215b1473651f2 100644 (file)
--- a/src/vm/jit/intrp/peephole.c
+++ b/src/vm/jit/intrp/peephole.c
@@ -20,12 +20,14 @@
 */
 
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdlib.h>
 
 #include "vm/jit/intrp/intrp.h"
 
-#include "vm/options.h"
+#include "vmcore/options.h"
 
 
 /* the numbers in this struct are primitive indices */
@@ -36,7 +38,7 @@ typedef struct Combination {
 } Combination;
 
 Combination peephole_table[] = {
-#include "java-peephole.i"
+#include <java-peephole.i>
   {-1,-1,-1} /* unnecessary; just to shut up lcc if the file is empty */
 };
 
@@ -82,7 +84,7 @@ void init_peeptable(void)
   peeptable = prepare_peephole_table(vm_prim);
 }
 
-s4 peephole_opt(u4 inst1, u4 inst2, Cell peeptable)
+ptrint peephole_opt(ptrint inst1, ptrint inst2, Cell peeptable)
 {
   Peeptable_entry **pt = (Peeptable_entry **)peeptable;
   Peeptable_entry *p;