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

Commit 9d975ebd authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Thomas Gleixner
Browse files

i386: consolidate show_regs and show_registers for i386 



Both functions printk the same information, except for CRx and
debug registers in the show_registers() one and a bit different
manner. So move the common code into one place. This is already
done for x86_64, so I think it's worth having the same on i386.

This saves 100 bytes of .rodata section :) ...
   but only 8 from .text :(

[ tglx: arch/x86 adaptation ]

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 574a6042

arch/x86/kernel/process_32.c

+40 −16
Original line number Diff line number Diff line
@@ -295,34 +295,52 @@ static int __init idle_setup(char *str) 
}

early_param("idle", idle_setup);



void show_regs(struct pt_regs * regs)

void __show_registers(struct pt_regs *regs, int all)

{

	unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;

	unsigned long d0, d1, d2, d3, d6, d7;

	unsigned long esp;

	unsigned short ss, gs;



	printk("\n");

	printk("Pid: %d, comm: %20s\n", current->pid, current->comm);

	printk("EIP: %04x:[<%08lx>] CPU: %d\n",0xffff & regs->xcs,regs->eip, smp_processor_id());

	print_symbol("EIP is at %s\n", regs->eip);

	if (user_mode_vm(regs)) {

		esp = regs->esp;

		ss = regs->xss & 0xffff;

		savesegment(gs, gs);

	} else {

		esp = (unsigned long) (&regs->esp);

		savesegment(ss, ss);

		savesegment(gs, gs);

	}



	if (user_mode_vm(regs))

		printk(" ESP: %04x:%08lx",0xffff & regs->xss,regs->esp);

	printk(" EFLAGS: %08lx    %s  (%s %.*s)\n",

	       regs->eflags, print_tainted(), init_utsname()->release,

	printk("\n");

	printk("Pid: %d, comm: %.*s %s (%s %.*s)\n",

			current->pid, TASK_COMM_LEN, current->comm,

			print_tainted(), init_utsname()->release,

			(int)strcspn(init_utsname()->version, " "),

			init_utsname()->version);



	printk("EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",

			0xffff & regs->xcs, regs->eip, regs->eflags,

			smp_processor_id());

	print_symbol("EIP is at %s\n", regs->eip);



	printk("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",

		regs->eax, regs->ebx, regs->ecx, regs->edx);

	printk("ESI: %08lx EDI: %08lx EBP: %08lx",

		regs->esi, regs->edi, regs->ebp);

	printk(" DS: %04x ES: %04x FS: %04x\n",

	       0xffff & regs->xds,0xffff & regs->xes, 0xffff & regs->xfs);

	printk("ESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n",

		regs->esi, regs->edi, regs->ebp, esp);

	printk(" DS: %04x ES: %04x FS: %04x GS: %04x SS: %04x\n",

	       regs->xds & 0xffff, regs->xes & 0xffff,

	       regs->xfs & 0xffff, gs, ss);



	if (!all)

		return;



	cr0 = read_cr0();

	cr2 = read_cr2();

	cr3 = read_cr3();

	cr4 = read_cr4_safe();

	printk("CR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n", cr0, cr2, cr3, cr4);

	printk("CR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n",

			cr0, cr2, cr3, cr4);



	get_debugreg(d0, 0);

	get_debugreg(d1, 1);
@@ -330,10 +348,16 @@ void show_regs(struct pt_regs * regs) 
	get_debugreg(d3, 3);

	printk("DR0: %08lx DR1: %08lx DR2: %08lx DR3: %08lx\n",

			d0, d1, d2, d3);



	get_debugreg(d6, 6);

	get_debugreg(d7, 7);

	printk("DR6: %08lx DR7: %08lx\n", d6, d7);

	printk("DR6: %08lx DR7: %08lx\n",

			d6, d7);

}



void show_regs(struct pt_regs *regs)

{

	__show_registers(regs, 1);

	show_trace(NULL, regs, &regs->esp);

}

arch/x86/kernel/traps_32.c

+4 −28
Original line number Diff line number Diff line
@@ -288,33 +288,9 @@ EXPORT_SYMBOL(dump_stack); 
void show_registers(struct pt_regs *regs)

{

	int i;

	int in_kernel = 1;

	unsigned long esp;

	unsigned short ss, gs;



	esp = (unsigned long) (&regs->esp);

	savesegment(ss, ss);

	savesegment(gs, gs);

	if (user_mode_vm(regs)) {

		in_kernel = 0;

		esp = regs->esp;

		ss = regs->xss & 0xffff;

	}

	print_modules();

	printk(KERN_EMERG "CPU:    %d\n"

		KERN_EMERG "EIP:    %04x:[<%08lx>]    %s VLI\n"

		KERN_EMERG "EFLAGS: %08lx   (%s %.*s)\n",

		smp_processor_id(), 0xffff & regs->xcs, regs->eip,

		print_tainted(), regs->eflags, init_utsname()->release,

		(int)strcspn(init_utsname()->version, " "),

		init_utsname()->version);

	print_symbol(KERN_EMERG "EIP is at %s\n", regs->eip);

	printk(KERN_EMERG "eax: %08lx   ebx: %08lx   ecx: %08lx   edx: %08lx\n",

		regs->eax, regs->ebx, regs->ecx, regs->edx);

	printk(KERN_EMERG "esi: %08lx   edi: %08lx   ebp: %08lx   esp: %08lx\n",

		regs->esi, regs->edi, regs->ebp, esp);

	printk(KERN_EMERG "ds: %04x   es: %04x   fs: %04x  gs: %04x  ss: %04x\n",

	       regs->xds & 0xffff, regs->xes & 0xffff, regs->xfs & 0xffff, gs, ss);

	__show_registers(regs, 0);

	printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",

		TASK_COMM_LEN, current->comm, current->pid,

		current_thread_info(), current, task_thread_info(current));
@@ -322,14 +298,14 @@ void show_registers(struct pt_regs *regs) 
	 * When in-kernel, we also print out the stack and code at the

	 * time of the fault..

	 */

	if (in_kernel) {

	if (!user_mode_vm(regs)) {

		u8 *eip;

		unsigned int code_prologue = code_bytes * 43 / 64;

		unsigned int code_len = code_bytes;

		unsigned char c;



		printk("\n" KERN_EMERG "Stack: ");

		show_stack_log_lvl(NULL, regs, (unsigned long *)esp, KERN_EMERG);

		show_stack_log_lvl(NULL, regs, &regs->esp, KERN_EMERG);



		printk(KERN_EMERG "Code: ");

include/asm-x86/system_32.h

+1 −0
Original line number Diff line number Diff line
@@ -315,5 +315,6 @@ extern unsigned long arch_align_stack(unsigned long sp); 
extern void free_init_pages(char *what, unsigned long begin, unsigned long end);



void default_idle(void);

void __show_registers(struct pt_regs *, int all);



#endif