lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: gcc4 support.

Browse Source 
This fixes up the kernel for gcc4. The existing exception handlers
needed some wrapping for pt_regs access, acessing the registers
via a RELOC_HIDE() pointer.

The strcpy() issues popped up here too, so add -ffreestanding and
kill off the symbol export.

Signed-off-by: Stuart Menefy <stuart.menefy@st.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Stuart Menefy
2006-11-21 11:16:57 +09:00
committed by Paul Mundt
parent 53644087a6
commit f0bc814cfb
8 changed files with 78 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/Makefile
View File

@@ -43,7 +43,7 @@ cflags-$(CONFIG_CPU_SH4A) := -m4a $(call cc-option,-m4a-nofpu,)
cflags-$(CONFIG_CPU_BIG_ENDIAN) += -mb cflags-$(CONFIG_CPU_BIG_ENDIAN) += -mb
cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -ml cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -ml
cflags-y += $(call as-option,-Wa$(comma)-isa=$(isa-y),) cflags-y += $(call as-option,-Wa$(comma)-isa=$(isa-y),) -ffreestanding
cflags-$(CONFIG_SH_DSP) += -Wa,-dsp cflags-$(CONFIG_SH_DSP) += -Wa,-dsp
cflags-$(CONFIG_SH_KGDB) += -g cflags-$(CONFIG_SH_KGDB) += -g

18
arch/sh/kernel/cpu/sh4/fpu.c
View File

