Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d7b92ad authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc: add '32' suffix to reg_window, sigcontext, __siginfo_t 



Renaming a few types to contain a 32 suffix makes the
type names compatible with sparc64 and thus makes sharing
between the two a lot easier.

Note: None of these definitions are expected part of the
stable ABI towards userspace.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ece93487

arch/sparc/include/asm/processor_32.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static inline void start_thread(struct pt_regs * regs, unsigned long pc, 
			     "st\t%%g0, [%0 + %3 + 0x3c]"

			     : /* no outputs */

			     : "r" (regs),

			       "r" (sp - sizeof(struct reg_window)),

			       "r" (sp - sizeof(struct reg_window32)),

			       "r" (zero),

			       "i" ((const unsigned long)(&((struct pt_regs *)0)->u_regs[0]))

			     : "memory");

arch/sparc/include/asm/ptrace_32.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct pt_regs { 
#define UREG_RETPC     UREG_I7



/* A register window */

struct reg_window {

struct reg_window32 {

	unsigned long locals[8];

	unsigned long ins[8];

};

arch/sparc/include/asm/sigcontext_32.h

+3 −6
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#define __SUNOS_MAXWIN   31



/* This is what SunOS does, so shall I. */

struct sigcontext {

struct sigcontext32 {

	int sigc_onstack;      /* state to restore */

	int sigc_mask;         /* sigmask to restore */

	int sigc_sp;           /* stack pointer */
@@ -28,10 +28,7 @@ struct sigcontext { 
	char *sigc_spbuf[__SUNOS_MAXWIN];



	/* Windows to restore after signal */

	struct {

		unsigned long	locals[8];

		unsigned long	ins[8];

	} sigc_wbuf[__SUNOS_MAXWIN];

	struct reg_window32 sigc_wbuf[__SUNOS_MAXWIN];

};



typedef struct {
@@ -43,7 +40,7 @@ typedef struct { 
		unsigned long u_regs[16]; /* globals and ins */

	}		si_regs;

	int		si_mask;

} __siginfo_t;

} __siginfo32_t;



typedef struct {

	unsigned   long si_float_regs [32];

arch/sparc/include/asm/thread_info_32.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct thread_info { 
	/* A place to store user windows and stack pointers

	 * when the stack needs inspection.

	 */

	struct reg_window	reg_window[NSWINS];	/* align for ldd! */

	struct reg_window32	reg_window[NSWINS];	/* align for ldd! */

	unsigned long		rwbuf_stkptrs[NSWINS];

	unsigned long		w_saved;

arch/sparc/kernel/kgdb_32.c

+6 −6
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ extern unsigned long trapbase; 


void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)

{

	struct reg_window *win;

	struct reg_window32 *win;

	int i;



	gdb_regs[GDB_G0] = 0;

	for (i = 0; i < 15; i++)

		gdb_regs[GDB_G1 + i] = regs->u_regs[UREG_G1 + i];



	win = (struct reg_window *) regs->u_regs[UREG_FP];

	win = (struct reg_window32 *) regs->u_regs[UREG_FP];

	for (i = 0; i < 8; i++)

		gdb_regs[GDB_L0 + i] = win->locals[i];

	for (i = 0; i < 8; i++)
@@ -43,7 +43,7 @@ void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs) 
void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)

{

	struct thread_info *t = task_thread_info(p);

	struct reg_window *win;

	struct reg_window32 *win;

	int i;



	for (i = GDB_G0; i < GDB_G6; i++)
@@ -55,7 +55,7 @@ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p) 
	gdb_regs[GDB_SP] = t->ksp;

	gdb_regs[GDB_O7] = 0;



	win = (struct reg_window *) t->ksp;

	win = (struct reg_window32 *) t->ksp;

	for (i = 0; i < 8; i++)

		gdb_regs[GDB_L0 + i] = win->locals[i];

	for (i = 0; i < 8; i++)
@@ -77,7 +77,7 @@ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p) 


void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs)

{

	struct reg_window *win;

	struct reg_window32 *win;

	int i;



	for (i = 0; i < 15; i++)
@@ -96,7 +96,7 @@ void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs) 
	regs->npc = gdb_regs[GDB_NPC];

	regs->y = gdb_regs[GDB_Y];



	win = (struct reg_window *) regs->u_regs[UREG_FP];

	win = (struct reg_window32 *) regs->u_regs[UREG_FP];

	for (i = 0; i < 8; i++)

		win->locals[i] = gdb_regs[GDB_L0 + i];

	for (i = 0; i < 8; i++)