diff options
Diffstat (limited to 'sysdeps/arm')
| -rw-r--r-- | sysdeps/arm/fpu/__longjmp.S | 2 | ||||
| -rw-r--r-- | sysdeps/arm/machine-gmon.h | 22 |
2 files changed, 13 insertions, 11 deletions
diff --git a/sysdeps/arm/fpu/__longjmp.S b/sysdeps/arm/fpu/__longjmp.S index 25ba6b3..2972ff6 100644 --- a/sysdeps/arm/fpu/__longjmp.S +++ b/sysdeps/arm/fpu/__longjmp.S @@ -30,7 +30,7 @@ ENTRY (__longjmp) movs r0, r1 /* get the return value in place */ moveq r0, #1 /* can't let setjmp() return zero! */ - lfmia f4, 4, [ip] ! /* load the floating point regs */ + lfmfd f4, 4, [ip] ! /* load the floating point regs */ LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc}) END (__longjmp) diff --git a/sysdeps/arm/machine-gmon.h b/sysdeps/arm/machine-gmon.h index 96b4c13..3909b5e 100644 --- a/sysdeps/arm/machine-gmon.h +++ b/sysdeps/arm/machine-gmon.h @@ -41,25 +41,27 @@ static void mcount_internal (u_long frompc, u_long selfpc) blind calls to _mount(), ignoring the fact that _mcount may clobber registers; therefore, _mcount may NOT clobber registers */ /* if (this_fp!=0) { - r0 = this_lr - r1 = this_fp - r1 = [r1-4] which is caller's fp + r0 = this_fp + r1 = this_lr + r1 = [r1-4] which is caller's lr if (r1!=0) r1 = caller's lr call mcount_internal(this_lr, caller's_lr) } -*/ +*/ + #define MCOUNT \ void _mcount (void) \ { \ __asm__("stmdb sp!, {r0, r1, r2, r3};" \ "movs fp, fp;" \ - "moveq r0, #0;" \ - "ldrne r0, [fp, $-4];" \ - "ldrne r1, [fp, $-12];" \ - "movnes r1, r1;" \ - "ldrne r1, [r1, $-4];" \ - "movs r1, r1;" \ + "moveq r1, #0;" \ + "ldrne r1, [fp, $-4];" \ + "ldrne r0, [fp, $-12];" \ + "movnes r0, r0;" \ + "ldrne r0, [r0, $-4];" \ + "movs r0, r0;" \ "blne mcount_internal;" \ "ldmia sp!, {r0, r1, r2, r3}"); \ } + |