Skip to content
Browse files

2009-11-10 Zoltan Varga <vargaz@gmail.com>

	* exceptions-arm.c (mono_arch_get_call_filter_full): Update after the
	LDMIA->LDM macro name change.

svn path=/branches/mono-2-6/mono/; revision=145789
  • Loading branch information...
1 parent eb92a12 commit 7dcae3becc62fdbd1934b5c8b0e924bfe9e72921 @vargaz vargaz committed Nov 10, 2009
Showing with 7 additions and 2 deletions.
  1. +5 −0 mono/mini/ChangeLog
  2. +2 −2 mono/mini/exceptions-arm.c
View
5 mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-10 Zoltan Varga <vargaz@gmail.com>
+
+ * exceptions-arm.c (mono_arch_get_call_filter_full): Update after the
+ LDMIA->LDM macro name change.
+
2009-11-09 Zoltan Varga <vargaz@gmail.com>
* mini-arm.c (mono_arch_allocate_vars): Fix the previous change by passing
View
4 mono/mini/exceptions-arm.c
@@ -134,7 +134,7 @@ mono_arch_get_restore_context_full (guint32 *code_size, MonoJumpInfo **ji, gbool
/* restore everything */
ARM_ADD_REG_IMM8 (code, ARMREG_IP, ctx_reg, G_STRUCT_OFFSET(MonoContext, regs));
- ARM_LDMIA (code, ARMREG_IP, 0xffff);
+ ARM_LDM (code, ARMREG_IP, 0xffff);
/* never reached */
ARM_DBRK (code);
@@ -175,7 +175,7 @@ mono_arch_get_call_filter_full (guint32 *code_size, MonoJumpInfo **ji, gboolean
ctx_reg = ARMREG_R0;
ARM_LDR_IMM (code, ARMREG_IP, ctx_reg, G_STRUCT_OFFSET (MonoContext, eip));
ARM_ADD_REG_IMM8 (code, ARMREG_LR, ctx_reg, G_STRUCT_OFFSET(MonoContext, regs) + (4 * 4));
- ARM_LDMIA (code, ARMREG_LR, MONO_ARM_REGSAVE_MASK);
+ ARM_LDM (code, ARMREG_LR, MONO_ARM_REGSAVE_MASK);
/* call handler at eip (r1) and set the first arg with the exception (r2) */
ARM_MOV_REG_REG (code, ARMREG_R0, ARMREG_R2);
ARM_MOV_REG_REG (code, ARMREG_LR, ARMREG_PC);

0 comments on commit 7dcae3b

Please sign in to comment.
Something went wrong with that request. Please try again.