From de7b14e8d224bb63278b3fbc16562b0977f6411d Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 20 Feb 2008 21:54:01 +0000 Subject: 2008-02-20 Alexandru Bugnar PR 1278/cpukit * cpu.c: Fix incorrect bit manipulation on returning old address of raw trap handler. --- cpukit/score/cpu/sparc/ChangeLog | 6 ++++++ cpukit/score/cpu/sparc/cpu.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cpukit/score/cpu/sparc/ChangeLog b/cpukit/score/cpu/sparc/ChangeLog index 7f0367756c..2e7b3fa29a 100644 --- a/cpukit/score/cpu/sparc/ChangeLog +++ b/cpukit/score/cpu/sparc/ChangeLog @@ -1,3 +1,9 @@ +2008-02-20 Alexandru Bugnar + + PR 1278/cpukit + * cpu.c: Fix incorrect bit manipulation on returning old address of raw + trap handler. + 2007-05-10 Joel Sherrill PR 1237/rtems diff --git a/cpukit/score/cpu/sparc/cpu.c b/cpukit/score/cpu/sparc/cpu.c index 6295dcf790..39c26e29e7 100644 --- a/cpukit/score/cpu/sparc/cpu.c +++ b/cpukit/score/cpu/sparc/cpu.c @@ -182,7 +182,7 @@ void _CPU_ISR_install_raw_handler( if ( slot->mov_psr_l0 == _CPU_Trap_slot_template.mov_psr_l0 ) { u32_handler = - ((slot->sethi_of_handler_to_l4 & HIGH_BITS_MASK) << HIGH_BITS_SHIFT) | + (slot->sethi_of_handler_to_l4 << HIGH_BITS_SHIFT) | (slot->jmp_to_low_of_handler_plus_l4 & LOW_BITS_MASK); *old_handler = (proc_ptr) u32_handler; } else -- cgit v1.2.3