* src/vm/jit/alpha/codegen.h (BRANCH_NOPS): Defined.

* src/vm/jit/i386/codegen.h (BRANCH_NOPS, PATCHER_NOPS): Likewise.
* src/vm/jit/mips/codegen.h (BRANCH_NOPS): Likewise.
* src/vm/jit/powerpc/codegen.h (BRANCH_NOPS): Likewise.
* src/vm/jit/powerpc64/codegen.h (BRANCH_NOPS, PATCHER_CALL_SIZE)
(PATCHER_NOPS): Likewise.
* src/vm/jit/x86_64/codegen.h (BRANCH_NOPS): Likewise.

diff --git a/src/vm/jit/alpha/codegen.h b/src/vm/jit/alpha/codegen.h
index 203d5802c962e6c04cc88318a01211efd6c45a4a..a567903d1c97f8a10c05178ad2750fc0b956ef9f 100644 (file)
--- a/src/vm/jit/alpha/codegen.h
+++ b/src/vm/jit/alpha/codegen.h
@@ -28,7 +28,7 @@
             Reinhard Grafl
             Christian Thalinger
 
-   $Id: codegen.h 6072 2006-11-28 19:14:14Z twisti $
+   $Id: codegen.h 6078 2006-11-28 22:19:16Z twisti $
 
 */
 
@@ -96,7 +96,15 @@
 #define LCONST(d,c)        emit_lconst(cd, (d), (c))
 
 
-/* some patcher defines *******************************************************/
+/* branch defines *************************************************************/
+
+#define BRANCH_NOPS \
+    do { \
+        M_NOP; \
+    } while (0)
+
+
+/* patcher defines ************************************************************/
 
 #define PATCHER_CALL_SIZE    1 * 4     /* an instruction is 4-bytes long      */
 

diff --git a/src/vm/jit/i386/codegen.h b/src/vm/jit/i386/codegen.h
index fd829f1a74fe397a5754695b0f55ab9c80b73209..c0051b4d27260ee8506b503f3ca9b5130fa6fbc7 100644 (file)
--- a/src/vm/jit/i386/codegen.h
+++ b/src/vm/jit/i386/codegen.h
@@ -27,7 +27,7 @@
    Authors: Andreas Krall
             Christian Thalinger
 
-   $Id: codegen.h 6049 2006-11-27 14:20:57Z edwin $
+   $Id: codegen.h 6078 2006-11-28 22:19:16Z twisti $
 
 */
 
@@ -46,10 +46,6 @@
 # define LSRA_USES_REG_RES
 #endif
 
-/* some defines ***************************************************************/
-
-#define PATCHER_CALL_SIZE    5          /* size in bytes of a patcher call    */
-
 
 /* additional functions and macros to generate code ***************************/
 
@@ -157,6 +153,32 @@
     } while (0)
 
 
+/* branch defines *************************************************************/
+
+#define BRANCH_NOPS \
+    do { \
+        M_NOP; \
+        M_NOP; \
+        M_NOP; \
+        M_NOP; \
+        M_NOP; \
+    } while (0)
+
+
+/* patcher defines ************************************************************/
+
+#define PATCHER_CALL_SIZE    5          /* size in bytes of a patcher call    */
+
+#define PATCHER_NOPS \
+    do { \
+        M_NOP; \
+        M_NOP; \
+        M_NOP; \
+        M_NOP; \
+        M_NOP; \
+    } while (0)
+
+
 /* macros to create code ******************************************************/
 
 #define M_ILD(a,b,disp)         emit_mov_membase_reg(cd, (b), (disp), (a))

diff --git a/src/vm/jit/mips/codegen.h b/src/vm/jit/mips/codegen.h
index eb5f7b06e1765271ee483550d536237750d5283b..9ed113c6b8640c31207c61baf1e8d04835467682 100644 (file)
--- a/src/vm/jit/mips/codegen.h
+++ b/src/vm/jit/mips/codegen.h
@@ -27,7 +27,7 @@
    Authors: Andreas Krall
             Christian Thalinger
 
-   $Id: codegen.h 5943 2006-11-09 15:27:03Z twisti $
+   $Id: codegen.h 6078 2006-11-28 22:19:16Z twisti $
 
 */
 
@@ -41,12 +41,6 @@
 #include "vm/jit/jit.h"
 
 
-/* some defines ***************************************************************/
-
-#define PATCHER_CALL_INSTRUCTIONS    5     /* number of instructions          */
-#define PATCHER_CALL_SIZE            5 * 4 /* size in bytes of a patcher call */
-
-
 /* additional functions and macros to generate code ***************************/
 
 /* MCODECHECK(icnt) */
@@ -63,15 +57,6 @@
         M_NOP; \
     }
 
