Merged with the latest version of x86-codegen.h from the Mono project

diff --git a/ChangeLog b/ChangeLog
index 5789c7ce5558162399680758b9ff09820fc49096..8ed37193046b2b4199075f6d9dd5b9239fbb5876 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-10  Aleksey Demakov  <ademakov@gmail.com>
+
+       * jit/jit-gen-x86.h: Merged changes from the latest Mono project's version
+       of this file.
+
 2005-11-19  Klaus Treichel  <ktreichel@web.de>
 
        * jit/apply-x86-64.h: Change definition of JIT_MEMCPY from "jit_memcpy" to

diff --git a/jit/jit-gen-x86.h b/jit/jit-gen-x86.h
index 9bb99a5b282f7b577f94d8b5b9ccb0342306a5be..d59baab2e6b4dc1db9d4bff4f8550569c338221d 100644 (file)
--- a/jit/jit-gen-x86.h
+++ b/jit/jit-gen-x86.h
@@ -6,6 +6,7 @@
  *   Intel Corporation (ORP Project)
  *   Sergey Chaban (serge@wildwestsoftware.com)
  *   Dietmar Maurer (dietmar@ximian.com)
+ *   Patrik Torstensson
  * 
  * Copyright (C)  2000 Intel Corporation.  All rights reserved.
  * Copyright (C)  2001, 2002 Ximian, Inc.
@@ -92,6 +93,39 @@ typedef enum {
        X86_CC_NO = 11,
        X86_NCC
 } X86_CC;
+
+/* FP status */
+enum {
+       X86_FP_C0 = 0x100,
+       X86_FP_C1 = 0x200,
+       X86_FP_C2 = 0x400,
+       X86_FP_C3 = 0x4000,
+       X86_FP_CC_MASK = 0x4500
+};
+
+/* FP control word */
+enum {
+       X86_FPCW_INVOPEX_MASK = 0x1,
+       X86_FPCW_DENOPEX_MASK = 0x2,
+       X86_FPCW_ZERODIV_MASK = 0x4,
+       X86_FPCW_OVFEX_MASK   = 0x8,
+       X86_FPCW_UNDFEX_MASK  = 0x10,
+       X86_FPCW_PRECEX_MASK  = 0x20,
+       X86_FPCW_PRECC_MASK   = 0x300,
+       X86_FPCW_ROUNDC_MASK  = 0xc00,
+
+       /* values for precision control */
+       X86_FPCW_PREC_SINGLE    = 0,
+       X86_FPCW_PREC_DOUBLE    = 0x200,
+       X86_FPCW_PREC_EXTENDED  = 0x300,
+
+       /* values for rounding control */
+       X86_FPCW_ROUND_NEAREST  = 0,
+       X86_FPCW_ROUND_DOWN     = 0x400,
+       X86_FPCW_ROUND_UP       = 0x800,
+       X86_FPCW_ROUND_TOZERO   = 0xc00
+};
+
 /*
 // prefix code
 */
@@ -106,6 +140,8 @@ typedef enum {
        X86_ES_PREFIX = 0x26,
        X86_FS_PREFIX = 0x64,
        X86_GS_PREFIX = 0x65,
+       X86_UNLIKELY_PREFIX = 0x2E,
+       X86_LIKELY_PREFIX = 0x3E,
        X86_OPERAND_PREFIX = 0x66,
        X86_ADDRESS_PREFIX = 0x67
 } X86_Prefix;
