2009-11-02 Jonathan Chambers <joncham@gmail.com>

	* mini-amd64.c: Put soft debugger functions behind a
	#ifdef MONO_ARCH_SOFT_DEBUG_SUPPORTED.

	* mini-amd64.h: disable the soft debugger in windows.

	Code contributed under MIT/X11 license.

svn path=/trunk/mono/; revision=145260

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index d044fbd9897f867af389e13b53149741bcfa7a91..5f0bafa7b8046418cc75ee1aac327a652802ece2 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-02 Jonathan Chambers <joncham@gmail.com>
+
+       * mini-amd64.c: Put soft debugger functions behind a 
+       #ifdef MONO_ARCH_SOFT_DEBUG_SUPPORTED.
+       
+       * mini-amd64.h: disable the soft debugger in windows.
+       
+       Code contributed under MIT/X11 license.
+
 2009-11-02 Jonathan Chambers <joncham@gmail.com>
 
        * mini-x86.c: Put soft debugger functions behind a 

diff --git a/mono/mini/mini-amd64.c b/mono/mini/mini-amd64.c
index fc097000f02d8241a2240347c4e6ef6146dda09b..293191d7773f6a0368e01ed30ff79dfaa85ec5a9 100644 (file)
--- a/mono/mini/mini-amd64.c
+++ b/mono/mini/mini-amd64.c
@@ -7369,6 +7369,9 @@ mono_arch_context_get_int_reg (MonoContext *ctx, int reg)
        }
 }
 
+/* Soft Debug support */
+#ifdef MONO_ARCH_SOFT_DEBUG_SUPPORTED
+
 /*
  * mono_arch_set_breakpoint:
  *
@@ -7525,3 +7528,5 @@ mono_arch_get_seq_point_info (MonoDomain *domain, guint8 *code)
        NOT_IMPLEMENTED;
        return NULL;
 }
+
+#endif

diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h
index 986912796fc6fb80085f8a638570a16a9ce36f4a..e15fc939f98d7bb26d7ed30b330f963da4d2a454 100644 (file)
--- a/mono/mini/mini-amd64.h
+++ b/mono/mini/mini-amd64.h
@@ -354,7 +354,11 @@ typedef struct {
 #define MONO_ARCH_HAVE_STATIC_RGCTX_TRAMPOLINE 1
 
 #define MONO_ARCH_AOT_SUPPORTED 1
+#ifndef PLATFORM_WIN32
 #define MONO_ARCH_SOFT_DEBUG_SUPPORTED 1
+#else
+#define DISABLE_DEBUGGER_AGENT 1
+#endif
 #define MONO_ARCH_HAVE_FIND_JIT_INFO_EXT 1
 
 #if !defined(PLATFORM_WIN32) || defined(__sun)