uninline i386 do_traps()
PATCH 1/1 uninline i386 do_traps()
Change do_trap() to be a single table-driven function instead of inlining it into many different fault handlers, saving about 1k of memory.
--
Brian Gerst
arch/i386/kernel/entry.S +59 -88
@@ -404,26 +404,55 @@ /* The include is where all of the SMP etc. interrupts come from */ #include "entry_arch.h" -ENTRY(divide_error) - pushl $0 # no error code - pushl $do_divide_error +#define TRAP(name,nr) \ +ENTRY(name) \ + pushl $0; \ + pushl $nr; \ + jmp error_code + +#define TRAP_CODE(name,nr) \ +ENTRY(name) \ + pushl $nr; \ + jmp error_code + +TRAP(divide_error,0) +TRAP(debug,1) +TRAP(int3,3) +TRAP(overflow,4) +TRAP(bounds,5) +TRAP(invalid_op,6) +TRAP_CODE(double_fault,8) +TRAP(coprocessor_segment_overrun,9) +TRAP_CODE(invalid_TSS,10) +TRAP_CODE(segment_not_present,11) +TRAP_CODE(stack_segment,12) +TRAP_CODE(general_protection,13) +TRAP_CODE(page_fault,14) +TRAP(spurious_interrupt_bug,15) +TRAP(coprocessor_error,16) +TRAP_CODE(alignment_check,17) +#ifdef CONFIG_X86_MCE +TRAP(machine_check,18) +#else +#define do_machine_check 0 +#endif +TRAP(simd_coprocessor_error,19) + ALIGN error_code: pushl %ds pushl %eax - xorl %eax, %eax pushl %ebp pushl %edi pushl %esi pushl %edx - decl %eax # eax = -1 pushl %ecx pushl %ebx cld movl %es, %ecx movl ORIG_EAX(%esp), %esi # get the error code - movl ES(%esp), %edi # get the function address - movl %eax, ORIG_EAX(%esp) + movl ES(%esp), %edi # get the trap number + movl %edi, ORIG_EAX(%esp) movl %ecx, ES(%esp) movl %esp, %edx pushl %esi # push the error code
@@ -431,20 +460,10 @@ movl $(__USER_DS), %edx movl %edx, %ds movl %edx, %es - call *%edi + call *trap_table(,%edi,4) addl $8, %esp jmp ret_from_exception -ENTRY(coprocessor_error) - pushl $0 - pushl $do_coprocessor_error - jmp error_code - -ENTRY(simd_coprocessor_error) - pushl $0 - pushl $do_simd_coprocessor_error - jmp error_code - ENTRY(device_not_available) pushl $-1 # mark this as an int SAVE_ALL
@@ -460,11 +479,6 @@ addl $4, %esp jmp ret_from_exception -ENTRY(debug) - pushl $0 - pushl $do_debug - jmp error_code - ENTRY(nmi) pushl %eax SAVE_ALL
@@ -475,72 +489,29 @@ addl $8, %esp RESTORE_ALL -ENTRY(int3) - pushl $0 - pushl $do_int3 - jmp error_code - -ENTRY(overflow) - pushl $0 - pushl $do_overflow - jmp error_code - -ENTRY(bounds) - pushl $0 - pushl $do_bounds - jmp error_code - -ENTRY(invalid_op) - pushl $0 - pushl $do_invalid_op - jmp error_code - -ENTRY(coprocessor_segment_overrun) - pushl $0 - pushl $do_coprocessor_segment_overrun - jmp error_code - -ENTRY(double_fault) - pushl $do_double_fault - jmp error_code - -ENTRY(invalid_TSS) - pushl $do_invalid_TSS - jmp error_code - -ENTRY(segment_not_present) - pushl $do_segment_not_present - jmp error_code - -ENTRY(stack_segment) - pushl $do_stack_segment - jmp error_code - -ENTRY(general_protection) - pushl $do_general_protection - jmp error_code - -ENTRY(alignment_check) - pushl $do_alignment_check - jmp error_code - -ENTRY(page_fault) - pushl $do_page_fault - jmp error_code - -#ifdef CONFIG_X86_MCE -ENTRY(machine_check) - pushl $0 - pushl $do_machine_check - jmp error_code -#endif - -ENTRY(spurious_interrupt_bug) - pushl $0 - pushl $do_spurious_interrupt_bug - jmp error_code - .data +ENTRY(trap_table) + .long do_trap /* divide */ + .long do_debug + .long 0 /* nmi */ + .long do_trap /* int3 */ + .long do_trap /* overflow */ + .long do_trap /* bounds */ + .long do_trap /* invalid op */ + .long 0 /* device not available */ + .long do_trap /* double fault */ + .long do_trap /* coprocessor segment */ + .long do_trap /* invalid TSS */ + .long do_trap /* segment not present */ + .long do_trap /* stack segment */ + .long do_trap /* general protection */ + .long do_page_fault + .long do_spurious_interrupt_bug + .long do_coprocessor_error + .long do_trap /* alignment check */ + .long do_machine_check + .long do_simd_coprocessor_error + ENTRY(sys_call_table) .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ .long sys_exit
arch/i386/kernel/traps.c +48 -100
189 lines not on this page · raw message
arch/i386/kernel/vm86.c +16 -0
@@ -502,6 +502,22 @@int handle_vm86_trap (struct kernel_vm86_regs * regs,long error_code,int trapno) { +switch (trapno) { +case 13 : +case 19 : +handle_vm86_fault (regs, error_code); +return 0 ; +case 0 : +case 1 : +case 3 : +case 4 : +case 5 : +case 7 : +break ; +default : +return 1 ; + }; +if (VMPI .is_vm86pus) {if ( (trapno==3 ) || (trapno==1 ) )return_to_32bit (regs,VM86_TRAP + (trapno <<8 ));
arch/i386/mm/fault.c +3 -2
@@ -136,7 +136,7 @@ console_loglevel = loglevel_save; } -asmlinkage void do_invalid_op(struct pt_regs *, unsigned long); +asmlinkage void do_trap(struct pt_regs *, unsigned long);/* * This routine handles page faults. It determines the address,
@@ -302,7 +302,8 @@ nr = (address - idt_descr.address) >>3 ;if (nr ==6 ) { -do_invalid_op (regs,0 ); + regs->orig_eax =6 ; +do_trap (regs,0 );return ; } }