Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / metadata / abi-details.h

diff --git a/mono/metadata/abi-details.h b/mono/metadata/abi-details.h
index 01c741b35d7f3c8faba8931db0ed4d2995a90c86..b0cdd521743fb30ec9f7c97f5b13e92dcf9e8bde 100644 (file)
--- a/mono/metadata/abi-details.h
+++ b/mono/metadata/abi-details.h
@@ -1,5 +1,7 @@
-/*
+/**
+ * \file
  * Copyright 2014 Xamarin Inc
+ * Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 #ifndef __MONO_METADATA_ABI_DETAILS_H__
 #define __MONO_METADATA_ABI_DETAILS_H__
@@ -7,9 +9,25 @@
 #include <config.h>
 #include <glib.h>
 
-#define MONO_ABI_ALIGNOF(type) MONO_ALIGN_ ## type
-#define MONO_CURRENT_ABI_ALIGNOF(type) ((int)G_STRUCT_OFFSET(struct { char c; type x; }, x))
+/*
+ * This file defines macros to compute sizes/alignments/field offsets which depend on
+ * the ABI. It is needed during cross compiling since the generated code needs to
+ * contain offsets which correspond to the ABI of the target, not the host.
+ * It defines the following macros:
+ * - MONO_ABI_SIZEOF(type) for every basic type
+ * - MONO_ABI_ALIGNOF(type) for every basic type
+ * - MONO_STRUCT_OFFSET(struct, field) for various runtime structures
+ * When not cross compiling, these correspond to the host ABI (i.e. sizeof/offsetof).
+ * When cross compiling, these are defined in a generated header file which is
+ * generated by the offsets tool in tools/offsets-tool. The name of the file
+ * is given by the --with-cross-offsets= configure argument.
+ */
 
+#define MONO_ABI_ALIGNOF(type) MONO_ALIGN_ ## type
+#define MONO_CURRENT_ABI_ALIGNOF_TYPEDEF(type) typedef struct { char c; type x; } Mono_Align_Struct_ ##type;
+#define MONO_CURRENT_ABI_ALIGNOF(type) ((int)G_STRUCT_OFFSET(Mono_Align_Struct_ ##type, x))
+#define MONO_ABI_SIZEOF(type) MONO_SIZEOF_ ## type
+#define MONO_CURRENT_ABI_SIZEOF(type) ((int)sizeof(type))
 
 #undef DECL_OFFSET
 #undef DECL_OFFSET2
@@ -17,6 +35,17 @@
 #define DECL_OFFSET2(struct,field,offset) MONO_OFFSET_ ## struct ## _ ## field = offset,
 #define DECL_ALIGN(type) MONO_ALIGN_ ##type = MONO_CURRENT_ABI_ALIGNOF (type),
 #define DECL_ALIGN2(type,size) MONO_ALIGN_ ##type = size,
+#define DECL_SIZE(type) MONO_SIZEOF_ ##type = MONO_CURRENT_ABI_SIZEOF (type),
+#define DECL_SIZE2(type,size) MONO_SIZEOF_ ##type = size,
+
+/* Needed by MONO_CURRENT_ABI_ALIGNOF */
+MONO_CURRENT_ABI_ALIGNOF_TYPEDEF(gint8)
+MONO_CURRENT_ABI_ALIGNOF_TYPEDEF(gint16)
+MONO_CURRENT_ABI_ALIGNOF_TYPEDEF(gint32)
+MONO_CURRENT_ABI_ALIGNOF_TYPEDEF(gint64)
+MONO_CURRENT_ABI_ALIGNOF_TYPEDEF(float)
+MONO_CURRENT_ABI_ALIGNOF_TYPEDEF(double)
+MONO_CURRENT_ABI_ALIGNOF_TYPEDEF(gpointer)
 
 enum {
 #include "object-offsets.h"
@@ -25,7 +54,11 @@ enum {
 #ifdef USED_CROSS_COMPILER_OFFSETS
 #define MONO_STRUCT_OFFSET(struct,field) MONO_OFFSET_ ## struct ## _ ## field
 #else
+#if defined(HAS_CROSS_COMPILER_OFFSETS) || defined(MONO_CROSS_COMPILE)
 #define MONO_STRUCT_OFFSET(struct,field) (MONO_OFFSET_ ## struct ## _ ## field == -1, G_STRUCT_OFFSET (struct,field))
+#else
+#define MONO_STRUCT_OFFSET(struct,field) G_STRUCT_OFFSET (struct,field)
+#endif
 #endif
 
 #endif