diff options
Diffstat (limited to 'arch/sh/include/asm/system_32.h')
| -rw-r--r-- | arch/sh/include/asm/system_32.h | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/arch/sh/include/asm/system_32.h b/arch/sh/include/asm/system_32.h index 6c68a51f1cc5..607d413f6168 100644 --- a/arch/sh/include/asm/system_32.h +++ b/arch/sh/include/asm/system_32.h | |||
| @@ -14,12 +14,12 @@ do { \ | |||
| 14 | (u32 *)&tsk->thread.dsp_status; \ | 14 | (u32 *)&tsk->thread.dsp_status; \ |
| 15 | __asm__ __volatile__ ( \ | 15 | __asm__ __volatile__ ( \ |
| 16 | ".balign 4\n\t" \ | 16 | ".balign 4\n\t" \ |
| 17 | "movs.l @r2+, a0\n\t" \ | ||
| 17 | "movs.l @r2+, a1\n\t" \ | 18 | "movs.l @r2+, a1\n\t" \ |
| 18 | "movs.l @r2+, a0g\n\t" \ | 19 | "movs.l @r2+, a0g\n\t" \ |
| 19 | "movs.l @r2+, a1g\n\t" \ | 20 | "movs.l @r2+, a1g\n\t" \ |
| 20 | "movs.l @r2+, m0\n\t" \ | 21 | "movs.l @r2+, m0\n\t" \ |
| 21 | "movs.l @r2+, m1\n\t" \ | 22 | "movs.l @r2+, m1\n\t" \ |
| 22 | "movs.l @r2+, a0\n\t" \ | ||
| 23 | "movs.l @r2+, x0\n\t" \ | 23 | "movs.l @r2+, x0\n\t" \ |
| 24 | "movs.l @r2+, x1\n\t" \ | 24 | "movs.l @r2+, x1\n\t" \ |
| 25 | "movs.l @r2+, y0\n\t" \ | 25 | "movs.l @r2+, y0\n\t" \ |
| @@ -39,20 +39,20 @@ do { \ | |||
| 39 | \ | 39 | \ |
| 40 | __asm__ __volatile__ ( \ | 40 | __asm__ __volatile__ ( \ |
| 41 | ".balign 4\n\t" \ | 41 | ".balign 4\n\t" \ |
| 42 | "stc.l mod, @-r2\n\t" \ | 42 | "stc.l mod, @-r2\n\t" \ |
| 43 | "stc.l re, @-r2\n\t" \ | 43 | "stc.l re, @-r2\n\t" \ |
| 44 | "stc.l rs, @-r2\n\t" \ | 44 | "stc.l rs, @-r2\n\t" \ |
| 45 | "sts.l dsr, @-r2\n\t" \ | 45 | "sts.l dsr, @-r2\n\t" \ |
| 46 | "sts.l y1, @-r2\n\t" \ | 46 | "movs.l y1, @-r2\n\t" \ |
| 47 | "sts.l y0, @-r2\n\t" \ | 47 | "movs.l y0, @-r2\n\t" \ |
| 48 | "sts.l x1, @-r2\n\t" \ | 48 | "movs.l x1, @-r2\n\t" \ |
| 49 | "sts.l x0, @-r2\n\t" \ | 49 | "movs.l x0, @-r2\n\t" \ |
| 50 | "sts.l a0, @-r2\n\t" \ | 50 | "movs.l m1, @-r2\n\t" \ |
| 51 | ".word 0xf653 ! movs.l a1, @-r2\n\t" \ | 51 | "movs.l m0, @-r2\n\t" \ |
| 52 | ".word 0xf6f3 ! movs.l a0g, @-r2\n\t" \ | 52 | "movs.l a1g, @-r2\n\t" \ |
| 53 | ".word 0xf6d3 ! movs.l a1g, @-r2\n\t" \ | 53 | "movs.l a0g, @-r2\n\t" \ |
| 54 | ".word 0xf6c3 ! movs.l m0, @-r2\n\t" \ | 54 | "movs.l a1, @-r2\n\t" \ |
| 55 | ".word 0xf6e3 ! movs.l m1, @-r2\n\t" \ | 55 | "movs.l a0, @-r2\n\t" \ |
| 56 | : : "r" (__ts2)); \ | 56 | : : "r" (__ts2)); \ |
| 57 | } while (0) | 57 | } while (0) |
| 58 | 58 | ||
| @@ -63,6 +63,16 @@ do { \ | |||
| 63 | #define __restore_dsp(tsk) do { } while (0) | 63 | #define __restore_dsp(tsk) do { } while (0) |
| 64 | #endif | 64 | #endif |
| 65 | 65 | ||
| 66 | #if defined(CONFIG_CPU_SH4A) | ||
| 67 | #define __icbi(addr) __asm__ __volatile__ ( "icbi @%0\n\t" : : "r" (addr)) | ||
| 68 | #else | ||
| 69 | #define __icbi(addr) mb() | ||
| 70 | #endif | ||
| 71 | |||
| 72 | #define __ocbp(addr) __asm__ __volatile__ ( "ocbp @%0\n\t" : : "r" (addr)) | ||
| 73 | #define __ocbi(addr) __asm__ __volatile__ ( "ocbi @%0\n\t" : : "r" (addr)) | ||
| 74 | #define __ocbwb(addr) __asm__ __volatile__ ( "ocbwb @%0\n\t" : : "r" (addr)) | ||
| 75 | |||
| 66 | struct task_struct *__switch_to(struct task_struct *prev, | 76 | struct task_struct *__switch_to(struct task_struct *prev, |
| 67 | struct task_struct *next); | 77 | struct task_struct *next); |
| 68 | 78 | ||
| @@ -198,8 +208,13 @@ do { \ | |||
| 198 | }) | 208 | }) |
| 199 | #endif | 209 | #endif |
| 200 | 210 | ||
| 211 | static inline reg_size_t register_align(void *val) | ||
| 212 | { | ||
| 213 | return (unsigned long)(signed long)val; | ||
| 214 | } | ||
| 215 | |||
| 201 | int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs, | 216 | int handle_unaligned_access(insn_size_t instruction, struct pt_regs *regs, |
| 202 | struct mem_access *ma); | 217 | struct mem_access *ma, int); |
| 203 | 218 | ||
| 204 | asmlinkage void do_address_error(struct pt_regs *regs, | 219 | asmlinkage void do_address_error(struct pt_regs *regs, |
| 205 | unsigned long writeaccess, | 220 | unsigned long writeaccess, |