New source tree.

[cacao.git] / src / vm / jit / reg.inc

diff --git a/src/vm/jit/reg.inc b/src/vm/jit/reg.inc
index 0a67f9959261753a7eba2e9086e34de6a429acd6..b189c6163545acb03627de7eb65cd953e18c0031 100644 (file)
--- a/src/vm/jit/reg.inc
+++ b/src/vm/jit/reg.inc
@@ -1,4 +1,4 @@
-/* jit/reg.inc - register allocator
+/* vm/jit/reg.inc - register allocator
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    Institut f. Computersprachen, TU Wien
@@ -30,13 +30,13 @@
    Changes: Stefan Ring
             Christian Thalinger
 
-   $Id: reg.inc 1466 2004-11-08 11:24:50Z twisti $
+   $Id: reg.inc 1621 2004-11-30 13:06:55Z twisti $
 
 */
 
 
-#include "jit/reg.h"
-#include "toolbox/memory.h"
+#include "mm/memory.h"
+#include "vm/jit/reg.h"
 
 
 /* function prototypes for this file */
@@ -867,6 +867,8 @@ static void allocate_scratch_registers(methodinfo *m, registerdata *rd)
                                case ICMD_RET:
                                case ICMD_RETURN:
                                case ICMD_GOTO:
+                               case ICMD_INLINE_START:
+                               case ICMD_INLINE_END:
                                        break;
 
                                        /* pop 0 push 1 const */