Fix big endian issue with cardtable and add code for mono_arch_contex…

…t_get_int_reg
gary-b · Mar 30, 2011 · 968a96e · 968a96e
1 parent b98e93c
commit 968a96e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/mono/metadata/sgen-cardtable.c b/mono/metadata/sgen-cardtable.c
@@ -326,7 +326,7 @@ find_card_offset (mword card)
 #elif defined(__x86_64__) && defined(__GNUC__)
 	return (__builtin_ffsll (card) - 1) / 8;
 #elif defined(__s390x__)
-	return (__builtin_ffsll (card) - 1) / 8;
+	return (__builtin_ffsll (GUINT64_TO_LE(card)) - 1) / 8;
 #else
 	// FIXME:
 	g_assert_not_reached ();

diff --git a/mono/mini/mini-s390x.c b/mono/mini/mini-s390x.c
@@ -5689,16 +5689,14 @@ mono_arch_get_patch_offset (guint8 *code)
 /*                                                                  */
 /* Function	- 						    */
 /*		                               			    */
-/* Returns	- Offset for patch.				    */
+/* Returns	- Return a register from the context.		    */
 /*                                                                  */
 /*------------------------------------------------------------------*/
 
 mgreg_t
 mono_arch_context_get_int_reg (MonoContext *ctx, int reg)
 {
-	/* FIXME: implement */
-	g_assert_not_reached ();
-	return NULL;
+	return ((mgreg_t) ctx->uc_mcontext.gregs[reg]);
 }
 
 /*========================= End of Function ========================*/