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

Commit 08c941bf authored by Marcin Nowakowski's avatar Marcin Nowakowski Committed by Ralf Baechle
Browse files

MIPS: Move register dump routines out of ptrace code 



Current register dump methods for MIPS are implemented inside ptrace
methods, but there will be other uses in the kernel for them, so keep
them separately in process.c and use those definitions for ptrace
instead.

Signed-off-by: default avatarMarcin Nowakowski <marcin.nowakowski@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14587/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent bff323d5

arch/mips/include/asm/elf.h

+3 −0
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG]; 
typedef double elf_fpreg_t;

typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];



void mips_dump_regs32(u32 *uregs, const struct pt_regs *regs);

void mips_dump_regs64(u64 *uregs, const struct pt_regs *regs);



#ifdef CONFIG_32BIT

/*

 * This is used to ensure we don't load something for the wrong architecture.

arch/mips/kernel/process.c

+44 −0
Original line number Diff line number Diff line
@@ -729,3 +729,47 @@ int mips_set_process_fp_mode(struct task_struct *task, unsigned int value) 


	return 0;

}



#if defined(CONFIG_32BIT) || defined(CONFIG_MIPS32_O32)

void mips_dump_regs32(u32 *uregs, const struct pt_regs *regs)

{

	unsigned int i;



	for (i = MIPS32_EF_R1; i <= MIPS32_EF_R31; i++) {

		/* k0/k1 are copied as zero. */

		if (i == MIPS32_EF_R26 || i == MIPS32_EF_R27)

			uregs[i] = 0;

		else

			uregs[i] = regs->regs[i - MIPS32_EF_R0];

	}



	uregs[MIPS32_EF_LO] = regs->lo;

	uregs[MIPS32_EF_HI] = regs->hi;

	uregs[MIPS32_EF_CP0_EPC] = regs->cp0_epc;

	uregs[MIPS32_EF_CP0_BADVADDR] = regs->cp0_badvaddr;

	uregs[MIPS32_EF_CP0_STATUS] = regs->cp0_status;

	uregs[MIPS32_EF_CP0_CAUSE] = regs->cp0_cause;

}

#endif /* CONFIG_32BIT || CONFIG_MIPS32_O32 */



#ifdef CONFIG_64BIT

void mips_dump_regs64(u64 *uregs, const struct pt_regs *regs)

{

	unsigned int i;



	for (i = MIPS64_EF_R1; i <= MIPS64_EF_R31; i++) {

		/* k0/k1 are copied as zero. */

		if (i == MIPS64_EF_R26 || i == MIPS64_EF_R27)

			uregs[i] = 0;

		else

			uregs[i] = regs->regs[i - MIPS64_EF_R0];

	}



	uregs[MIPS64_EF_LO] = regs->lo;

	uregs[MIPS64_EF_HI] = regs->hi;

	uregs[MIPS64_EF_CP0_EPC] = regs->cp0_epc;

	uregs[MIPS64_EF_CP0_BADVADDR] = regs->cp0_badvaddr;

	uregs[MIPS64_EF_CP0_STATUS] = regs->cp0_status;

	uregs[MIPS64_EF_CP0_CAUSE] = regs->cp0_cause;

}

#endif /* CONFIG_64BIT */

arch/mips/kernel/ptrace.c

+2 −32
Original line number Diff line number Diff line
@@ -294,23 +294,8 @@ static int gpr32_get(struct task_struct *target, 
{

	struct pt_regs *regs = task_pt_regs(target);

	u32 uregs[ELF_NGREG] = {};

	unsigned i;



	for (i = MIPS32_EF_R1; i <= MIPS32_EF_R31; i++) {

		/* k0/k1 are copied as zero. */

		if (i == MIPS32_EF_R26 || i == MIPS32_EF_R27)

			continue;



		uregs[i] = regs->regs[i - MIPS32_EF_R0];

	}



	uregs[MIPS32_EF_LO] = regs->lo;

	uregs[MIPS32_EF_HI] = regs->hi;

	uregs[MIPS32_EF_CP0_EPC] = regs->cp0_epc;

	uregs[MIPS32_EF_CP0_BADVADDR] = regs->cp0_badvaddr;

	uregs[MIPS32_EF_CP0_STATUS] = regs->cp0_status;

	uregs[MIPS32_EF_CP0_CAUSE] = regs->cp0_cause;



	mips_dump_regs32(uregs, regs);

	return user_regset_copyout(&pos, &count, &kbuf, &ubuf, uregs, 0,

				   sizeof(uregs));

}
@@ -373,23 +358,8 @@ static int gpr64_get(struct task_struct *target, 
{

	struct pt_regs *regs = task_pt_regs(target);

	u64 uregs[ELF_NGREG] = {};

	unsigned i;



	for (i = MIPS64_EF_R1; i <= MIPS64_EF_R31; i++) {

		/* k0/k1 are copied as zero. */

		if (i == MIPS64_EF_R26 || i == MIPS64_EF_R27)

			continue;



		uregs[i] = regs->regs[i - MIPS64_EF_R0];

	}



	uregs[MIPS64_EF_LO] = regs->lo;

	uregs[MIPS64_EF_HI] = regs->hi;

	uregs[MIPS64_EF_CP0_EPC] = regs->cp0_epc;

	uregs[MIPS64_EF_CP0_BADVADDR] = regs->cp0_badvaddr;

	uregs[MIPS64_EF_CP0_STATUS] = regs->cp0_status;

	uregs[MIPS64_EF_CP0_CAUSE] = regs->cp0_cause;



	mips_dump_regs64(uregs, regs);

	return user_regset_copyout(&pos, &count, &kbuf, &ubuf, uregs, 0,

				   sizeof(uregs));

}