@@ -296,16 +296,17 @@ ieee_fpe_handler (struct pt_regs *regs)
} }
asmlinkage void asmlinkage void
do_fpu_error(unsigned long r4, unsigned long r5, unsigned long r6, unsigned long r7, do_fpu_error(unsigned long r4, unsigned long r5, unsigned long r6,
struct pt_regs regs) unsigned long r7, struct pt_regs __regs)
{ {
struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
struct task_struct *tsk = current; struct task_struct *tsk = current;
if (ieee_fpe_handler (&regs)) if (ieee_fpe_handler(regs))
return; return;
regs.pc += 2; regs->pc += 2;
save_fpu(tsk, &regs); save_fpu(tsk, regs);
tsk->thread.trap_no = 11; tsk->thread.trap_no = 11;
tsk->thread.error_code = 0; tsk->thread.error_code = 0;
force_sig(SIGFPE, tsk); force_sig(SIGFPE, tsk);
@@ -313,12 +314,13 @@ do_fpu_error(unsigned long r4, unsigned long r5, unsigned long r6, unsigned long
asmlinkage void asmlinkage void
do_fpu_state_restore(unsigned long r4, unsigned long r5, unsigned long r6, do_fpu_state_restore(unsigned long r4, unsigned long r5, unsigned long r6,
unsigned long r7, struct pt_regs regs) unsigned long r7, struct pt_regs __regs)
{ {
struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
struct task_struct *tsk = current; struct task_struct *tsk = current;
grab_fpu(&regs); grab_fpu(regs);
if (!user_mode(&regs)) { if (!user_mode(regs)) {
printk(KERN_ERR "BUG: FPU is used in kernel mode.\n"); printk(KERN_ERR "BUG: FPU is used in kernel mode.\n");
return; return;
} }

5
arch/sh/kernel/irq.c
View File

@@ -84,9 +84,10 @@ static union irq_ctx *softirq_ctx[NR_CPUS];
asmlinkage int do_IRQ(unsigned long r4, unsigned long r5, asmlinkage int do_IRQ(unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7, unsigned long r6, unsigned long r7,
struct pt_regs regs) struct pt_regs __regs)
{ {
struct pt_regs *old_regs = set_irq_regs(&regs); struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
struct pt_regs *old_regs = set_irq_regs(regs);
int irq; int irq;
#ifdef CONFIG_4KSTACKS #ifdef CONFIG_4KSTACKS
union irq_ctx *curctx, *irqctx; union irq_ctx *curctx, *irqctx;

32
arch/sh/kernel/process.c
View File

@@ -385,10 +385,11 @@ struct task_struct *__switch_to(struct task_struct *prev, struct task_struct *ne
asmlinkage int sys_fork(unsigned long r4, unsigned long r5, asmlinkage int sys_fork(unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7, unsigned long r6, unsigned long r7,
struct pt_regs regs) struct pt_regs __regs)
{ {
struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
return do_fork(SIGCHLD, regs.regs[15], &regs, 0, NULL, NULL); return do_fork(SIGCHLD, regs->regs[15], regs, 0, NULL, NULL);
#else #else
/* fork almost works, enough to trick you into looking elsewhere :-( */ /* fork almost works, enough to trick you into looking elsewhere :-( */
return -EINVAL; return -EINVAL;
@@ -398,11 +399,12 @@ asmlinkage int sys_fork(unsigned long r4, unsigned long r5,
asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
unsigned long parent_tidptr, unsigned long parent_tidptr,
unsigned long child_tidptr, unsigned long child_tidptr,
struct pt_regs regs) struct pt_regs __regs)
{ {
struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
if (!newsp) if (!newsp)
newsp = regs.regs[15]; newsp = regs->regs[15];
return do_fork(clone_flags, newsp, &regs, 0, return do_fork(clone_flags, newsp, regs, 0,
(int __user *)parent_tidptr, (int __user *)child_tidptr); (int __user *)parent_tidptr, (int __user *)child_tidptr);
} }
@@ -418,9 +420,10 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
*/ */
asmlinkage int sys_vfork(unsigned long r4, unsigned long r5, asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7, unsigned long r6, unsigned long r7,
struct pt_regs regs) struct pt_regs __regs)
{ {
return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs.regs[15], &regs, struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->regs[15], regs,
0, NULL, NULL); 0, NULL, NULL);
} }
@@ -429,8 +432,9 @@ asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,
*/ */
asmlinkage int sys_execve(char *ufilename, char **uargv, asmlinkage int sys_execve(char *ufilename, char **uargv,
char **uenvp, unsigned long r7, char **uenvp, unsigned long r7,
struct pt_regs regs) struct pt_regs __regs)
{ {
struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
int error; int error;
char *filename; char *filename;
@@ -442,7 +446,7 @@ asmlinkage int sys_execve(char *ufilename, char **uargv,
error = do_execve(filename, error = do_execve(filename,
(char __user * __user *)uargv, (char __user * __user *)uargv,
(char __user * __user *)uenvp, (char __user * __user *)uenvp,
&regs); regs);
if (error == 0) { if (error == 0) {
task_lock(current); task_lock(current);
current->ptrace &= ~PT_DTRACE; current->ptrace &= ~PT_DTRACE;
@@ -472,9 +476,7 @@ unsigned long get_wchan(struct task_struct *p)
return pc; return pc;
} }
asmlinkage void break_point_trap(unsigned long r4, unsigned long r5, asmlinkage void break_point_trap(void)
unsigned long r6, unsigned long r7,
struct pt_regs regs)
{ {
/* Clear tracing. */ /* Clear tracing. */
#if defined(CONFIG_CPU_SH4A) #if defined(CONFIG_CPU_SH4A)
@@ -492,8 +494,10 @@ asmlinkage void break_point_trap(unsigned long r4, unsigned long r5,
asmlinkage void break_point_trap_software(unsigned long r4, unsigned long r5, asmlinkage void break_point_trap_software(unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7, unsigned long r6, unsigned long r7,
struct pt_regs regs) struct pt_regs __regs)
{ {
regs.pc -= 2; struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
regs->pc -= 2;
force_sig(SIGTRAP, current); force_sig(SIGTRAP, current);
} }

2
arch/sh/kernel/sh_ksyms.c
View File

@@ -73,8 +73,6 @@ DECLARE_EXPORT(__lshrdi3);
DECLARE_EXPORT(__movstr); DECLARE_EXPORT(__movstr);
DECLARE_EXPORT(__movstrSI16); DECLARE_EXPORT(__movstrSI16);
EXPORT_SYMBOL(strcpy);
#ifdef CONFIG_CPU_SH4 #ifdef CONFIG_CPU_SH4
DECLARE_EXPORT(__movstr_i4_even); DECLARE_EXPORT(__movstr_i4_even);
DECLARE_EXPORT(__movstr_i4_odd); DECLARE_EXPORT(__movstr_i4_odd);

24
arch/sh/kernel/signal.c
View File

@@ -37,7 +37,7 @@
asmlinkage int asmlinkage int
sys_sigsuspend(old_sigset_t mask, sys_sigsuspend(old_sigset_t mask,
unsigned long r5, unsigned long r6, unsigned long r7, unsigned long r5, unsigned long r6, unsigned long r7,
struct pt_regs regs) struct pt_regs __regs)
{ {
mask &= _BLOCKABLE; mask &= _BLOCKABLE;
spin_lock_irq(&current->sighand->siglock); spin_lock_irq(&current->sighand->siglock);
@@ -87,9 +87,11 @@ sys_sigaction(int sig, const struct old_sigaction __user *act,
asmlinkage int asmlinkage int
sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
unsigned long r6, unsigned long r7, unsigned long r6, unsigned long r7,
struct pt_regs regs) struct pt_regs __regs)
{ {
return do_sigaltstack(uss, uoss, regs.regs[15]); struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
return do_sigaltstack(uss, uoss, regs->regs[15]);
} }
@@ -198,9 +200,10 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *r0_p
asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5, asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7, unsigned long r6, unsigned long r7,
struct pt_regs regs) struct pt_regs __regs)
{ {
struct sigframe __user *frame = (struct sigframe __user *)regs.regs[15]; struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
struct sigframe __user *frame = (struct sigframe __user *)regs->regs[15];
sigset_t set; sigset_t set;
int r0; int r0;
@@ -220,7 +223,7 @@ asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5,
recalc_sigpending(); recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock); spin_unlock_irq(&current->sighand->siglock);
if (restore_sigcontext(&regs, &frame->sc, &r0)) if (restore_sigcontext(regs, &frame->sc, &r0))
goto badframe; goto badframe;
return r0; return r0;
@@ -231,9 +234,10 @@ badframe:
asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5, asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7, unsigned long r6, unsigned long r7,
struct pt_regs regs) struct pt_regs __regs)
{ {
struct rt_sigframe __user *frame = (struct rt_sigframe __user *)regs.regs[15]; struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
struct rt_sigframe __user *frame = (struct rt_sigframe __user *)regs->regs[15];
sigset_t set; sigset_t set;
stack_t st; stack_t st;
int r0; int r0;
@@ -250,14 +254,14 @@ asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
recalc_sigpending(); recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock); spin_unlock_irq(&current->sighand->siglock);
if (restore_sigcontext(&regs, &frame->uc.uc_mcontext, &r0)) if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &r0))
goto badframe; goto badframe;
if (__copy_from_user(&st, &frame->uc.uc_stack, sizeof(st))) if (__copy_from_user(&st, &frame->uc.uc_stack, sizeof(st)))
goto badframe; goto badframe;
/* It is more difficult to avoid calling this function than to /* It is more difficult to avoid calling this function than to
call it and ignore errors. */ call it and ignore errors. */
do_sigaltstack(&st, NULL, regs.regs[15]); do_sigaltstack(&st, NULL, regs->regs[15]);
return r0; return r0;

5
arch/sh/kernel/sys_sh.c
View File

@@ -33,14 +33,15 @@
*/ */
asmlinkage int sys_pipe(unsigned long r4, unsigned long r5, asmlinkage int sys_pipe(unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7, unsigned long r6, unsigned long r7,
struct pt_regs regs) struct pt_regs __regs)
{ {
struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
int fd[2]; int fd[2];
int error; int error;
error = do_pipe(fd); error = do_pipe(fd);
if (!error) { if (!error) {
regs.regs[1] = fd[1]; regs->regs[1] = fd[1];
return fd[0]; return fd[0];
} }
return error; return error;

48
arch/sh/kernel/traps.c
View File

@@ -23,8 +23,8 @@
#ifdef CONFIG_SH_KGDB #ifdef CONFIG_SH_KGDB
#include <asm/kgdb.h> #include <asm/kgdb.h>
#define CHK_REMOTE_DEBUG(regs) \ #define CHK_REMOTE_DEBUG(regs) \
{ \ { \
if (kgdb_debug_hook && !user_mode(regs))\ if (kgdb_debug_hook && !user_mode(regs))\
(*kgdb_debug_hook)(regs); \ (*kgdb_debug_hook)(regs); \
} }
@@ -612,8 +612,9 @@ int is_dsp_inst(struct pt_regs *regs)
#ifdef CONFIG_CPU_SH2A #ifdef CONFIG_CPU_SH2A
asmlinkage void do_divide_error(unsigned long r4, unsigned long r5, asmlinkage void do_divide_error(unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7, unsigned long r6, unsigned long r7,
struct pt_regs regs) struct pt_regs __regs)
{ {
struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
siginfo_t info; siginfo_t info;
current->thread.trap_no = r4; current->thread.trap_no = r4;
@@ -635,12 +636,13 @@ asmlinkage void do_divide_error(unsigned long r4, unsigned long r5,
/* arch/sh/kernel/cpu/sh4/fpu.c */ /* arch/sh/kernel/cpu/sh4/fpu.c */
extern int do_fpu_inst(unsigned short, struct pt_regs *); extern int do_fpu_inst(unsigned short, struct pt_regs *);
extern asmlinkage void do_fpu_state_restore(unsigned long r4, unsigned long r5, extern asmlinkage void do_fpu_state_restore(unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7, struct pt_regs regs); unsigned long r6, unsigned long r7, struct pt_regs __regs);
asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5, asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7, unsigned long r6, unsigned long r7,
struct pt_regs regs) struct pt_regs __regs)
{ {
struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
unsigned long error_code; unsigned long error_code;
struct task_struct *tsk = current; struct task_struct *tsk = current;
@@ -648,11 +650,11 @@ asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5,
unsigned short inst = 0; unsigned short inst = 0;
int err; int err;
get_user(inst, (unsigned short*)regs.pc); get_user(inst, (unsigned short*)regs->pc);
err = do_fpu_inst(inst, &regs); err = do_fpu_inst(inst, regs);
if (!err) { if (!err) {
regs.pc += 2; regs->pc += 2;
return; return;
} }
/* not a FPU inst. */ /* not a FPU inst. */
@@ -660,9 +662,9 @@ asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5,
#ifdef CONFIG_SH_DSP #ifdef CONFIG_SH_DSP
/* Check if it's a DSP instruction */ /* Check if it's a DSP instruction */
if (is_dsp_inst(&regs)) { if (is_dsp_inst(regs)) {
/* Enable DSP mode, and restart instruction. */ /* Enable DSP mode, and restart instruction. */
regs.sr |= SR_DSP; regs->sr |= SR_DSP;
return; return;
} }
#endif #endif
@@ -672,9 +674,9 @@ asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5,
local_irq_enable(); local_irq_enable();
tsk->thread.error_code = error_code; tsk->thread.error_code = error_code;
tsk->thread.trap_no = TRAP_RESERVED_INST; tsk->thread.trap_no = TRAP_RESERVED_INST;
CHK_REMOTE_DEBUG(&regs); CHK_REMOTE_DEBUG(regs);
force_sig(SIGILL, tsk); force_sig(SIGILL, tsk);
die_if_no_fixup("reserved instruction", &regs, error_code); die_if_no_fixup("reserved instruction", regs, error_code);
} }
#ifdef CONFIG_SH_FPU_EMU #ifdef CONFIG_SH_FPU_EMU
@@ -722,17 +724,18 @@ static int emulate_branch(unsigned short inst, struct pt_regs* regs)
asmlinkage void do_illegal_slot_inst(unsigned long r4, unsigned long r5, asmlinkage void do_illegal_slot_inst(unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7, unsigned long r6, unsigned long r7,
struct pt_regs regs) struct pt_regs __regs)
{ {
struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
unsigned long error_code; unsigned long error_code;
struct task_struct *tsk = current; struct task_struct *tsk = current;
#ifdef CONFIG_SH_FPU_EMU #ifdef CONFIG_SH_FPU_EMU
unsigned short inst = 0; unsigned short inst = 0;
get_user(inst, (unsigned short *)regs.pc + 1); get_user(inst, (unsigned short *)regs->pc + 1);
if (!do_fpu_inst(inst, &regs)) { if (!do_fpu_inst(inst, regs)) {
get_user(inst, (unsigned short *)regs.pc); get_user(inst, (unsigned short *)regs->pc);
if (!emulate_branch(inst, &regs)) if (!emulate_branch(inst, regs))
return; return;
/* fault in branch.*/ /* fault in branch.*/
} }
@@ -744,19 +747,20 @@ asmlinkage void do_illegal_slot_inst(unsigned long r4, unsigned long r5,
local_irq_enable(); local_irq_enable();
tsk->thread.error_code = error_code; tsk->thread.error_code = error_code;
tsk->thread.trap_no = TRAP_RESERVED_INST; tsk->thread.trap_no = TRAP_RESERVED_INST;
CHK_REMOTE_DEBUG(&regs); CHK_REMOTE_DEBUG(regs);
force_sig(SIGILL, tsk); force_sig(SIGILL, tsk);
die_if_no_fixup("illegal slot instruction", &regs, error_code); die_if_no_fixup("illegal slot instruction", regs, error_code);
} }
asmlinkage void do_exception_error(unsigned long r4, unsigned long r5, asmlinkage void do_exception_error(unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7, unsigned long r6, unsigned long r7,
struct pt_regs regs) struct pt_regs __regs)
{ {
struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
long ex; long ex;
lookup_exception_vector(ex); lookup_exception_vector(ex);
die_if_kernel("exception", &regs, ex); die_if_kernel("exception", regs, ex);
} }
#if defined(CONFIG_SH_STANDARD_BIOS) #if defined(CONFIG_SH_STANDARD_BIOS)
@@ -809,7 +813,7 @@ void *set_exception_table_vec(unsigned int vec, void *handler)
extern asmlinkage void address_error_handler(unsigned long r4, unsigned long r5, extern asmlinkage void address_error_handler(unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7, unsigned long r6, unsigned long r7,
struct pt_regs regs); struct pt_regs __regs);
void __init trap_init(void) void __init trap_init(void)
{ {