diff options
| author | Stuart Menefy <stuart.menefy@st.com> | 2009-08-24 10:09:53 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-24 10:09:53 +0200 |
| commit | fea966f7564205fcf5919af9bde031e753419c96 (patch) | |
| tree | eb04727dfaad0c42bf9ba771e38f07c310622120 /arch/sh/kernel/entry-common.S | |
| parent | sh: Allow for kernel command line concatenation. (diff) | |
| download | linux-fea966f7564205fcf5919af9bde031e753419c96.tar.xz linux-fea966f7564205fcf5919af9bde031e753419c96.zip | |
sh: Remove implicit sign extension from assembler immediates
The SH instruction set has several instructions which accept an 8 bit
immediate operand. For logical instructions this operand is zero extended,
for arithmetic instructions the operand is sign extended. After adding an
option to the assembler to check this, it was found that several pieces
of assembly code were assuming this behaviour, and in one case
getting it wrong.
So this patch explicitly sign extends any immediate operands, which makes
it obvious what is happening, and fixes the one case which got it wrong.
Signed-off-by: Stuart Menefy <stuart.menefy@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/entry-common.S')
| -rw-r--r-- | arch/sh/kernel/entry-common.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index 700477601c6f..68d9223b145e 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S @@ -98,8 +98,9 @@ need_resched: mov #OFF_SR, r0 mov.l @(r0,r15), r0 ! get status register - and #0xf0, r0 ! interrupts off (exception path)? - cmp/eq #0xf0, r0 + shlr r0 + and #(0xf0>>1), r0 ! interrupts off (exception path)? + cmp/eq #(0xf0>>1), r0 bt noresched mov.l 3f, r0 jsr @r0 ! call preempt_schedule_irq |