2007-04-06 Andreas Faerber <andreas.faerber@web.de>

[mono.git] / mono / mini / mini-amd64.h

diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h
index f829a3b55db440dea051f636cc2f86e8f88bacb6..7b2faabfba1edb77d351679bff63ff36250bfeaf 100644 (file)
--- a/mono/mini/mini-amd64.h
+++ b/mono/mini/mini-amd64.h
@@ -47,7 +47,8 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep);
 
 #ifdef sun    // Solaris x86
 #  undef SIGSEGV_ON_ALTSTACK
-#  define MONO_ARCH_USE_SIGACTION 1
+#  define MONO_ARCH_NOMAP32BIT
+
 struct sigcontext {
         unsigned short gs, __gsh;
         unsigned short fs, __fsh;
@@ -75,6 +76,8 @@ struct sigcontext {
 
 #define MONO_ARCH_SIGNAL_STACK_SIZE (64 * 1024)
 
+#define MONO_ARCH_CPU_SPEC amd64_desc
+
 #define MONO_MAX_IREGS 16
 
 #define MONO_MAX_FREGS AMD64_XMM_NREG
@@ -92,7 +95,7 @@ struct sigcontext {
 #define MONO_ARCH_USE_FPSTACK FALSE
 #define MONO_ARCH_FPSTACK_SIZE 6
 
-#define MONO_ARCH_INST_FIXED_REG(desc) ((desc == 's') ? AMD64_RCX : ((desc == 'a') ? AMD64_RAX : ((desc == 'd') ? AMD64_RDX : -1)))
+#define MONO_ARCH_INST_FIXED_REG(desc) ((desc == '\0') ? -1 : ((desc == 'i' ? -1 : ((desc == 'a') ? AMD64_RAX : ((desc == 's') ? AMD64_RCX : ((desc == 'd') ? AMD64_RDX : -1))))))
 
 /* RDX is clobbered by the opcode implementation before accessing sreg2 */
 #define MONO_ARCH_INST_SREG2_MASK(ins) (((ins [MONO_INST_CLOB] == 'a') || (ins [MONO_INST_CLOB] == 'd')) ? (1 << AMD64_RDX) : 0)
@@ -110,6 +113,8 @@ struct sigcontext {
 #define MONO_ARCH_RETREG1 X86_EAX
 #define MONO_ARCH_RETREG2 X86_EDX
 
+#define MONO_ARCH_AOT_PLT_OFFSET_REG AMD64_RAX
+
 #define MONO_ARCH_ENCODE_LREG(r1,r2) (r1 | (r2<<3))
 
 #define inst_dreg_low dreg&7 
@@ -157,53 +162,35 @@ typedef struct {
        guint64 r15;
 } MonoContext;
 
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-# define SC_EAX sc_eax
-# define SC_EBX sc_ebx
-# define SC_ECX sc_ecx
-# define SC_EDX sc_edx
-# define SC_EBP sc_ebp
-# define SC_EIP sc_eip
-# define SC_ESP sc_esp
-# define SC_EDI sc_edi
-# define SC_ESI sc_esi
-#else
-# define SC_EAX rax
-# define SC_EBX rbx
-# define SC_ECX rcx
-# define SC_EDX rdx
-# define SC_EBP rbp
-# define SC_EIP rip
-# define SC_ESP rsp
-# define SC_EDI rdi
-# define SC_ESI rsi
-
-# define SC_RIP rip
-# define SC_RSP rsp
-# define SC_RBP rbp
-# define SC_RBX rbx
-# define SC_R12 r12
-# define SC_R13 r13
-# define SC_R14 r14
-# define SC_R15 r15
-
-#endif
-
-#define MONO_CONTEXT_SET_IP(ctx,ip) do { (ctx)->rip = (long)(ip); } while (0); 
-#define MONO_CONTEXT_SET_BP(ctx,bp) do { (ctx)->rbp = (long)(bp); } while (0); 
-#define MONO_CONTEXT_SET_SP(ctx,esp) do { (ctx)->rsp = (long)(esp); } while (0); 
+#define MONO_CONTEXT_SET_IP(ctx,ip) do { (ctx)->rip = (guint64)(ip); } while (0); 
+#define MONO_CONTEXT_SET_BP(ctx,bp) do { (ctx)->rbp = (guint64)(bp); } while (0); 
+#define MONO_CONTEXT_SET_SP(ctx,esp) do { (ctx)->rsp = (guint64)(esp); } while (0); 
 
 #define MONO_CONTEXT_GET_IP(ctx) ((gpointer)((ctx)->rip))
 #define MONO_CONTEXT_GET_BP(ctx) ((gpointer)((ctx)->rbp))
 #define MONO_CONTEXT_GET_SP(ctx) ((gpointer)((ctx)->rsp))
 
+#ifdef _MSC_VER
+
+#define MONO_INIT_CONTEXT_FROM_FUNC(ctx, start_func) do { \
+    guint64 stackptr; \
+       mono_arch_flush_register_windows (); \
+       stackptr = ((guint64)_GetAddressOfReturnAddress () - sizeof (void*));\
+       MONO_CONTEXT_SET_IP ((ctx), (start_func)); \
+       MONO_CONTEXT_SET_BP ((ctx), stackptr); \
+       MONO_CONTEXT_SET_SP ((ctx), stackptr); \
+} while (0)
+
+#else
+
 #define MONO_INIT_CONTEXT_FROM_FUNC(ctx,start_func) do {       \
                mono_arch_flush_register_windows ();    \
                MONO_CONTEXT_SET_IP ((ctx), (start_func));      \
                MONO_CONTEXT_SET_BP ((ctx), __builtin_frame_address (0));       \
+               MONO_CONTEXT_SET_SP ((ctx), __builtin_frame_address (0));       \
        } while (0)
 
-#define MONO_ARCH_USE_SIGACTION 1
+#endif
 
 /*
  * some icalls like mono_array_new_va needs to be called using a different 
@@ -213,17 +200,43 @@ typedef struct {
 
 #ifndef PLATFORM_WIN32
 
+#define MONO_ARCH_USE_SIGACTION 1
+
 #ifdef HAVE_WORKING_SIGALTSTACK
 
 #define MONO_ARCH_SIGSEGV_ON_ALTSTACK
 
-/* NetBSD doesn't define SA_STACK */
-#ifndef SA_STACK
-#define SA_STACK SA_ONSTACK
-#endif
 #endif
 
-#endif
+#endif /* PLATFORM_WIN32 */
+
+#ifdef __FreeBSD__
+
+#define REG_RAX 7
+#define REG_RCX 4
+#define REG_RDX 3
+#define REG_RBX 8
+#define REG_RSP 23
+#define REG_RBP 9
+#define REG_RSI 2
+#define REG_RDI 1
+#define REG_R8  5
+#define REG_R9  6
+#define REG_R10 10
+#define REG_R11 11
+#define REG_R12 12
+#define REG_R13 13
+#define REG_R14 14
+#define REG_R15 15
+#define REG_RIP 20
+
+/* 
+ * FreeBSD does not have MAP_32BIT, so code allocated by the code manager might not have a
+ * 32 bit address.
+ */
+#define MONO_ARCH_NOMAP32BIT
+
+#endif /* __FreeBSD__ */
 
 #define MONO_ARCH_NO_EMULATE_LONG_SHIFT_OPS
 #define MONO_ARCH_NO_EMULATE_LONG_MUL_OPTS
@@ -235,6 +248,7 @@ typedef struct {
 
 #define MONO_ARCH_ENABLE_EMIT_STATE_OPT 1
 #define MONO_ARCH_ENABLE_REGALLOC_IN_EH_BLOCKS 1
+#define MONO_ARCH_ENABLE_MONO_LMF_VAR 1
 #define MONO_ARCH_HAVE_INVALIDATE_METHOD 1
 #define MONO_ARCH_HAVE_THROW_CORLIB_EXCEPTION 1
 #define MONO_ARCH_HAVE_PIC_AOT 1