@@ -164,6 +200,8 @@ typedef union {
 #define X86_IS_SCRATCH(reg) (X86_CALLER_REGS & (1 << (reg))) /* X86_EAX, X86_ECX, or X86_EDX */
 #define X86_IS_CALLEE(reg)  (X86_CALLEE_REGS & (1 << (reg)))   /* X86_ESI, X86_EDI, X86_EBX, or X86_EBP */
 
+#define X86_IS_BYTE_REG(reg) ((reg) < 4)
+
 /*
 // Frame structure:
 //
@@ -207,6 +245,10 @@ typedef union {
 /*
  * useful building blocks
  */
+#define x86_modrm_mod(modrm) ((modrm) >> 6)
+#define x86_modrm_reg(modrm) (((modrm) >> 3) & 0x7)
+#define x86_modrm_rm(modrm) ((modrm) & 0x7)
+
 #define x86_address_byte(inst,m,o,r) do { *(inst)++ = ((((m)&0x03)<<6)|(((o)&0x07)<<3)|(((r)&0x07))); } while (0)
 #define x86_imm_emit32(inst,imm)     \
        do {    \
@@ -269,7 +311,7 @@ typedef union {
                        x86_address_byte ((inst), (shift), (indexreg), (basereg));      \
                        x86_imm_emit8 ((inst), (disp)); \
                } else {        \
-                       x86_address_byte ((inst), 0, (r), 4);   \
+                       x86_address_byte ((inst), 2, (r), 4);   \
                        x86_address_byte ((inst), (shift), (indexreg), 5);      \
                        x86_imm_emit32 ((inst), (disp));        \
                }       \
@@ -323,6 +365,10 @@ typedef union {
 #define x86_cld(inst) do { *(inst)++ =(unsigned char)0xfc; } while (0)
 #define x86_stosb(inst) do { *(inst)++ =(unsigned char)0xaa; } while (0)
 #define x86_stosl(inst) do { *(inst)++ =(unsigned char)0xab; } while (0)
+#define x86_stosd(inst) x86_stosl((inst))
+#define x86_movsb(inst) do { *(inst)++ =(unsigned char)0xa4; } while (0)
+#define x86_movsl(inst) do { *(inst)++ =(unsigned char)0xa5; } while (0)
+#define x86_movsd(inst) x86_movsl((inst))
 
 #define x86_prefix(inst,p) do { *(inst)++ =(unsigned char) (p); } while (0)
 
@@ -380,6 +426,36 @@ typedef union {
                x86_membase_emit ((inst), (reg), (basereg), (disp));    \
        } while (0)
 
+#define x86_xadd_reg_reg(inst,dreg,reg,size)   \
+       do {    \
+               *(inst)++ = (unsigned char)0x0F;     \
+               if ((size) == 1)        \
+                       *(inst)++ = (unsigned char)0xC0;        \
+               else    \
+                       *(inst)++ = (unsigned char)0xC1;        \
+               x86_reg_emit ((inst), (reg), (dreg));   \
+       } while (0)
+
+#define x86_xadd_mem_reg(inst,mem,reg,size)    \
+       do {    \
+               *(inst)++ = (unsigned char)0x0F;     \
+               if ((size) == 1)        \
+                       *(inst)++ = (unsigned char)0xC0;        \
+               else    \
+                       *(inst)++ = (unsigned char)0xC1;        \
+               x86_mem_emit ((inst), (reg), (mem));    \
+       } while (0)
+
+#define x86_xadd_membase_reg(inst,basereg,disp,reg,size)       \
+       do {    \
+               *(inst)++ = (unsigned char)0x0F;     \
+               if ((size) == 1)        \
+                       *(inst)++ = (unsigned char)0xC0;        \
+               else    \
+                       *(inst)++ = (unsigned char)0xC1;        \
+               x86_membase_emit ((inst), (reg), (basereg), (disp));    \
+       } while (0)
+
 #define x86_inc_mem(inst,mem)  \
        do {    \
                *(inst)++ = (unsigned char)0xff;        \
@@ -489,6 +565,13 @@ typedef union {
                        x86_imm_emit32 ((inst), (imm)); \
                }       \
        } while (0)
+       
+#define x86_alu_membase8_imm(inst,opc,basereg,disp,imm)        \
+       do {    \
+               *(inst)++ = (unsigned char)0x80;        \
+               x86_membase_emit ((inst), (opc), (basereg), (disp));    \
+               x86_imm_emit8 ((inst), (imm)); \
+       } while (0)
 
 #define x86_alu_mem_reg(inst,opc,mem,reg)      \
        do {    \
@@ -950,6 +1033,7 @@ typedef union {
 #define x86_widen_reg(inst,dreg,reg,is_signed,is_half) \
        do {    \
                unsigned char op = 0xb6;        \
+                jit_assert (is_half ||  X86_IS_BYTE_REG (reg)); \
                *(inst)++ = (unsigned char)0x0f;        \
                if ((is_signed)) op += 0x08;    \
                if ((is_half)) op += 0x01;      \
@@ -1182,6 +1266,12 @@ typedef union {
                *(inst)++ = (unsigned char)0xe8;        \
        } while (0)
 
+#define x86_fldpi(inst)        \
+       do {    \
+               *(inst)++ = (unsigned char)0xd9;        \
+               *(inst)++ = (unsigned char)0xeb;        \
+       } while (0)
+
 #define x86_fst(inst,mem,is_double,pop_stack)  \
        do {    \
                *(inst)++ = (is_double) ? (unsigned char)0xdd: (unsigned char)0xd9;     \
@@ -1230,6 +1320,13 @@ typedef union {
                }       \
        } while (0)
 
+#define x86_fstsw(inst)        \
+       do {    \
+                       *(inst)++ = (unsigned char)0x9b;        \
+                       *(inst)++ = (unsigned char)0xdf;        \
+                       *(inst)++ = (unsigned char)0xe0;        \
+       } while (0)
+
 /**
  * @x86_fist_membase
  * Converts content of ST(0) to integer and stores it at memory location
@@ -1277,10 +1374,18 @@ typedef union {
                x86_memindex_emit ((inst), 6, (basereg), (disp), (indexreg), (shift));  \
        } while (0)
 
+#define x86_push_imm_template(inst) x86_push_imm (inst, 0xf0f0f0f0)
+       
 #define x86_push_imm(inst,imm) \
        do {    \
-               *(inst)++ = (unsigned char)0x68;        \
-               x86_imm_emit32 ((inst), (imm)); \
+               int _imm = (int) (imm); \
+               if (x86_is_imm8 (_imm)) {       \
+                       *(inst)++ = (unsigned char)0x6A;        \
+                       x86_imm_emit8 ((inst), (_imm)); \
+               } else {        \
+                       *(inst)++ = (unsigned char)0x68;        \
+                       x86_imm_emit32 ((inst), (_imm));        \
+               }       \
        } while (0)
 
 #define x86_pop_reg(inst,reg)  \
@@ -1421,6 +1526,7 @@ typedef union {
 
 #define x86_set_reg(inst,cond,reg,is_signed)   \
        do {    \
+                jit_assert (X86_IS_BYTE_REG (reg)); \
                *(inst)++ = (unsigned char)0x0f;        \
                if ((is_signed))        \
                        *(inst)++ = x86_cc_signed_map [(cond)] + 0x20;  \
@@ -1535,6 +1641,8 @@ typedef union {
 #define x86_fsin(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xfe; } while (0)
 #define x86_fcos(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xff; } while (0)
 #define x86_fabs(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xe1; } while (0)
+#define x86_ftst(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xe4; } while (0)
+#define x86_fxam(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xe5; } while (0)
 #define x86_fpatan(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xf3; } while (0)
 #define x86_fprem(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xf8; } while (0)
 #define x86_fprem1(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xf5; } while (0)