Fix the build.

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

diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h
index 25d9d57fc64cb7388e977f44d1925ee1a43a7620..c494c69fbbcaf677a3570478b9d2d60dfe5e0880 100644 (file)
--- a/mono/mini/mini-amd64.h
+++ b/mono/mini/mini-amd64.h
@@ -171,7 +171,8 @@ struct MonoLMF {
         * the caller ip is saved.
         * If the second lowest bit is set, then this is a MonoLMFExt structure, and
         * the other fields are not valid.
-        * If the third lowest bit is set, then this is a MonoLMFTramp structure.
+        * If the third lowest bit is set, then this is a MonoLMFTramp structure, and
+        * the 'rbp' field is not valid.
         */
        gpointer    previous_lmf;
 #if defined(__default_codegen__) || defined(HOST_WIN32)
@@ -188,7 +189,7 @@ struct MonoLMF {
 /* LMF structure used by the JIT trampolines */
 typedef struct {
        struct MonoLMF lmf;
-       guint64 *regs;
+       MonoContext *ctx;
        gpointer lmf_addr;
 } MonoLMFTramp;
 
@@ -320,13 +321,10 @@ typedef struct {
 #define MONO_ARCH_RGCTX_REG MONO_ARCH_IMT_REG
 #define MONO_ARCH_EXC_REG AMD64_RAX
 #define MONO_ARCH_HAVE_CMOV_OPS 1
-#define MONO_ARCH_HAVE_NOTIFY_PENDING_EXC 1
 #define MONO_ARCH_HAVE_EXCEPTIONS_INIT 1
 #define MONO_ARCH_HAVE_GENERALIZED_IMT_THUNK 1
 #define MONO_ARCH_HAVE_LIVERANGE_OPS 1
 #define MONO_ARCH_HAVE_SIGCTX_TO_MONOCTX 1
-#define MONO_ARCH_MONITOR_OBJECT_REG MONO_AMD64_ARG_REG1
-#define MONO_ARCH_MONITOR_LOCK_TAKEN_REG MONO_AMD64_ARG_REG2
 #define MONO_ARCH_HAVE_GET_TRAMPOLINES 1
 
 #define MONO_ARCH_AOT_SUPPORTED 1
@@ -386,6 +384,11 @@ mono_amd64_throw_corlib_exception (guint64 dummy1, guint64 dummy2, guint64 dummy
                                                                   guint64 dummy5, guint64 dummy6,
                                                                   MonoContext *mctx, guint32 ex_token_index, gint64 pc_offset);
 
+void
+mono_amd64_resume_unwind (guint64 dummy1, guint64 dummy2, guint64 dummy3, guint64 dummy4,
+                                                 guint64 dummy5, guint64 dummy6,
+                                                 MonoContext *mctx, guint32 dummy7, gint64 dummy8);
+
 guint64
 mono_amd64_get_original_ip (void);
 
@@ -401,13 +404,6 @@ mono_amd64_get_exception_trampolines (gboolean aot);
 int
 mono_amd64_get_tls_gs_offset (void) MONO_LLVM_INTERNAL;
 
-typedef struct {
-       guint8 *address;
-       guint8 saved_byte;
-} MonoBreakpointInfo;
-
-extern MonoBreakpointInfo mono_breakpoint_info [MONO_BREAKPOINT_ARRAY_SIZE];
-
 #ifdef TARGET_WIN32
 
 void mono_arch_unwindinfo_add_push_nonvol (gpointer* monoui, gpointer codebegin, gpointer nextip, guchar reg );