* [PATCH] Define sigcontext ABI of ColdFire @ 2009-09-18 10:28 Maxim Kuvyrkov 2009-09-22 21:37 ` Maxim Kuvyrkov 0 siblings, 1 reply; 5+ messages in thread From: Maxim Kuvyrkov @ 2009-09-18 10:28 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: Andreas Schwab, linux-m68k [-- Attachment #1: Type: text/plain, Size: 188 bytes --] The following patch define sigcontext ABI of ColdFire. Once these changes are reviewed, I'll follow up with patches to GLIBC and GCC's linux-unwind.h. Thanks, -- Maxim K. CodeSourcery [-- Attachment #2: 0001-Define-sigcontext-ABI-of-ColdFire.patch --] [-- Type: text/plain, Size: 2841 bytes --] >From 998f3f07de69f51aa6d810800c8e8a685a4dec77 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov <maxim@codesourcery.com> Date: Fri, 18 Sep 2009 14:09:03 +0400 Subject: [PATCH] Define sigcontext ABI of ColdFire The following patch defines sigcontext ABI of ColdFire. Due to ISA restrictions ColdFire needs different rt_sigreturn trampoline. And due to ColdFire FP registers being 8-bytes instead of 12-bytes on m68k, sigcontext and fpregset structures should be updated. Regarding the sc_fpstate[16+6*8] field, it would've been enough 16 bytes to store ColdFire's FP state. To accomodate GLIBC's libSegFault it would'be been enough 6*8 bytes (room for the 6 non-call-clobbered FP registers). I set it to 16+6*8 to provide some extra space for any future changes in the ColdFire FPU. Signed-off-by: Maxim Kuvyrkov <maxim@codesourcery.com> --- arch/m68k/include/asm/sigcontext.h | 6 ++++++ arch/m68k/include/asm/ucontext.h | 4 ++++ arch/m68k/kernel/signal.c | 6 ++++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/arch/m68k/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext.h index 523db2a..1320eaa 100644 --- a/arch/m68k/include/asm/sigcontext.h +++ b/arch/m68k/include/asm/sigcontext.h @@ -15,9 +15,15 @@ struct sigcontext { unsigned long sc_pc; unsigned short sc_formatvec; #ifndef __uClinux__ +# ifdef __mcoldfire__ + unsigned long sc_fpregs[2][2]; /* room for two fp registers */ + unsigned long sc_fpcntl[3]; + unsigned char sc_fpstate[16+6*8]; +# else unsigned long sc_fpregs[2*3]; /* room for two fp registers */ unsigned long sc_fpcntl[3]; unsigned char sc_fpstate[216]; +# endif #endif }; diff --git a/arch/m68k/include/asm/ucontext.h b/arch/m68k/include/asm/ucontext.h index e4e2266..00dcc51 100644 --- a/arch/m68k/include/asm/ucontext.h +++ b/arch/m68k/include/asm/ucontext.h @@ -7,7 +7,11 @@ typedef greg_t gregset_t[NGREG]; typedef struct fpregset { int f_fpcntl[3]; +#ifdef __mcoldfire__ + int f_fpregs[8][2]; +#else int f_fpregs[8*3]; +#endif } fpregset_t; struct mcontext { diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c index de2d05d..9913c2b 100644 --- a/arch/m68k/kernel/signal.c +++ b/arch/m68k/kernel/signal.c @@ -897,9 +897,15 @@ static void setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info, /* Set up to return from userspace. */ err |= __put_user(frame->retcode, &frame->pretcode); +#ifdef __mcoldfire__ + /* move.w #,d0; trap #0 */ + err |= __put_user(0x303c0000 + __NR_rt_sigreturn, + (long __user *)(frame->retcode + 0)); +#else /* moveq #,d0; notb d0; trap #0 */ err |= __put_user(0x70004600 + ((__NR_rt_sigreturn ^ 0xff) << 16), (long __user *)(frame->retcode + 0)); +#endif err |= __put_user(0x4e40, (short __user *)(frame->retcode + 4)); if (err) -- 1.6.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Define sigcontext ABI of ColdFire 2009-09-18 10:28 [PATCH] Define sigcontext ABI of ColdFire Maxim Kuvyrkov @ 2009-09-22 21:37 ` Maxim Kuvyrkov 2009-11-09 9:42 ` Maxim Kuvyrkov 2010-02-09 11:22 ` [PATCH] Define sigcontext ABI for ColdFire Maxim Kuvyrkov 0 siblings, 2 replies; 5+ messages in thread From: Maxim Kuvyrkov @ 2009-09-22 21:37 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: Andreas Schwab, linux-m68k [-- Attachment #1: Type: text/plain, Size: 1379 bytes --] Maxim Kuvyrkov wrote: > The following patch define sigcontext ABI of ColdFire. ... > --- a/arch/m68k/kernel/signal.c > +++ b/arch/m68k/kernel/signal.c > @@ -897,9 +897,15 @@ static void setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info, > > /* Set up to return from userspace. */ > err |= __put_user(frame->retcode, &frame->pretcode); > +#ifdef __mcoldfire__ > + /* move.w #,d0; trap #0 */ > + err |= __put_user(0x303c0000 + __NR_rt_sigreturn, > + (long __user *)(frame->retcode + 0)); > +#else > /* moveq #,d0; notb d0; trap #0 */ > err |= __put_user(0x70004600 + ((__NR_rt_sigreturn ^ 0xff) << 16), > (long __user *)(frame->retcode + 0)); > +#endif > err |= __put_user(0x4e40, (short __user *)(frame->retcode + 4)); > > if (err) This turned out to be buggy: move.w will only set the lower 16 bits of %d0 so if the signal handler leaves something in the high-order bits, then the trampoline will trap into a non-existent syscall. The attached patch fixes this; nothing else in it has changed since the initial revision. I was lured into thinking that the above sequence is OK by m68knommu's version of the trampoline. Arch/m68knommu/kernel/entry.S uses "move #__NR_rt_sigreturn,%d0" which assembles into "move.w". This is too is buggy and I'm also attaching the fix for the nommu version. Regards, -- Maxim K. CodeSourcery [-- Attachment #2: 0001-Define-sigcontext-ABI-of-ColdFire.patch --] [-- Type: text/plain, Size: 2963 bytes --] >From bafb4e11ac13ea3095d9e8510f9a58c4cdc0481d Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov <maxim@codesourcery.com> Date: Wed, 23 Sep 2009 01:22:43 +0400 Subject: [PATCH 1/2] Define sigcontext ABI of ColdFire The following patch defines sigcontext ABI of ColdFire. Due to ISA restrictions ColdFire needs different rt_sigreturn trampoline. And due to ColdFire FP registers being 8-bytes instead of 12-bytes on m68k, sigcontext and fpregset structures should be updated. Regarding the sc_fpstate[16+6*8] field, it would've been enough 16 bytes to store ColdFire's FP state. To accomodate GLIBC's libSegFault it would'be been enough 6*8 bytes (room for the 6 non-call-clobbered FP registers). I set it to 16+6*8 to provide some extra space for any future changes in the ColdFire FPU. Signed-off-by: Maxim Kuvyrkov <maxim@codesourcery.com> --- arch/m68k/include/asm/sigcontext.h | 6 ++++++ arch/m68k/include/asm/ucontext.h | 4 ++++ arch/m68k/kernel/signal.c | 7 +++++++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/arch/m68k/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext.h index 523db2a..1320eaa 100644 --- a/arch/m68k/include/asm/sigcontext.h +++ b/arch/m68k/include/asm/sigcontext.h @@ -15,9 +15,15 @@ struct sigcontext { unsigned long sc_pc; unsigned short sc_formatvec; #ifndef __uClinux__ +# ifdef __mcoldfire__ + unsigned long sc_fpregs[2][2]; /* room for two fp registers */ + unsigned long sc_fpcntl[3]; + unsigned char sc_fpstate[16+6*8]; +# else unsigned long sc_fpregs[2*3]; /* room for two fp registers */ unsigned long sc_fpcntl[3]; unsigned char sc_fpstate[216]; +# endif #endif }; diff --git a/arch/m68k/include/asm/ucontext.h b/arch/m68k/include/asm/ucontext.h index e4e2266..00dcc51 100644 --- a/arch/m68k/include/asm/ucontext.h +++ b/arch/m68k/include/asm/ucontext.h @@ -7,7 +7,11 @@ typedef greg_t gregset_t[NGREG]; typedef struct fpregset { int f_fpcntl[3]; +#ifdef __mcoldfire__ + int f_fpregs[8][2]; +#else int f_fpregs[8*3]; +#endif } fpregset_t; struct mcontext { diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c index de2d05d..4b38753 100644 --- a/arch/m68k/kernel/signal.c +++ b/arch/m68k/kernel/signal.c @@ -897,10 +897,17 @@ static void setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info, /* Set up to return from userspace. */ err |= __put_user(frame->retcode, &frame->pretcode); +#ifdef __mcoldfire__ + /* movel #__NR_rt_sigreturn,d0; trap #0 */ + err |= __put_user(0x203c0000, (long __user *)(frame->retcode + 0)); + err |= __put_user(0x00004e40 + (__NR_rt_sigreturn << 16), + (long __user *)(frame->retcode + 4)); +#else /* moveq #,d0; notb d0; trap #0 */ err |= __put_user(0x70004600 + ((__NR_rt_sigreturn ^ 0xff) << 16), (long __user *)(frame->retcode + 0)); err |= __put_user(0x4e40, (short __user *)(frame->retcode + 4)); +#endif if (err) goto give_sigsegv; -- 1.6.4 [-- Attachment #3: 0002-Fix-m68k-uclinux-s-rt_sigreturn-trampoline.patch --] [-- Type: text/plain, Size: 726 bytes --] >From ac003b05af17bb48e6acffd454cae6fdf6e80737 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov <maxim@codesourcery.com> Date: Wed, 23 Sep 2009 01:25:44 +0400 Subject: [PATCH 2/2] Fix m68k-uclinux's rt_sigreturn trampoline Signed-off-by: Maxim Kuvyrkov <maxim@codesourcery.com> --- arch/m68knommu/kernel/entry.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/m68knommu/kernel/entry.S b/arch/m68knommu/kernel/entry.S index f56faa5..2717605 100644 --- a/arch/m68knommu/kernel/entry.S +++ b/arch/m68knommu/kernel/entry.S @@ -145,6 +145,6 @@ ENTRY(ret_from_user_signal) trap #0 ENTRY(ret_from_user_rt_signal) - move #__NR_rt_sigreturn,%d0 + movel #__NR_rt_sigreturn,%d0 trap #0 -- 1.6.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Define sigcontext ABI of ColdFire 2009-09-22 21:37 ` Maxim Kuvyrkov @ 2009-11-09 9:42 ` Maxim Kuvyrkov 2010-02-09 11:22 ` [PATCH] Define sigcontext ABI for ColdFire Maxim Kuvyrkov 1 sibling, 0 replies; 5+ messages in thread From: Maxim Kuvyrkov @ 2009-11-09 9:42 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: Andreas Schwab, linux-m68k Maxim Kuvyrkov wrote: > Maxim Kuvyrkov wrote: >> The following patch define sigcontext ABI of ColdFire. Ping. The lack of defined ABI is blocking submission of the other pieces of NPTL support for m68k. -- Maxim Kuvyrkov CodeSourcery maxim@codesourcery.com (650) 331-3385 x724 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Define sigcontext ABI for ColdFire 2009-09-22 21:37 ` Maxim Kuvyrkov 2009-11-09 9:42 ` Maxim Kuvyrkov @ 2010-02-09 11:22 ` Maxim Kuvyrkov 2010-02-10 6:16 ` Greg Ungerer 1 sibling, 1 reply; 5+ messages in thread From: Maxim Kuvyrkov @ 2010-02-09 11:22 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: Andreas Schwab, Greg Ungerer, Linux/m68k [-- Attachment #1: Type: text/plain, Size: 767 bytes --] On 9/23/09 1:37 AM, Maxim Kuvyrkov wrote: > Maxim Kuvyrkov wrote: >> The following patch define sigcontext ABI of ColdFire. ... > I was lured into thinking that the above sequence is OK by m68knommu's > version of the trampoline. Arch/m68knommu/kernel/entry.S uses "move > #__NR_rt_sigreturn,%d0" which assembles into "move.w". This is too is > buggy and I'm also attaching the fix for the nommu version. I have cleaned up the sigcontext patch for ColdFire to only touch the necessary fields in the sigcontext structure. Attached are the cleaned up sigcontext patch and the rt_sigreturn fix for m68knommu. I hope these patches will find their way into m68k/for-2.6.34 branch. Regards, -- Maxim Kuvyrkov CodeSourcery maxim@codesourcery.com (650) 331-3385 x724 [-- Attachment #2: 0001-Define-sigcontext-ABI-for-ColdFire.patch --] [-- Type: text/plain, Size: 2571 bytes --] >From 1630ef86e8a1239c1d4ec6f8a6566ab57771f615 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov <maxim@codesourcery.com> Date: Tue, 9 Feb 2010 14:03:16 +0300 Subject: [PATCH 1/2] Define sigcontext ABI for ColdFire The following patch defines sigcontext ABI of ColdFire. Due to ISA restrictions ColdFire needs different rt_sigreturn trampoline. And due to ColdFire FPU registers being 8-bytes instead of 12-bytes, sigcontext and fpregset structures need to be updated. Signed-off-by: Maxim Kuvyrkov <maxim@codesourcery.com> --- arch/m68k/include/asm/sigcontext.h | 4 ++++ arch/m68k/include/asm/ucontext.h | 4 ++++ arch/m68k/kernel/signal.c | 7 +++++++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/arch/m68k/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext.h index 523db2a..68d8881 100644 --- a/arch/m68k/include/asm/sigcontext.h +++ b/arch/m68k/include/asm/sigcontext.h @@ -15,7 +15,11 @@ struct sigcontext { unsigned long sc_pc; unsigned short sc_formatvec; #ifndef __uClinux__ +# ifndef __mcoldfire__ unsigned long sc_fpregs[2*3]; /* room for two fp registers */ +# else + unsigned long sc_fpregs[2][2]; /* room for two fp registers */ +# endif unsigned long sc_fpcntl[3]; unsigned char sc_fpstate[216]; #endif diff --git a/arch/m68k/include/asm/ucontext.h b/arch/m68k/include/asm/ucontext.h index e4e2266..465062b 100644 --- a/arch/m68k/include/asm/ucontext.h +++ b/arch/m68k/include/asm/ucontext.h @@ -7,7 +7,11 @@ typedef greg_t gregset_t[NGREG]; typedef struct fpregset { int f_fpcntl[3]; +#ifndef __mcoldfire__ int f_fpregs[8*3]; +#else + int f_fpregs[8][2]; +#endif } fpregset_t; struct mcontext { diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c index de2d05d..3be91e1 100644 --- a/arch/m68k/kernel/signal.c +++ b/arch/m68k/kernel/signal.c @@ -897,10 +897,17 @@ static void setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info, /* Set up to return from userspace. */ err |= __put_user(frame->retcode, &frame->pretcode); +#ifndef __mcoldfire__ /* moveq #,d0; notb d0; trap #0 */ err |= __put_user(0x70004600 + ((__NR_rt_sigreturn ^ 0xff) << 16), (long __user *)(frame->retcode + 0)); err |= __put_user(0x4e40, (short __user *)(frame->retcode + 4)); +#else + /* movel #__NR_rt_sigreturn,d0; trap #0 */ + err |= __put_user(0x203c0000, (long __user *)(frame->retcode + 0)); + err |= __put_user(0x00004e40 + (__NR_rt_sigreturn << 16), + (long __user *)(frame->retcode + 4)); +#endif if (err) goto give_sigsegv; -- 1.6.6.1 [-- Attachment #3: 0002-Fix-m68k-uclinux-s-rt_sigreturn-trampoline.patch --] [-- Type: text/plain, Size: 727 bytes --] >From 68c601c6f0135ca7cede22d4b1d4f59ef545f965 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov <maxim@codesourcery.com> Date: Wed, 23 Sep 2009 01:25:44 +0400 Subject: [PATCH 2/2] Fix m68k-uclinux's rt_sigreturn trampoline Signed-off-by: Maxim Kuvyrkov <maxim@codesourcery.com> --- arch/m68knommu/kernel/entry.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/m68knommu/kernel/entry.S b/arch/m68knommu/kernel/entry.S index 56043ad..aff6f57 100644 --- a/arch/m68knommu/kernel/entry.S +++ b/arch/m68knommu/kernel/entry.S @@ -145,6 +145,6 @@ ENTRY(ret_from_user_signal) trap #0 ENTRY(ret_from_user_rt_signal) - move #__NR_rt_sigreturn,%d0 + movel #__NR_rt_sigreturn,%d0 trap #0 -- 1.6.6.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Define sigcontext ABI for ColdFire 2010-02-09 11:22 ` [PATCH] Define sigcontext ABI for ColdFire Maxim Kuvyrkov @ 2010-02-10 6:16 ` Greg Ungerer 0 siblings, 0 replies; 5+ messages in thread From: Greg Ungerer @ 2010-02-10 6:16 UTC (permalink / raw) To: Maxim Kuvyrkov; +Cc: Geert Uytterhoeven, Andreas Schwab, Linux/m68k Hi Maxim, Maxim Kuvyrkov wrote: > On 9/23/09 1:37 AM, Maxim Kuvyrkov wrote: >> Maxim Kuvyrkov wrote: >>> The following patch define sigcontext ABI of ColdFire. > ... >> I was lured into thinking that the above sequence is OK by m68knommu's >> version of the trampoline. Arch/m68knommu/kernel/entry.S uses "move >> #__NR_rt_sigreturn,%d0" which assembles into "move.w". This is too is >> buggy and I'm also attaching the fix for the nommu version. > > I have cleaned up the sigcontext patch for ColdFire to only touch the > necessary fields in the sigcontext structure. Attached are the cleaned > up sigcontext patch and the rt_sigreturn fix for m68knommu. > > I hope these patches will find their way into m68k/for-2.6.34 branch. I'll take 0002-Fix-m68k-uclinux-s-rt_sigreturn-trampoline.patch and apply to the m68knommu git tree. Thanks Greg ------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close FAX: +61 7 3217 5323 Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-02-10 6:15 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-09-18 10:28 [PATCH] Define sigcontext ABI of ColdFire Maxim Kuvyrkov 2009-09-22 21:37 ` Maxim Kuvyrkov 2009-11-09 9:42 ` Maxim Kuvyrkov 2010-02-09 11:22 ` [PATCH] Define sigcontext ABI for ColdFire Maxim Kuvyrkov 2010-02-10 6:16 ` Greg Ungerer
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox