summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-07-10 19:07:54 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-07-10 19:07:54 +0000
commit36c2586f9287814635f12a13a783ebb79338046c (patch)
tree1a6c805d42fc0145e1caa3e84ebbd30fc68d1390 /cpukit
parent2009-07-10 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-36c2586f9287814635f12a13a783ebb79338046c.tar.bz2
2009-07-09 Josh Switnicki <josh.switnicki@utoronto.ca>
* cpu_asm.S: Fixed bug in _CPU_Context_Switch. The wrong registers were being used for pointer to running task Context_Control struct.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/score/cpu/avr/ChangeLog8
-rw-r--r--cpukit/score/cpu/avr/cpu_asm.S4
2 files changed, 9 insertions, 3 deletions
diff --git a/cpukit/score/cpu/avr/ChangeLog b/cpukit/score/cpu/avr/ChangeLog
index 2b75319224..51ea845efc 100644
--- a/cpukit/score/cpu/avr/ChangeLog
+++ b/cpukit/score/cpu/avr/ChangeLog
@@ -1,4 +1,10 @@
-2009-07-03 Josh Switnicki <josh.switnicki@utoronto.ca>
+2009-07-09 Josh Switnicki <josh.switnicki@utoronto.ca>
+
+ * cpu_asm.S: Fixed bug in _CPU_Context_Switch. The wrong registers
+ were being used for pointer to running task Context_Control
+ struct.
+
+2009-07-03 Josh Switnicki <josh.switnicki@utoronto.ca>
* cpu.c: Implemented _CPU_Context_Initialize as a C function instead
of a macro. It works with limited functionality. Implemented
diff --git a/cpukit/score/cpu/avr/cpu_asm.S b/cpukit/score/cpu/avr/cpu_asm.S
index 779efc70b5..51ecf6e560 100644
--- a/cpukit/score/cpu/avr/cpu_asm.S
+++ b/cpukit/score/cpu/avr/cpu_asm.S
@@ -215,8 +215,8 @@ SYM(_CPU_Context_restore_fp):
PUBLIC(_CPU_Context_switch)
SYM(_CPU_Context_switch):
- mov r26, r18
- mov r27, r19
+ mov r26, r24
+ mov r27, r25
st X+, r2
st X+, r3
st X+, r4