From: Bernhard Urban <bernhard.urban@xamarin.com>
Date: Wed, 7 Jun 2017 16:24:15 +0000 (+0200)
Subject: [interp] add InterpMethodArguments struct to offset-tool
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=7ca4c72cc84a2fc6e69467059fa08866079a9873;p=mono.git

[interp] add InterpMethodArguments struct to offset-tool
---

diff --git a/mono/metadata/object-offsets.h b/mono/metadata/object-offsets.h
index 30d2a1f0c23..375831531f6 100644
--- a/mono/metadata/object-offsets.h
+++ b/mono/metadata/object-offsets.h
@@ -267,6 +267,15 @@ DECL_OFFSET(SeqPointInfo, ss_tramp_addr)
 DECL_OFFSET(SeqPointInfo, bp_addrs)
 #endif
 
+#ifdef ENABLE_INTERPRETER
+DECL_OFFSET(InterpMethodArguments, ilen)
+DECL_OFFSET(InterpMethodArguments, iargs)
+DECL_OFFSET(InterpMethodArguments, flen)
+DECL_OFFSET(InterpMethodArguments, fargs)
+DECL_OFFSET(InterpMethodArguments, retval)
+DECL_OFFSET(InterpMethodArguments, is_float_ret)
+#endif
+
 #endif //DISABLE_JIT_OFFSETS
 
 #endif //USED_CROSS_COMPILER_OFFSETS
diff --git a/mono/mini/mini-cross-helpers.c b/mono/mini/mini-cross-helpers.c
index 8aeb6ffb2f4..e4cb111cc38 100644
--- a/mono/mini/mini-cross-helpers.c
+++ b/mono/mini/mini-cross-helpers.c
@@ -9,6 +9,9 @@
 #include "config.h"
 
 #include "mini.h"
+#ifdef ENABLE_INTERPRETER
+#include "interp/interp.h"
+#endif
 #include "tasklets.h"
 #include <mono/metadata/abi-details.h>
 
diff --git a/tools/offsets-tool/MonoAotOffsetsDumper.cs b/tools/offsets-tool/MonoAotOffsetsDumper.cs
index 54016f99faa..0de260a3237 100644
--- a/tools/offsets-tool/MonoAotOffsetsDumper.cs
+++ b/tools/offsets-tool/MonoAotOffsetsDumper.cs
@@ -809,6 +809,7 @@ namespace CppSharp
                 "SeqPointInfo",
                 "DynCallArgs", 
                 "MonoLMFTramp",
+                "InterpMethodArguments",
             };
 
             DumpClasses(writer, ctx, optionalTypes, optional: true);