X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fmini-arm.h;h=cb31a6e8b24f64f192e21cb32e1075805fbe0a8d;hb=3319d6a5a753c3ded84c20a4ff2a0935a58fec21;hp=2e127929ba7e0955a90f239cf1f777b92b22f666;hpb=3ca530a8bdedfb8d1c50585a5e8a7bb8f3d7b5ea;p=mono.git

diff --git a/mono/mini/mini-arm.h b/mono/mini/mini-arm.h
index 2e127929ba7..cb31a6e8b24 100644
--- a/mono/mini/mini-arm.h
+++ b/mono/mini/mini-arm.h
@@ -187,8 +187,10 @@ typedef enum {
 	RegTypeBaseGen,
 	/* FP value passed in either an ireg or a vfp reg */
 	RegTypeFP,
+	/* Struct passed/returned in gregs */
 	RegTypeStructByVal,
 	RegTypeStructByAddr,
+	RegTypeStructByAddrOnStack,
 	/* gsharedvt argument passed by addr in greg */
 	RegTypeGSharedVtInReg,
 	/* gsharedvt argument passed by addr on stack */
@@ -201,10 +203,11 @@ typedef struct {
 	guint16 vtsize; /* in param area */
 	/* RegTypeHFA */
 	int esize;
-	/* RegTypeHFA */
+	/* RegTypeHFA/RegTypeStructByVal */
 	int nregs;
 	guint8  reg;
 	ArgStorage  storage;
+	/* RegTypeStructByVal */
 	gint32  struct_size;
 	guint8  size    : 4; /* 1, 2, 4, 8, or regs used by RegTypeStructByVal */
 } ArgInfo;
@@ -223,6 +226,7 @@ typedef struct {
 typedef struct {
 	gpointer ss_trigger_page;
 	gpointer bp_trigger_page;
+	gpointer ss_tramp_addr;
 	guint8* bp_addrs [MONO_ZERO_LEN_ARRAY];
 } SeqPointInfo;
 
@@ -312,7 +316,7 @@ typedef struct MonoCompileArch {
 
 #define MONO_ARCH_NEED_DIV_CHECK 1
 
-#define MONO_ARCH_HAVE_GENERALIZED_IMT_THUNK 1
+#define MONO_ARCH_HAVE_GENERALIZED_IMT_TRAMPOLINE 1
 
 #define MONO_ARCH_HAVE_FULL_AOT_TRAMPOLINES 1
 #define MONO_ARCH_HAVE_DECOMPOSE_LONG_OPTS 1