[PATCH] m68k: make fp register stores consistent for m68k and ColdFire

[PATCH] m68k: make fp register stores consistent for m68k and ColdFire

[gerg]

From: Greg Ungerer <gerg@uclinux.org>

There is no reason we can't make the saved fp registers the same for all
m68k types and ColdFire. There is a little wasted space, but the code
consistentcy and cleanliness is a big win.

sigcontext.h is an exported header, but currently there is no in-mainline
users of the !__uClinux__ and __mcoldfire__ case that this change effects.
Even better this change actually makes this structure consistent with
the out-of-mainline ColdFire/MMU code.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
 arch/m68k/include/asm/sigcontext.h |    4 ----
 arch/m68k/include/asm/ucontext.h   |    4 ----
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/arch/m68k/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext.h
index a29dd74..523db2a 100644
--- a/arch/m68k/include/asm/sigcontext.h
+++ b/arch/m68k/include/asm/sigcontext.h
@@ -15,11 +15,7 @@ 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 */
-# else
 	unsigned long  sc_fpregs[2*3];  /* 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 00dcc51..e4e2266 100644
--- a/arch/m68k/include/asm/ucontext.h
+++ b/arch/m68k/include/asm/ucontext.h
@@ -7,11 +7,7 @@ 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 {
-- 
1.7.0.4

Re: [PATCH] m68k: make fp register stores consistent for m68k and ColdFire

[Geert Uytterhoeven]

On Thu, Nov 3, 2011 at 06:58,  <gerg@snapgear.com> wrote:
> From: Greg Ungerer <gerg@uclinux.org>
>
> There is no reason we can't make the saved fp registers the same for all
> m68k types and ColdFire. There is a little wasted space, but the code
> consistentcy and cleanliness is a big win.

consistency

> sigcontext.h is an exported header, but currently there is no in-mainline
> users of the !__uClinux__ and __mcoldfire__ case that this change effects.
> Even better this change actually makes this structure consistent with
> the out-of-mainline ColdFire/MMU code.
>
> Signed-off-by: Greg Ungerer <gerg@uclinux.org>

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] m68k: make fp register stores consistent for m68k and ColdFire

[Greg Ungerer]

Hi Geert,

On 03/11/11 18:23, Geert Uytterhoeven wrote:
> On Thu, Nov 3, 2011 at 06:58,<gerg@snapgear.com>  wrote:
>> From: Greg Ungerer<gerg@uclinux.org>
>>
>> There is no reason we can't make the saved fp registers the same for all
>> m68k types and ColdFire. There is a little wasted space, but the code
>> consistentcy and cleanliness is a big win.
>
> consistency

I really need to spell check these :-)


>> sigcontext.h is an exported header, but currently there is no in-mainline
>> users of the !__uClinux__ and __mcoldfire__ case that this change effects.
>> Even better this change actually makes this structure consistent with
>> the out-of-mainline ColdFire/MMU code.
>>
>> Signed-off-by: Greg Ungerer<gerg@uclinux.org>
>
> Acked-by: Geert Uytterhoeven<geert@linux-m68k.org>

Thanks!

Regards
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