linuxmsm/openocd
0
0
Fork 0
mirror of https://github.com/linux-msm/openocd.git synced 2026-02-25 13:15:07 -08:00
Code Issues Packages Projects Releases Wiki Activity

ARM: label SP and LR correctly

Browse Source 
Except for USR/SYS mode, the labels for the shadowed SP and LR
registers were reversed.  LR is r14; SP is r13.  Fix.

This would not affect GDB users; GDB references are positional.
Only folk working directly with OpenOCD register values would
have noticed this bug.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
David Brownell
2009-12-02 11:31:32 -08:00
parent d84fead487
commit 03c103d56a
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/target/armv4_5.c
View File

@@ -281,20 +281,20 @@ static const struct {
{ .name = "r11_fiq", .cookie = 11, .mode = ARMV4_5_MODE_FIQ, },
{ .name = "r12_fiq", .cookie = 12, .mode = ARMV4_5_MODE_FIQ, },
{ .name = "lr_fiq", .cookie = 13, .mode = ARMV4_5_MODE_FIQ, },
{ .name = "sp_fiq", .cookie = 14, .mode = ARMV4_5_MODE_FIQ, },
{ .name = "sp_fiq", .cookie = 13, .mode = ARMV4_5_MODE_FIQ, },
{ .name = "lr_fiq", .cookie = 14, .mode = ARMV4_5_MODE_FIQ, },
{ .name = "lr_irq", .cookie = 13, .mode = ARMV4_5_MODE_IRQ, },
{ .name = "sp_irq", .cookie = 14, .mode = ARMV4_5_MODE_IRQ, },
{ .name = "sp_irq", .cookie = 13, .mode = ARMV4_5_MODE_IRQ, },
{ .name = "lr_irq", .cookie = 14, .mode = ARMV4_5_MODE_IRQ, },
{ .name = "lr_svc", .cookie = 13, .mode = ARMV4_5_MODE_SVC, },
{ .name = "sp_svc", .cookie = 14, .mode = ARMV4_5_MODE_SVC, },
{ .name = "sp_svc", .cookie = 13, .mode = ARMV4_5_MODE_SVC, },
{ .name = "lr_svc", .cookie = 14, .mode = ARMV4_5_MODE_SVC, },
{ .name = "lr_abt", .cookie = 13, .mode = ARMV4_5_MODE_ABT, },
{ .name = "sp_abt", .cookie = 14, .mode = ARMV4_5_MODE_ABT, },
{ .name = "sp_abt", .cookie = 13, .mode = ARMV4_5_MODE_ABT, },
{ .name = "lr_abt", .cookie = 14, .mode = ARMV4_5_MODE_ABT, },
{ .name = "lr_und", .cookie = 13, .mode = ARMV4_5_MODE_UND, },
{ .name = "sp_und", .cookie = 14, .mode = ARMV4_5_MODE_UND, },
{ .name = "sp_und", .cookie = 13, .mode = ARMV4_5_MODE_UND, },
{ .name = "lr_und", .cookie = 14, .mode = ARMV4_5_MODE_UND, },
{ .name = "cpsr", .cookie = 16, .mode = ARMV4_5_MODE_ANY, },
{ .name = "spsr_fiq", .cookie = 16, .mode = ARMV4_5_MODE_FIQ, },
@@ -303,8 +303,8 @@ static const struct {
{ .name = "spsr_abt", .cookie = 16, .mode = ARMV4_5_MODE_ABT, },
{ .name = "spsr_und", .cookie = 16, .mode = ARMV4_5_MODE_UND, },
{ .name = "lr_mon", .cookie = 13, .mode = ARM_MODE_MON, },
{ .name = "sp_mon", .cookie = 14, .mode = ARM_MODE_MON, },
{ .name = "sp_mon", .cookie = 13, .mode = ARM_MODE_MON, },
{ .name = "lr_mon", .cookie = 14, .mode = ARM_MODE_MON, },
{ .name = "spsr_mon", .cookie = 16, .mode = ARM_MODE_MON, },
};