aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel
diff options
context:
space:
mode:
authorYoshinori Sato <ysato@users.sourceforge.jp>2006-12-19 12:10:48 +0900
committerPaul Mundt <lethal@linux-sh.org>2007-02-13 10:54:43 +0900
commit4aa362bbdd801dd971acbe3db479fe871f2fed0b (patch)
tree9cab8a281ca954b3e6c6ca177f49bda20de84310 /arch/sh/kernel
parentsh: Use proper SH-2A CFLAGS on newer compilers. (diff)
downloadlinux-dev-4aa362bbdd801dd971acbe3db479fe871f2fed0b.tar.xz
linux-dev-4aa362bbdd801dd971acbe3db479fe871f2fed0b.zip
sh: Update SH-2 to use the debug trap jump table.
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r--arch/sh/kernel/cpu/sh2/entry.S10
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/sh/kernel/cpu/sh2/entry.S b/arch/sh/kernel/cpu/sh2/entry.S
index 8de48102ac85..7f7d292f36ec 100644
--- a/arch/sh/kernel/cpu/sh2/entry.S
+++ b/arch/sh/kernel/cpu/sh2/entry.S
@@ -178,12 +178,10 @@ interrupt_entry:
8: .long do_exception_error
trap_entry:
- /* verbose BUG trapa entry check */
- mov #0x3e,r8
- cmp/ge r8,r9
- bf/s 1f
- add #-0x10,r9
- add #0x10,r9
+ mov #0x30,r8
+ cmp/ge r8,r9 ! vector 0x20-0x2f is systemcall
+ bt 1f
+ add #-0x10,r9 ! convert SH2 to SH3/4 ABI
1:
shll2 r9 ! TRA
mov #OFF_TRA,r8