Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mono/mini/ChangeLog11
-rw-r--r--mono/mini/exceptions-amd64.c88
-rw-r--r--mono/mini/mini-amd64.c4
-rw-r--r--mono/mini/mini-amd64.h22
-rw-r--r--mono/mini/mini.c7
-rw-r--r--msvc/genmdesc.vcproj8
-rw-r--r--msvc/libmono.vcproj394
-rw-r--r--msvc/monoburg.vcproj16
-rwxr-xr-xmsvc/runburg.bat17
-rwxr-xr-xmsvc/runmdesc.bat16
-rw-r--r--winconfig.h2
11 files changed, 185 insertions, 400 deletions
diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index a72b24dba4f..a7c39ca19c9 100644
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,14 +1,3 @@
-2007-03-15 Jonathan Chambers <joncham@gmail.com>
-
- * *.c: Begin WIN64 port.
- * mini.c: Use correct register in profiler.
- * mini-amd64.c: No inline assembly on Win64.
- * mini-amd64.h: Implement MONO_INIT_CONTEXT_FROM_FUNC for Win64.
- Only define MONO_ARCH_USE_SIGACTION on non-windows platforms.
- * exceptions-amd64.c: Only need gregs_from_ucontext if MONO_ARCH_USE_SIGACTION
- is defined. Implement mono_arch_sigctx_to_monoctx, mono_arch_monoctx_to_sigctx, and
- mono_arch_ip_from_context for Win64.
-
2007-03-15 Zoltan Varga <vargaz@gmail.com>
* exceptions-amd64.c (seh_handler): Ditto.
diff --git a/mono/mini/exceptions-amd64.c b/mono/mini/exceptions-amd64.c
index 7cf1226890a..81d40820665 100644
--- a/mono/mini/exceptions-amd64.c
+++ b/mono/mini/exceptions-amd64.c
@@ -11,9 +11,7 @@
#include <glib.h>
#include <signal.h>
#include <string.h>
-#ifndef PLATFORM_WIN32
#include <sys/ucontext.h>
-#endif
#include <mono/arch/amd64/amd64-codegen.h>
#include <mono/metadata/appdomain.h>
@@ -57,19 +55,15 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep)
sctx = g_malloc(sizeof(MonoContext));
/* Copy Win32 context to UNIX style context */
- sctx->rax = ctx->Rax;
- sctx->rbx = ctx->Rbx;
- sctx->rcx = ctx->Rcx;
- sctx->rdx = ctx->Rdx;
- sctx->rbp = ctx->Rbp;
- sctx->rsp = ctx->Rsp;
- sctx->rsi = ctx->Rsi;
- sctx->rdi = ctx->Rdi;
- sctx->rip = ctx->Rip;
- sctx->r12 = ctx->R12;
- sctx->r13 = ctx->R13;
- sctx->r14 = ctx->R14;
- sctx->r15 = ctx->R15;
+ sctx->eax = ctx->Eax;
+ sctx->ebx = ctx->Ebx;
+ sctx->ecx = ctx->Ecx;
+ sctx->edx = ctx->Edx;
+ sctx->ebp = ctx->Ebp;
+ sctx->esp = ctx->Esp;
+ sctx->esi = ctx->Esi;
+ sctx->edi = ctx->Edi;
+ sctx->eip = ctx->Eip;
switch (er->ExceptionCode) {
case EXCEPTION_ACCESS_VIOLATION:
@@ -91,15 +85,15 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep)
}
/* Copy context back */
- ctx->Rax = sctx->rax;
- ctx->Rbx = sctx->rbx;
- ctx->Rcx = sctx->rcx;
- ctx->Rdx = sctx->rdx;
- ctx->Rbp = sctx->rbp;
- ctx->Rsp = sctx->rsp;
- ctx->Rsi = sctx->rsi;
- ctx->Rdi = sctx->rdi;
- ctx->Rip = sctx->rip;
+ ctx->Eax = sctx->eax;
+ ctx->Ebx = sctx->ebx;
+ ctx->Ecx = sctx->ecx;
+ ctx->Edx = sctx->edx;
+ ctx->Ebp = sctx->ebp;
+ ctx->Esp = sctx->esp;
+ ctx->Esi = sctx->esi;
+ ctx->Edi = sctx->edi;
+ ctx->Eip = sctx->eip;
g_free (sctx);
@@ -639,7 +633,6 @@ mono_arch_handle_exception (void *sigctx, gpointer obj, gboolean test_only)
return TRUE;
}
-#ifdef MONO_ARCH_USE_SIGACTION
static inline guint64*
gregs_from_ucontext (ucontext_t *ctx)
{
@@ -651,11 +644,10 @@ gregs_from_ucontext (ucontext_t *ctx)
return gregs;
}
-#endif
+
void
mono_arch_sigctx_to_monoctx (void *sigctx, MonoContext *mctx)
{
-#ifdef MONO_ARCH_USE_SIGACTION
ucontext_t *ctx = (ucontext_t*)sigctx;
guint64 *gregs = gregs_from_ucontext (ctx);
@@ -673,29 +665,11 @@ mono_arch_sigctx_to_monoctx (void *sigctx, MonoContext *mctx)
mctx->r13 = gregs [REG_R13];
mctx->r14 = gregs [REG_R14];
mctx->r15 = gregs [REG_R15];
-#else
- MonoContext *ctx = (MonoContext *)sigctx;
-
- mctx->rax = ctx->rax;
- mctx->rbx = ctx->rbx;
- mctx->rcx = ctx->rcx;
- mctx->rdx = ctx->rdx;
- mctx->rbp = ctx->rbp;
- mctx->rsp = ctx->rsp;
- mctx->rsi = ctx->rsi;
- mctx->rdi = ctx->rdi;
- mctx->rip = ctx->rip;
- mctx->r12 = ctx->r12;
- mctx->r13 = ctx->r13;
- mctx->r14 = ctx->r14;
- mctx->r15 = ctx->r15;
-#endif
}
void
mono_arch_monoctx_to_sigctx (MonoContext *mctx, void *sigctx)
{
-#ifdef MONO_ARCH_USE_SIGACTION
ucontext_t *ctx = (ucontext_t*)sigctx;
guint64 *gregs = gregs_from_ucontext (ctx);
@@ -713,39 +687,15 @@ mono_arch_monoctx_to_sigctx (MonoContext *mctx, void *sigctx)
gregs [REG_R13] = mctx->r13;
gregs [REG_R14] = mctx->r14;
gregs [REG_R15] = mctx->r15;
-#else
- MonoContext *ctx = (MonoContext *)sigctx;
-
- ctx->rax = mctx->rax;
- ctx->rbx = mctx->rbx;
- ctx->rcx = mctx->rcx;
- ctx->rdx = mctx->rdx;
- ctx->rbp = mctx->rbp;
- ctx->rsp = mctx->rsp;
- ctx->rsi = mctx->rsi;
- ctx->rdi = mctx->rdi;
- ctx->rip = mctx->rip;
- ctx->r12 = mctx->r12;
- ctx->r13 = mctx->r13;
- ctx->r14 = mctx->r14;
- ctx->r15 = mctx->r15;
-#endif
}
gpointer
mono_arch_ip_from_context (void *sigctx)
{
-
-#ifdef MONO_ARCH_USE_SIGACTION
-
ucontext_t *ctx = (ucontext_t*)sigctx;
guint64 *gregs = gregs_from_ucontext (ctx);
return (gpointer)gregs [REG_RIP];
-#else
- MonoContext *ctx = sigctx;
- return (gpointer)ctx->rip;
-#endif
}
diff --git a/mono/mini/mini-amd64.c b/mono/mini/mini-amd64.c
index 8b1cd31e30c..5fae5576569 100644
--- a/mono/mini/mini-amd64.c
+++ b/mono/mini/mini-amd64.c
@@ -717,7 +717,6 @@ cpuid (int id, int* p_eax, int* p_ebx, int* p_ecx, int* p_edx)
void
mono_arch_cpu_init (void)
{
-#ifndef _MSC_VER
guint16 fpcw;
/* spec compliance requires running with double precision */
@@ -726,9 +725,6 @@ mono_arch_cpu_init (void)
fpcw |= X86_FPCW_PREC_DOUBLE;
__asm__ __volatile__ ("fldcw %0\n": : "m" (fpcw));
__asm__ __volatile__ ("fnstcw %0\n": "=m" (fpcw));
-#else
- _control87 (_PC_53, MCW_PC);
-#endif
}
/*
diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h
index e6365b3e858..60d88cb0314 100644
--- a/mono/mini/mini-amd64.h
+++ b/mono/mini/mini-amd64.h
@@ -161,27 +161,14 @@ typedef struct {
guint64 r15;
} MonoContext;
-#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_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_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)); \
@@ -189,7 +176,7 @@ typedef struct {
MONO_CONTEXT_SET_SP ((ctx), __builtin_frame_address (0)); \
} while (0)
-#endif
+#define MONO_ARCH_USE_SIGACTION 1
/*
* some icalls like mono_array_new_va needs to be called using a different
@@ -202,7 +189,6 @@ typedef struct {
#ifdef HAVE_WORKING_SIGALTSTACK
#define MONO_ARCH_SIGSEGV_ON_ALTSTACK
-#define MONO_ARCH_USE_SIGACTION 1
#endif
diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index beff63a0ae7..da202aefb6b 100644
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -11524,13 +11524,8 @@ win32_time_proc (UINT uID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2)
CONTEXT context;
context.ContextFlags = CONTEXT_CONTROL;
- if (GetThreadContext (win32_main_thread, &context)) {
-#ifdef _WIN64
- mono_profiler_stat_hit ((guchar *) context.Rip, &context);
-#else
+ if (GetThreadContext (win32_main_thread, &context))
mono_profiler_stat_hit ((guchar *) context.Eip, &context);
-#endif
- }
}
#endif
diff --git a/msvc/genmdesc.vcproj b/msvc/genmdesc.vcproj
index 1093ec881aa..c09a5cd01d3 100644
--- a/msvc/genmdesc.vcproj
+++ b/msvc/genmdesc.vcproj
@@ -106,7 +106,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="runmdesc.bat $(TargetPath) $(PlatformName)"
+ CommandLine="runmdesc.bat $(TargetPath)"
/>
</Configuration>
<Configuration
@@ -199,7 +199,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="runmdesc.bat $(TargetPath) $(PlatformName)"
+ CommandLine="runmdesc.bat $(TargetPath)"
/>
</Configuration>
<Configuration
@@ -290,7 +290,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="runmdesc.bat $(TargetPath) $(PlatformName)"
+ CommandLine="runmdesc.bat $(TargetPath)"
/>
</Configuration>
<Configuration
@@ -382,7 +382,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="runmdesc.bat $(TargetPath) $(PlatformName)"
+ CommandLine="runmdesc.bat $(TargetPath)"
/>
</Configuration>
</Configurations>
diff --git a/msvc/libmono.vcproj b/msvc/libmono.vcproj
index 57f377d7cee..eb285d945d2 100644
--- a/msvc/libmono.vcproj
+++ b/msvc/libmono.vcproj
@@ -132,7 +132,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
- PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;__i386__;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -306,7 +306,7 @@
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="..\libgc\include;..\;&quot;..\VSDependancies\include\glib-2.0&quot;;&quot;..\VSDependancies\include\glib-2.0\glib&quot;;..\VSDependancies\include;&quot;..\VSDependancies\lib\glib-2.0\include&quot;;..\mono\;..\mono\jit"
- PreprocessorDefinitions="WIN64;_WIN64;_DEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE;__x86_64__"
+ PreprocessorDefinitions="WIN64;_WIN64;_DEBUG;WIN32;_WINDOWS;__WIN32__;HAVE_CONFIG_H;__i386__;PLATFORM_WIN32;GC_NOT_DLL;GC_GCJ_SUPPORT;GC_WIN32_THREADS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -3322,6 +3322,52 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\mono\mini\exceptions-x86.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\mono\mini\graph.c"
>
<FileConfiguration
@@ -3672,6 +3718,56 @@
>
</File>
<File
+ RelativePath="..\mono\mini\mini-x86.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\mono\mini\mini-x86.h"
+ >
+ </File>
+ <File
RelativePath="..\mono\mini\mini.c"
>
<FileConfiguration
@@ -3884,260 +3980,62 @@
>
</File>
<File
+ RelativePath="..\mono\mini\tramp-x86.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ BrowseInformation="1"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\mono\mini\wapihandles.c"
>
</File>
<Filter
Name="x86"
>
- <File
- RelativePath="..\mono\mini\exceptions-x86.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\mono\mini\mini-x86.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\mono\mini\mini-x86.h"
- >
- <FileConfiguration
- Name="Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\mono\mini\tramp-x86.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- />
- </FileConfiguration>
- </File>
</Filter>
<Filter
- Name="amd64"
- >
- <File
- RelativePath="..\mono\mini\exceptions-amd64.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\mono\mini\mini-amd64.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\mono\mini\mini-amd64.h"
- >
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCustomBuildTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\mono\mini\tramp-amd64.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
+ Name="x64"
+ >
</Filter>
</Filter>
</Files>
diff --git a/msvc/monoburg.vcproj b/msvc/monoburg.vcproj
index 0dd2618ca91..8fa9179d20c 100644
--- a/msvc/monoburg.vcproj
+++ b/msvc/monoburg.vcproj
@@ -27,7 +27,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c&#x0D;&#x0A;"
+ CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c"
/>
<Tool
Name="VCCustomBuildTool"
@@ -98,7 +98,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="runburg.bat $(TargetPath) $(PlatformName)"
+ CommandLine="runburg.bat $(TargetPath)"
/>
</Configuration>
<Configuration
@@ -110,7 +110,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c&#x0D;&#x0A;"
+ CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c"
/>
<Tool
Name="VCCustomBuildTool"
@@ -182,7 +182,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="runburg.bat $(TargetPath) $(PlatformName)"
+ CommandLine="runburg.bat $(TargetPath)"
/>
</Configuration>
<Configuration
@@ -194,7 +194,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c&#x0D;&#x0A;"
+ CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c"
/>
<Tool
Name="VCCustomBuildTool"
@@ -264,7 +264,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="runburg.bat $(TargetPath) $(PlatformName)"
+ CommandLine="runburg.bat $(TargetPath)"
/>
</Configuration>
<Configuration
@@ -276,7 +276,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c&#x0D;&#x0A;"
+ CommandLine="cd ..\mono\monoburg&#x0D;&#x0A;copy wparser.c parser.c"
/>
<Tool
Name="VCCustomBuildTool"
@@ -347,7 +347,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="runburg.bat $(TargetPath) $(PlatformName)"
+ CommandLine="runburg.bat $(TargetPath)"
/>
</Configuration>
</Configurations>
diff --git a/msvc/runburg.bat b/msvc/runburg.bat
index 8370b0ac7ef..7e36428b99a 100755
--- a/msvc/runburg.bat
+++ b/msvc/runburg.bat
@@ -1,23 +1,8 @@
@echo off
rem This runs Monoburg on the various x86 files when called on Visual Studio
-echo Running Monoburg on the inssel.brg files...
+echo Running Monoburg on the x86 inssel.brg files...
cd ..\mono\mini
set PATH=%PATH%;..\..\VSDependancies\lib
-
-if "%2" == "Win32" goto x86
-if "%2" == "x64" goto x64
-goto error
-:x86
-echo Platform detected is x86...
%1 -c 1 -p -e inssel.brg inssel-float.brg inssel-long32.brg inssel-x86.brg -d inssel.h -s inssel.c
-goto end
-:x64
-echo Platform detected is x64...
-%1 -c 1 -p -e inssel.brg inssel-float.brg inssel-long.brg inssel-amd64.brg -d inssel.h -s inssel.c
-goto end
-:error
-echo Error: unsupported platform
-exit /b 100
-:end
echo done
diff --git a/msvc/runmdesc.bat b/msvc/runmdesc.bat
index 09c03b6e49c..de31cced082 100755
--- a/msvc/runmdesc.bat
+++ b/msvc/runmdesc.bat
@@ -1,22 +1,8 @@
@echo off
rem This runs genmdesc on the x86 files when called on Visual Studio
-echo Running genmdesc
+echo Running genmdesc on the x86 files...
cd ..\mono\mini
set PATH=%PATH%;..\..\VSDependancies\lib
-if "%2" == "Win32" goto x86
-if "%2" == "x64" goto x64
-goto error
-:x86
-echo Platform detected is x86...
%1 cpu-x86.md cpu-x86.h x86_desc
-goto end
-:x64
-echo Platform detected is x64...
-%1 cpu-amd64.md cpu-amd64.h amd64_desc
-goto end
-:error
-echo Error: unsupported platform
-exit /b 100
-:end
echo done
diff --git a/winconfig.h b/winconfig.h
index 0bcf0a410cc..47d351930c1 100644
--- a/winconfig.h
+++ b/winconfig.h
@@ -394,7 +394,7 @@
/* #undef MONO_DEBUGGER_SUPPORTED */
/* Xen-specific behaviour */
-/* #undef MONO_XEN_OPT */
+#define MONO_XEN_OPT 1
/* Define if Unix sockets cannot be created in an anonymous namespace */
/* #undef NEED_LINK_UNLINK */
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 14:40:33 +0300