# HG changeset patch # User nickg # Date 1155292261 0 # Node ID 67303228ae8609845b2802f28852507fe81f8126 # Parent ce8216bec66aea1f9c8fb08cf3f5d87c09b354bf Back off last checkin. Made by accident. diff --git a/packages/hal/sh/arch/current/src/context.S b/packages/hal/sh/arch/current/src/context.S --- a/packages/hal/sh/arch/current/src/context.S +++ b/packages/hal/sh/arch/current/src/context.S @@ -240,11 +240,11 @@ FUNC_START(hal_thread_load_context) lds.l @r0+,pr ! pr + mov r3,r15 ! update stack pointer + mov.l @r0+,r2 ! SR hal_cpu_int_merge r2,r0,r1 ! restore interrupt state - mov r3,r15 ! update stack pointer - rts ! and return nop