Use MSVC compiler host architecture defines where applicable. (#52375)

Use MSVC compiler host architecture defines where applicable.

There are a couple of places where gcc/clang compiler host architecture
defines are in used, missing compilers like MSVC. Commit adds MSVC host
architecture defines in places where they make sense and can be applied.

NOTE, part of this already worked since it will fallbacks to TARGET_XXX
in a couple of places and currently this is the same as host architecture
on Windows, still adding MSVC host architecture defines for completeness
and future when host != target might differ.

diff --git a/src/mono/mono/metadata/coree.c b/src/mono/mono/metadata/coree.c
index d18ed29..d254520 100644 (file)
--- a/src/mono/mono/metadata/coree.c
+++ b/src/mono/mono/metadata/coree.c
@@ -630,7 +630,7 @@ STDAPI MonoFixupCorEE(HMODULE ModuleHandle)
 #if defined(_M_IA64)
                        ProcRva = (DWORD)((DWORD_PTR)PLabel - (DWORD_PTR)DosHeader);
                        *(PLabel)++ = *ExportFixup->ProcAddress.PLabel;
-#elif defined(_M_AMD64)
+#elif defined(_M_X64)
                        ProcRva = (DWORD)((DWORD_PTR)Trampoline - (DWORD_PTR)DosHeader);
                        /* mov r11, ExportFixup->ProcAddress */
                        *(Trampoline)++ = 0x49;

diff --git a/src/mono/mono/metadata/mono-config.c b/src/mono/mono/metadata/mono-config.c
index b55c76e..89c5be8 100644 (file)
--- a/src/mono/mono/metadata/mono-config.c
+++ b/src/mono/mono/metadata/mono-config.c
@@ -52,10 +52,10 @@
 #endif
 
 #ifndef CONFIG_CPU
-#if defined(__i386__) || defined(TARGET_X86)
+#if defined(__i386__) || defined(_M_IX86) || defined(TARGET_X86)
 #define CONFIG_CPU "x86"
 #define CONFIG_WORDSIZE "32"
-#elif defined(__x86_64__) || defined(TARGET_AMD64)
+#elif defined(__x86_64__) || defined(_M_X64) || defined(TARGET_AMD64)
 #define CONFIG_CPU "x86-64"
 #define CONFIG_WORDSIZE "64"
 #elif defined(sparc) || defined(__sparc__)

diff --git a/src/mono/mono/mini/helpers.c b/src/mono/mono/mini/helpers.c
index 0a7b0d9..47525d0 100644 (file)
--- a/src/mono/mono/mini/helpers.c
+++ b/src/mono/mono/mini/helpers.c
@@ -52,7 +52,7 @@ static const gint16 opidx [] = {
 
 #endif /* DISABLE_LOGGING */
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
 #if !defined(TARGET_ARM64) && !defined(__APPLE__)
 #define emit_debug_info  TRUE
 #else

diff --git a/src/mono/mono/utils/mono-codeman.c b/src/mono/mono/utils/mono-codeman.c
index 087be6d..10cc823 100644 (file)
--- a/src/mono/mono/utils/mono-codeman.c
+++ b/src/mono/mono/utils/mono-codeman.c
@@ -47,7 +47,7 @@ static const MonoCodeManagerCallbacks *code_manager_callbacks;
 
 #define MIN_PAGES 16
 
-#if _WIN32 // These are the same.
+#if defined(_WIN32) && (defined(_M_IX86) || defined(_M_X64)) // These are the same.
 #define MIN_ALIGN MEMORY_ALLOCATION_ALIGNMENT
 #elif defined(__x86_64__)
 /*
@@ -362,7 +362,7 @@ mono_code_manager_invalidate (MonoCodeManager *cman)
 {
        CodeChunk *chunk;
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
        int fill_value = 0xcc; /* x86 break */
 #else
        int fill_value = 0x2a;

diff --git a/src/mono/mono/utils/mono-context.c b/src/mono/mono/utils/mono-context.c
index 403a6c8..81de515 100644 (file)
--- a/src/mono/mono/utils/mono-context.c
+++ b/src/mono/mono/utils/mono-context.c
@@ -13,7 +13,7 @@
 #include <ucontext.h>
 #endif
 
-#if (defined(__i386__) && !defined(MONO_CROSS_COMPILE)) || (defined(TARGET_X86))
+#if ((defined(__i386__) || defined(_M_IX86)) && !defined(MONO_CROSS_COMPILE)) || (defined(TARGET_X86))
 
 #include <mono/utils/mono-context.h>
 
@@ -158,7 +158,7 @@ mono_monoctx_to_sigctx (MonoContext *mctx, void *sigctx)
 #endif
 }
 
-#elif (defined(__x86_64__) && !defined(MONO_CROSS_COMPILE)) || (defined(TARGET_AMD64)) /* defined(__i386__) */
+#elif ((defined(__x86_64__) || defined(_M_X64)) && !defined(MONO_CROSS_COMPILE)) || (defined(TARGET_AMD64))
 
 #include <mono/utils/mono-context.h>
 

diff --git a/src/mono/mono/utils/mono-context.h b/src/mono/mono/utils/mono-context.h
index ff004d1..b305b9b 100644 (file)
--- a/src/mono/mono/utils/mono-context.h
+++ b/src/mono/mono/utils/mono-context.h
@@ -84,7 +84,7 @@ typedef struct {
 #define MONO_CONTEXT_GET_BP(ctx) ((gpointer)(gsize)((ctx)->wasm_bp))
 #define MONO_CONTEXT_GET_SP(ctx) ((gpointer)(gsize)((ctx)->wasm_sp))
 
-#elif (defined(__i386__) && !defined(MONO_CROSS_COMPILE)) || (defined(TARGET_X86))
+#elif ((defined(__i386__) || defined(_M_IX86)) && !defined(MONO_CROSS_COMPILE)) || (defined(TARGET_X86))
 
 /*HACK, move this to an eventual mono-signal.c*/
 #if defined( __linux__) || defined(__sun) || defined(__APPLE__) || defined(__NetBSD__) || \
@@ -255,7 +255,7 @@ typedef struct {
 
 #define MONO_ARCH_HAS_MONO_CONTEXT 1
 
-#elif (defined(__x86_64__) && !defined(MONO_CROSS_COMPILE)) || (defined(TARGET_AMD64)) /* defined(__i386__) */
+#elif ((defined(__x86_64__) || defined(_M_X64)) && !defined(MONO_CROSS_COMPILE)) || (defined(TARGET_AMD64))
 
 #include <mono/arch/amd64/amd64-codegen.h>
 

diff --git a/src/mono/mono/utils/mono-membar.h b/src/mono/mono/utils/mono-membar.h
index 711a419..f01636a 100644 (file)
--- a/src/mono/mono/utils/mono-membar.h
+++ b/src/mono/mono/utils/mono-membar.h
@@ -21,7 +21,7 @@
  */
 //#define mono_compiler_barrier() asm volatile("": : :"memory")
 
-#ifdef TARGET_WASM
+#ifdef HOST_WASM
 
 static inline void mono_memory_barrier (void)
 {

diff --git a/src/mono/mono/utils/mono-memory-model.h b/src/mono/mono/utils/mono-memory-model.h
index de71af7..a35433f 100644 (file)
--- a/src/mono/mono/utils/mono-memory-model.h
+++ b/src/mono/mono/utils/mono-memory-model.h
@@ -49,7 +49,7 @@ enum {
 #define LOAD_BARRIER mono_memory_read_barrier ()
 #define STORE_BARRIER mono_memory_write_barrier ()
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
 /*
 Both x86 and amd64 follow the SPO memory model:
 -Loads are not reordered with other loads