Merged revisions 7766-7796 via svnmerge from

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

diff --git a/src/vm/jit/m68k/codegen.h b/src/vm/jit/m68k/codegen.h
index 736707d573cbaf73058851bcef0cffa7c47fed33..7103b75fb0d296945fbaefcf842f04bc31189b80 100644 (file)
--- a/src/vm/jit/m68k/codegen.h
+++ b/src/vm/jit/m68k/codegen.h
@@ -45,8 +45,7 @@
     } while (0)
 
 
-#define PATCHER_NOPS \
-       do { M_TPFL; M_TPF; M_TPF } while (0);
+/* branch defines *************************************************************/
 
 #define BRANCH_NOPS \
     do { \
@@ -61,6 +60,17 @@
     } while (0)
 
 
+/* patcher defines ************************************************************/
+
+#define PATCHER_NOPS \
+       do { M_TPFL; M_TPF; M_TPF } while (0);
+
+
+/* stub defines ***************************************************************/
+
+#define COMPILERSTUB_CODESIZE (6+6+6+2)
+
+
 /* coldfire instruction format:
  * -----------------------------
  * | Op Word                    |
@@ -323,6 +333,8 @@
 #define M_BHI_16(a)                    BRANCH16(0x2, (a))
 #define M_BHI_32(a)                    BRANCH32(0x2, (a))
 
+#define M_BLS(a)                       BRANCH8 (0x3, (a))
+
 #define        M_BMI(a)                        BRANCH8(0xb, (a))
 #define M_BPL(a)                       BRANCH8(0xa, (a))
 
@@ -342,6 +354,13 @@
 #define M_STWX(a,c)                    OPWORD( ( (2<<6) | ((a) << 3) | 2), 0, (c))
 #define M_STAX(a,c)                    OPWORD( ( (2<<6) | ((a) << 3) | 2), 1, (c))     /* movea.l */
 
+#if !defined(ENABLE_SOFTFLOAT)
+       #define M_LFSX(a,c)             M_ILLEGAL
+       #define M_LFDX(a,c)             M_ILLEGAL
+       #define M_STFSX(a,c)            M_ILLEGAL
+       #define M_STFDX(a,c)            M_ILLEGAL
+#endif
+
 #define M_BSEXT(a,b)                   OPWORD( ( (7<<6) | ((b) << 3) | 4), 0, (a))     /* mvs.b */
 #define M_CZEXT(a,b)                   OPWORD( ( (7<<6) | ((b) << 3) | 7), 0, (a))     /* mvz.w */
 #define M_SSEXT(a,b)                   OPWORD( ( (7<<6) | ((b) << 3) | 5), 0, (a))     /* mvs.w */