diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2009-11-10 04:00:41 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2009-11-10 04:00:41 +0300 |
| commit | 7dcae3becc62fdbd1934b5c8b0e924bfe9e72921 (patch) | |
| tree | 524b87ae2f85405d6abd477cf6d3c0e024af80e7 | |
| parent | eb92a1217dac9080f2245a37324ca650de3be2a5 (diff) | |
2009-11-10 Zoltan Varga <vargaz@gmail.com>monotouch-1-3
* 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
| -rw-r--r-- | mono/mini/ChangeLog | 5 | ||||
| -rw-r--r-- | mono/mini/exceptions-arm.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 8d942dba708..a758ef1d793 100644 --- a/mono/mini/ChangeLog +++ b/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 diff --git a/mono/mini/exceptions-arm.c b/mono/mini/exceptions-arm.c index 2c60c3b749b..25593b6bedd 100644 --- a/mono/mini/exceptions-arm.c +++ b/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); |