-#define PATCHER_NOPS \
-    do { \
-        M_NOP; \
-        M_NOP; \
-        M_NOP; \
-        M_NOP; \
-        M_NOP; \
-    } while (0)
-
 #define M_INTMOVE(a,b) \
     do { \
         if ((a) != (b)) \
@@ -94,6 +79,33 @@
 #define LCONST(r,c)                     emit_lconst(cd, (r), (c))
 
 
+/* branch defines *************************************************************/
+
+#define BRANCH_NOPS \
+    do { \
+        M_NOP; \
+        M_NOP; \
+        M_NOP; \
+        M_NOP; \
+        M_NOP; \
+    } while (0)
+
+
+/* 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_NOPS \
+    do { \
+        M_NOP; \
+        M_NOP; \
+        M_NOP; \
+        M_NOP; \
+        M_NOP; \
+    } while (0)
+
+
 /* macros to create code ******************************************************/
 
 /* code generation macros operands:

diff --git a/src/vm/jit/powerpc/codegen.h b/src/vm/jit/powerpc/codegen.h
index c8f62f5d5b411f984b7c37796ff65b0e373ec669..1b6a3f82257c689f78428265624d2f95077bf1a5 100644 (file)
--- a/src/vm/jit/powerpc/codegen.h
+++ b/src/vm/jit/powerpc/codegen.h
@@ -30,7 +30,7 @@
             Christian Thalinger
             Christian Ullrich
 
-   $Id: codegen.h 6069 2006-11-27 20:05:59Z twisti $
+   $Id: codegen.h 6078 2006-11-28 22:19:16Z twisti $
 
 */
 
@@ -109,7 +109,15 @@
     }
 
 
-/* some patcher defines *******************************************************/
+/* branch defines *************************************************************/
+
+#define BRANCH_NOPS \
+    do { \
+        M_NOP; \
+    } while (0)
+
+
+/* patcher defines ************************************************************/
 
 #define PATCHER_CALL_SIZE    1 * 4      /* an instruction is 4-bytes long     */
 

diff --git a/src/vm/jit/powerpc64/codegen.h b/src/vm/jit/powerpc64/codegen.h
index 315363325db40c2979bd15cc62ee9b15cca8ed44..efe7bb1367db95e9f21555605b8c47c4bc40d357 100644 (file)
--- a/src/vm/jit/powerpc64/codegen.h
+++ b/src/vm/jit/powerpc64/codegen.h
@@ -1,5 +1,5 @@
 /* src/vm/jit/powerpc64/codegen.h - code generation macros and definitions for
-                                  32-bit PowerPC
+                                 64-bit PowerPC
 
    Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
    C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
@@ -27,11 +27,10 @@
 
    Authors: Andreas Krall
             Stefan Ring
-
-   Changes: Christian Thalinger
+            Christian Thalinger
             Christian Ullrich
 
-   $Id: codegen.h 5940 2006-11-09 09:59:28Z tbfg $
+   $Id: codegen.h 6078 2006-11-28 22:19:16Z twisti $
 
 */
 
@@ -115,6 +114,24 @@
     }
 
 
+/* branch defines *************************************************************/
+
+#define BRANCH_NOPS \
+    do { \
+        M_NOP; \
+    } while (0)
+
+
+/* patcher defines ************************************************************/
+
+#define PATCHER_CALL_SIZE    1 * 4      /* an instruction is 4-bytes long     */
+
+#define PATCHER_NOPS \
+    do { \
+        M_NOP; \
+    } while (0)
+
+
 /* macros to create code ******************************************************/
 
 #define M_OP3(opcode,y,oe,rc,d,a,b) \

diff --git a/src/vm/jit/x86_64/codegen.h b/src/vm/jit/x86_64/codegen.h
index 3bd617d47706b7c27a479f6580c087fb215f4e2d..7cedc13619c7f6d5eb632038afb37ecda813dac5 100644 (file)
--- a/src/vm/jit/x86_64/codegen.h
+++ b/src/vm/jit/x86_64/codegen.h
@@ -27,7 +27,7 @@
    Authors: Andreas Krall
             Christian Thalinger
 
-   $Id: codegen.h 5945 2006-11-10 16:41:12Z twisti $
+   $Id: codegen.h 6078 2006-11-28 22:19:16Z twisti $
 
 */
 
@@ -138,7 +138,19 @@
     } while (0)
 
 
-/* some patcher defines *******************************************************/
+/* branch defines *************************************************************/
+
+#define BRANCH_NOPS \
+    do { \
+        M_NOP; \
+        M_NOP; \
+        M_NOP; \
+        M_NOP; \
+        M_NOP; \
+    } while (0)
+
+
+/* patcher defines ************************************************************/
 
 #define PATCHER_CALL_SIZE    5          /* size in bytes of a patcher call    */