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

Commit a007b1f1 authored by Franck Bui-Huu's avatar Franck Bui-Huu Committed by Ralf Baechle
Browse files

[MIPS] signals: reduce {setup,restore}_sigcontext sizes 



This trivial change reduces considerably code size of these
2 functions callers. For instance, here is the figures for
arch/kernel/signal.o objects:

   text    data     bss     dec     hex filename
  11972       0       0   11972    2ec4 arch/mips/kernel/signal.o~old
   5380       0       0    5380    1504 arch/mips/kernel/signal.o~new

Signed-off-by: default avatarFranck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 4ed3a77f

arch/mips/kernel/signal-common.h

+21 −45
Original line number Original line Diff line number Diff line
@@ -13,22 +13,13 @@ static inline int 
setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)

setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)

{

{

	int err = 0;

	int err = 0;

	int i;





	err |= __put_user(regs->cp0_epc, &sc->sc_pc);

	err |= __put_user(regs->cp0_epc, &sc->sc_pc);





#define save_gp_reg(i) do {						\

	err |= __put_user(0, &sc->sc_regs[0]);

	err |= __put_user(regs->regs[i], &sc->sc_regs[i]);		\

	for (i = 1; i < 32; i++)

} while(0)

		err |= __put_user(regs->regs[i], &sc->sc_regs[i]);

	__put_user(0, &sc->sc_regs[0]); save_gp_reg(1); save_gp_reg(2);

	save_gp_reg(3); save_gp_reg(4); save_gp_reg(5); save_gp_reg(6);

	save_gp_reg(7); save_gp_reg(8); save_gp_reg(9); save_gp_reg(10);

	save_gp_reg(11); save_gp_reg(12); save_gp_reg(13); save_gp_reg(14);

	save_gp_reg(15); save_gp_reg(16); save_gp_reg(17); save_gp_reg(18);

	save_gp_reg(19); save_gp_reg(20); save_gp_reg(21); save_gp_reg(22);

	save_gp_reg(23); save_gp_reg(24); save_gp_reg(25); save_gp_reg(26);

	save_gp_reg(27); save_gp_reg(28); save_gp_reg(29); save_gp_reg(30);

	save_gp_reg(31);

#undef save_gp_reg





	err |= __put_user(regs->hi, &sc->sc_mdhi);

	err |= __put_user(regs->hi, &sc->sc_mdhi);

	err |= __put_user(regs->lo, &sc->sc_mdlo);

	err |= __put_user(regs->lo, &sc->sc_mdlo);
@@ -44,12 +35,10 @@ setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) 




	err |= __put_user(!!used_math(), &sc->sc_used_math);

	err |= __put_user(!!used_math(), &sc->sc_used_math);





	if (!used_math())

	if (used_math()) {

		goto out;



		/*

		/*

	 * Save FPU state to signal context.  Signal handler will "inherit"

		 * Save FPU state to signal context.  Signal handler

	 * current FPU state.

		 * will "inherit" current FPU state.

		 */

		 */

		preempt_disable();

		preempt_disable();
@@ -60,8 +49,7 @@ setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) 
		err |= save_fp_context(sc);

		err |= save_fp_context(sc);





		preempt_enable();

		preempt_enable();



	}

out:

	return err;

	return err;

}

}
@@ -71,6 +59,7 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) 
	unsigned int used_math;

	unsigned int used_math;

	unsigned long treg;

	unsigned long treg;

	int err = 0;

	int err = 0;

	int i;





	/* Always make any pending restarted system calls return -EINTR */

	/* Always make any pending restarted system calls return -EINTR */

	current_thread_info()->restart_block.fn = do_no_restart_syscall;

	current_thread_info()->restart_block.fn = do_no_restart_syscall;
@@ -88,21 +77,8 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) 
		err |= __get_user(treg, &sc->sc_dsp); wrdsp(treg, DSP_MASK);

		err |= __get_user(treg, &sc->sc_dsp); wrdsp(treg, DSP_MASK);

	}

	}





#define restore_gp_reg(i) do {						\

	for (i = 1; i < 32; i++)

	err |= __get_user(regs->regs[i], &sc->sc_regs[i]);		\

		err |= __get_user(regs->regs[i], &sc->sc_regs[i]);

} while(0)

	restore_gp_reg( 1); restore_gp_reg( 2); restore_gp_reg( 3);

	restore_gp_reg( 4); restore_gp_reg( 5); restore_gp_reg( 6);

	restore_gp_reg( 7); restore_gp_reg( 8); restore_gp_reg( 9);

	restore_gp_reg(10); restore_gp_reg(11); restore_gp_reg(12);

	restore_gp_reg(13); restore_gp_reg(14); restore_gp_reg(15);

	restore_gp_reg(16); restore_gp_reg(17); restore_gp_reg(18);

	restore_gp_reg(19); restore_gp_reg(20); restore_gp_reg(21);

	restore_gp_reg(22); restore_gp_reg(23); restore_gp_reg(24);

	restore_gp_reg(25); restore_gp_reg(26); restore_gp_reg(27);

	restore_gp_reg(28); restore_gp_reg(29); restore_gp_reg(30);

	restore_gp_reg(31);

#undef restore_gp_reg





	err |= __get_user(used_math, &sc->sc_used_math);

	err |= __get_user(used_math, &sc->sc_used_math);

	conditional_used_math(used_math);

	conditional_used_math(used_math);