diff options
| author | Amaury Pouly <amaury.pouly@gmail.com> | 2016-09-21 00:16:34 +0100 |
|---|---|---|
| committer | Amaury Pouly <amaury.pouly@gmail.com> | 2016-12-12 13:15:47 +0100 |
| commit | 7e0820fe21247d528f4c3483822af4f4a66571ee (patch) | |
| tree | 49419ef5e779067dc3afee182c3db9dcb3f28844 /lib | |
| parent | 89e6189dcbc878c4e27db8bd1aa04f87154c187a (diff) | |
| download | rockbox-7e0820fe21247d528f4c3483822af4f4a66571ee.tar.gz rockbox-7e0820fe21247d528f4c3483822af4f4a66571ee.tar.bz2 rockbox-7e0820fe21247d528f4c3483822af4f4a66571ee.zip | |
unwinder: in get__sp(), use the more correct "msr cpsr_c, ..." form
Change-Id: I9cfdca80536fc9fb6e8983a81219ccdf5c0b3c42
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/unwarminder/get_sp.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/unwarminder/get_sp.S b/lib/unwarminder/get_sp.S index dfab11605f..9449a5e946 100644 --- a/lib/unwarminder/get_sp.S +++ b/lib/unwarminder/get_sp.S @@ -16,7 +16,7 @@ __get_sp: #if (CONFIG_PLATFORM & PLATFORM_NATIVE) mrs r1, cpsr /* save current state */ orr r0, r1, #0xc0 - msr cpsr, r0 /* disable IRQ and FIQ */ + msr cpsr_c, r0 /* disable IRQ and FIQ */ and r0, r1, #0x1f /* get current mode */ cmp r0, #0x1f /* are we in sys mode? */ beq get_sp @@ -24,12 +24,12 @@ call_from_exception: mrs r0, spsr /* get saved state */ and r0, r0, #0x1f /* get mode bits */ orr r0, r0, #0xc0 /* no FIQ no IRQ */ - msr cpsr, r0 /* change mode */ + msr cpsr_c, r0 /* change mode */ get_sp: #endif mov r0, sp /* get SP */ #if (CONFIG_PLATFORM & PLATFORM_NATIVE) - msr cpsr, r1 /* restore mode */ + msr cpsr_c, r1 /* restore mode */ #endif bx lr .size __get_sp, . - __get_sp |