Merged trunk and subtype.

[cacao.git] / src / vm / jit / mips / codegen.h

diff --git a/src/vm/jit/mips/codegen.h b/src/vm/jit/mips/codegen.h
index b305542804bd84b5078fde28bdf252b92c734b4f..188ad6eb779cbc60e39a8692ccfa42ec19783d4e 100644 (file)
--- a/src/vm/jit/mips/codegen.h
+++ b/src/vm/jit/mips/codegen.h
@@ -1,9 +1,7 @@
 /* src/vm/jit/mips/codegen.h - code generation macros and definitions for MIPS
 
-   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: codegen.h 7691 2007-04-12 12:45:10Z twisti $
-
 */
 
 
@@ -33,7 +29,7 @@
 #include "config.h"
 #include "vm/types.h"
 
-#include "vm/jit/jit.h"
+#include "vm/jit/jit.hpp"
 
 
 /* additional functions and macros to generate code ***************************/
@@ -115,24 +111,15 @@
 
 /* patcher defines ************************************************************/
 
-#define PATCHER_CALL_INSTRUCTIONS    5     /* number of instructions          */
-#define PATCHER_CALL_SIZE            5 * 4 /* size in bytes of a patcher call */
+#define PATCHER_CALL_INSTRUCTIONS    1     /* number of instructions          */
+#define PATCHER_CALL_SIZE            1 * 4 /* size in bytes of a patcher call */
 
 #define PATCHER_NOPS \
     do { \
         M_NOP; \
-        M_NOP; \
-        M_NOP; \
-        M_NOP; \
-        M_NOP; \
     } while (0)
 
 
-/* stub defines ***************************************************************/
-
-#define COMPILERSTUB_CODESIZE    4 * 4
-
-
 /* macros to create code ******************************************************/
 
 /* code generation macros operands: