i386: Rearrange Interupt Handling
In preperation for full relocation Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
This commit is contained in:
Graeme Russ
Wolfgang Denk
parent
27f13075a6
commit
564a9984bd
|
|
@ -29,7 +29,7 @@ include $(TOPDIR)/config.mk
|
|||
LIB = $(obj)lib$(CPU).a
|
||||
|
||||
START = start.o start16.o resetvec.o
|
||||
COBJS = serial.o interrupts.o exceptions.o cpu.o
|
||||
COBJS = serial.o interrupts.o cpu.o
|
||||
|
||||
SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
||||
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ int cpu_init(void)
|
|||
|
||||
/* Initialize core interrupt and exception functionality of CPU */
|
||||
cpu_init_interrupts ();
|
||||
cpu_init_exceptions ();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,229 +0,0 @@
|
|||
/*
|
||||
* (C) Copyright 2002
|
||||
* Daniel Engström, Omicron Ceti AB, daniel@omicron.se.
|
||||
*
|
||||
* See file CREDITS for list of people who contributed to this
|
||||
* project.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
* MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <asm/interrupt.h>
|
||||
|
||||
asm (".globl exp_return\n"
|
||||
"exp_return:\n"
|
||||
" addl $12, %esp\n"
|
||||
" pop %esp\n"
|
||||
" popa\n"
|
||||
" iret\n");
|
||||
|
||||
char exception_stack[4096];
|
||||
|
||||
/*
|
||||
* For detailed description of each exception, refer to:
|
||||
* Intel® 64 and IA-32 Architectures Software Developer's Manual
|
||||
* Volume 1: Basic Architecture
|
||||
* Order Number: 253665-029US, November 2008
|
||||
* Table 6-1. Exceptions and Interrupts
|
||||
*/
|
||||
DECLARE_EXCEPTION(0, divide_error_entry);
|
||||
DECLARE_EXCEPTION(1, debug_entry);
|
||||
DECLARE_EXCEPTION(2, nmi_interrupt_entry);
|
||||
DECLARE_EXCEPTION(3, breakpoint_entry);
|
||||
DECLARE_EXCEPTION(4, overflow_entry);
|
||||
DECLARE_EXCEPTION(5, bound_range_exceeded_entry);
|
||||
DECLARE_EXCEPTION(6, invalid_opcode_entry);
|
||||
DECLARE_EXCEPTION(7, device_not_available_entry);
|
||||
DECLARE_EXCEPTION(8, double_fault_entry);
|
||||
DECLARE_EXCEPTION(9, coprocessor_segment_overrun_entry);
|
||||
DECLARE_EXCEPTION(10, invalid_tss_entry);
|
||||
DECLARE_EXCEPTION(11, segment_not_present_entry);
|
||||
DECLARE_EXCEPTION(12, stack_segment_fault_entry);
|
||||
DECLARE_EXCEPTION(13, general_protection_entry);
|
||||
DECLARE_EXCEPTION(14, page_fault_entry);
|
||||
DECLARE_EXCEPTION(15, reserved_exception_entry);
|
||||
DECLARE_EXCEPTION(16, floating_point_error_entry);
|
||||
DECLARE_EXCEPTION(17, alignment_check_entry);
|
||||
DECLARE_EXCEPTION(18, machine_check_entry);
|
||||
DECLARE_EXCEPTION(19, simd_floating_point_exception_entry);
|
||||
DECLARE_EXCEPTION(20, reserved_exception_entry);
|
||||
DECLARE_EXCEPTION(21, reserved_exception_entry);
|
||||
DECLARE_EXCEPTION(22, reserved_exception_entry);
|
||||
DECLARE_EXCEPTION(23, reserved_exception_entry);
|
||||
DECLARE_EXCEPTION(24, reserved_exception_entry);
|
||||
DECLARE_EXCEPTION(25, reserved_exception_entry);
|
||||
DECLARE_EXCEPTION(26, reserved_exception_entry);
|
||||
DECLARE_EXCEPTION(27, reserved_exception_entry);
|
||||
DECLARE_EXCEPTION(28, reserved_exception_entry);
|
||||
DECLARE_EXCEPTION(29, reserved_exception_entry);
|
||||
DECLARE_EXCEPTION(30, reserved_exception_entry);
|
||||
DECLARE_EXCEPTION(31, reserved_exception_entry);
|
||||
|
||||
__isr__ reserved_exception_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Reserved Exception %d at %04x:%08x\n", cause, seg, ip);
|
||||
}
|
||||
|
||||
__isr__ divide_error_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Divide Error (Division by zero) at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
}
|
||||
|
||||
__isr__ debug_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Debug Interrupt (Single step) at %04x:%08x\n", seg, ip);
|
||||
}
|
||||
|
||||
__isr__ nmi_interrupt_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("NMI Interrupt at %04x:%08x\n", seg, ip);
|
||||
}
|
||||
|
||||
__isr__ breakpoint_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Breakpoint at %04x:%08x\n", seg, ip);
|
||||
}
|
||||
|
||||
__isr__ overflow_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Overflow at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
}
|
||||
|
||||
__isr__ bound_range_exceeded_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("BOUND Range Exceeded at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
}
|
||||
|
||||
__isr__ invalid_opcode_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Invalid Opcode (UnDefined Opcode) at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
}
|
||||
|
||||
__isr__ device_not_available_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Device Not Available (No Math Coprocessor) at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
}
|
||||
|
||||
__isr__ double_fault_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Double fault at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
}
|
||||
|
||||
__isr__ coprocessor_segment_overrun_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Co-processor segment overrun at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
}
|
||||
|
||||
__isr__ invalid_tss_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Invalid TSS at %04x:%08x\n", seg, ip);
|
||||
}
|
||||
|
||||
__isr__ segment_not_present_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Segment Not Present at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
}
|
||||
|
||||
__isr__ stack_segment_fault_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Stack Segment Fault at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
}
|
||||
|
||||
__isr__ general_protection_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("General Protection at %04x:%08x\n", seg, ip);
|
||||
}
|
||||
|
||||
__isr__ page_fault_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Page fault at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
}
|
||||
|
||||
__isr__ floating_point_error_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Floating-Point Error (Math Fault) at %04x:%08x\n", seg, ip);
|
||||
}
|
||||
|
||||
__isr__ alignment_check_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Alignment check at %04x:%08x\n", seg, ip);
|
||||
}
|
||||
|
||||
__isr__ machine_check_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("Machine Check at %04x:%08x\n", seg, ip);
|
||||
}
|
||||
|
||||
__isr__ simd_floating_point_exception_entry(int cause, int ip, int seg)
|
||||
{
|
||||
printf("SIMD Floating-Point Exception at %04x:%08x\n", seg, ip);
|
||||
}
|
||||
|
||||
int cpu_init_exceptions(void)
|
||||
{
|
||||
/* Just in case... */
|
||||
disable_interrupts();
|
||||
|
||||
/* Setup exceptions */
|
||||
set_vector(0x00, exp_0);
|
||||
set_vector(0x01, exp_1);
|
||||
set_vector(0x02, exp_2);
|
||||
set_vector(0x03, exp_3);
|
||||
set_vector(0x04, exp_4);
|
||||
set_vector(0x05, exp_5);
|
||||
set_vector(0x06, exp_6);
|
||||
set_vector(0x07, exp_7);
|
||||
set_vector(0x08, exp_8);
|
||||
set_vector(0x09, exp_9);
|
||||
set_vector(0x0a, exp_10);
|
||||
set_vector(0x0b, exp_11);
|
||||
set_vector(0x0c, exp_12);
|
||||
set_vector(0x0d, exp_13);
|
||||
set_vector(0x0e, exp_14);
|
||||
set_vector(0x0f, exp_15);
|
||||
set_vector(0x10, exp_16);
|
||||
set_vector(0x11, exp_17);
|
||||
set_vector(0x12, exp_18);
|
||||
set_vector(0x13, exp_19);
|
||||
set_vector(0x14, exp_20);
|
||||
set_vector(0x15, exp_21);
|
||||
set_vector(0x16, exp_22);
|
||||
set_vector(0x17, exp_23);
|
||||
set_vector(0x18, exp_24);
|
||||
set_vector(0x19, exp_25);
|
||||
set_vector(0x1a, exp_26);
|
||||
set_vector(0x1b, exp_27);
|
||||
set_vector(0x1c, exp_28);
|
||||
set_vector(0x1d, exp_29);
|
||||
set_vector(0x1e, exp_30);
|
||||
set_vector(0x1f, exp_31);
|
||||
|
||||
/* It is now safe to enable interrupts */
|
||||
enable_interrupts();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,4 +1,7 @@
|
|||
/*
|
||||
* (C) Copyright 2008
|
||||
* Graeme Russ, graeme.russ@gmail.com.
|
||||
*
|
||||
* (C) Copyright 2002
|
||||
* Daniel Engström, Omicron Ceti AB, daniel@omicron.se.
|
||||
*
|
||||
|
|
@ -24,6 +27,14 @@
|
|||
#include <common.h>
|
||||
#include <asm/interrupt.h>
|
||||
|
||||
#define DECLARE_INTERRUPT(x) \
|
||||
".globl irq_"#x"\n" \
|
||||
"irq_"#x":\n" \
|
||||
"pushl %ebp\n" \
|
||||
"movl %esp,%ebp\n" \
|
||||
"pusha\n" \
|
||||
"pushl $"#x"\n" \
|
||||
"jmp irq_common_entry\n"
|
||||
|
||||
struct idt_entry {
|
||||
u16 base_low;
|
||||
|
|
@ -33,23 +44,20 @@ struct idt_entry {
|
|||
u16 base_high;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct desc_ptr {
|
||||
unsigned short size;
|
||||
unsigned long address;
|
||||
unsigned short segment;
|
||||
} __attribute__((packed));
|
||||
|
||||
struct idt_entry idt[256];
|
||||
|
||||
struct desc_ptr idt_ptr;
|
||||
|
||||
asm (".globl irq_return\n"
|
||||
"irq_return:\n"
|
||||
" addl $4, %esp\n"
|
||||
" popa\n"
|
||||
" iret\n");
|
||||
|
||||
void __attribute__ ((regparm(0))) default_isr(void);
|
||||
asm ("default_isr: iret\n");
|
||||
|
||||
asm ("idt_ptr:\n"
|
||||
".word 0x800\n" /* size of the table 8*256 bytes */
|
||||
".long idt\n" /* offset */
|
||||
".word 0x18\n");/* data segment */
|
||||
static inline void load_idt(const struct desc_ptr *dtr)
|
||||
{
|
||||
asm volatile("cs lidt %0"::"m" (*dtr));
|
||||
}
|
||||
|
||||
void set_vector(u8 intnum, void *routine)
|
||||
{
|
||||
|
|
@ -57,11 +65,16 @@ void set_vector(u8 intnum, void *routine)
|
|||
idt[intnum].base_low = (u16)((u32)(routine + gd->reloc_off) & 0xffff);
|
||||
}
|
||||
|
||||
void irq_0(void);
|
||||
void irq_1(void);
|
||||
|
||||
int cpu_init_interrupts(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
int irq_entry_size = irq_1 - irq_0;
|
||||
void *irq_entry = (void *)irq_0;
|
||||
|
||||
/* Just in case... */
|
||||
disable_interrupts();
|
||||
|
||||
|
|
@ -70,10 +83,15 @@ int cpu_init_interrupts(void)
|
|||
idt[i].access = 0x8e;
|
||||
idt[i].res = 0;
|
||||
idt[i].selector = 0x10;
|
||||
set_vector(i, default_isr);
|
||||
set_vector(i, irq_entry);
|
||||
irq_entry += irq_entry_size;
|
||||
}
|
||||
|
||||
asm ("cs lidt idt_ptr\n");
|
||||
idt_ptr.size = 256 * 8;
|
||||
idt_ptr.address = (unsigned long) idt;
|
||||
idt_ptr.segment = 0x18;
|
||||
|
||||
load_idt(&idt_ptr);
|
||||
|
||||
/* It is now safe to enable interrupts */
|
||||
enable_interrupts();
|
||||
|
|
@ -81,6 +99,12 @@ int cpu_init_interrupts(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void __do_irq(int irq)
|
||||
{
|
||||
printf("Unhandled IRQ : %d\n", irq);
|
||||
}
|
||||
void do_irq(int irq) __attribute__((weak, alias("__do_irq")));
|
||||
|
||||
void enable_interrupts(void)
|
||||
{
|
||||
asm("sti\n");
|
||||
|
|
@ -94,3 +118,380 @@ int disable_interrupts(void)
|
|||
|
||||
return (flags&0x200); /* IE flags is bit 9 */
|
||||
}
|
||||
|
||||
/* IRQ Low-Level Service Routine */
|
||||
__isr__ irq_llsr(int ip, int seg, int irq)
|
||||
{
|
||||
/*
|
||||
* For detailed description of each exception, refer to:
|
||||
* Intel® 64 and IA-32 Architectures Software Developer's Manual
|
||||
* Volume 1: Basic Architecture
|
||||
* Order Number: 253665-029US, November 2008
|
||||
* Table 6-1. Exceptions and Interrupts
|
||||
*/
|
||||
switch (irq) {
|
||||
case 0x00:
|
||||
printf("Divide Error (Division by zero) at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
break;
|
||||
case 0x01:
|
||||
printf("Debug Interrupt (Single step) at %04x:%08x\n", seg, ip);
|
||||
break;
|
||||
case 0x02:
|
||||
printf("NMI Interrupt at %04x:%08x\n", seg, ip);
|
||||
break;
|
||||
case 0x03:
|
||||
printf("Breakpoint at %04x:%08x\n", seg, ip);
|
||||
break;
|
||||
case 0x04:
|
||||
printf("Overflow at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
break;
|
||||
case 0x05:
|
||||
printf("BOUND Range Exceeded at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
break;
|
||||
case 0x06:
|
||||
printf("Invalid Opcode (UnDefined Opcode) at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
break;
|
||||
case 0x07:
|
||||
printf("Device Not Available (No Math Coprocessor) at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
break;
|
||||
case 0x08:
|
||||
printf("Double fault at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
break;
|
||||
case 0x09:
|
||||
printf("Co-processor segment overrun at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
break;
|
||||
case 0x0a:
|
||||
printf("Invalid TSS at %04x:%08x\n", seg, ip);
|
||||
break;
|
||||
case 0x0b:
|
||||
printf("Segment Not Present at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
break;
|
||||
case 0x0c:
|
||||
printf("Stack Segment Fault at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
break;
|
||||
case 0x0d:
|
||||
printf("General Protection at %04x:%08x\n", seg, ip);
|
||||
break;
|
||||
case 0x0e:
|
||||
printf("Page fault at %04x:%08x\n", seg, ip);
|
||||
while(1);
|
||||
break;
|
||||
case 0x0f:
|
||||
printf("Floating-Point Error (Math Fault) at %04x:%08x\n", seg, ip);
|
||||
break;
|
||||
case 0x10:
|
||||
printf("Alignment check at %04x:%08x\n", seg, ip);
|
||||
break;
|
||||
case 0x11:
|
||||
printf("Machine Check at %04x:%08x\n", seg, ip);
|
||||
break;
|
||||
case 0x12:
|
||||
printf("SIMD Floating-Point Exception at %04x:%08x\n", seg, ip);
|
||||
break;
|
||||
case 0x13:
|
||||
case 0x14:
|
||||
case 0x15:
|
||||
case 0x16:
|
||||
case 0x17:
|
||||
case 0x18:
|
||||
case 0x19:
|
||||
case 0x1a:
|
||||
case 0x1b:
|
||||
case 0x1c:
|
||||
case 0x1d:
|
||||
case 0x1e:
|
||||
case 0x1f:
|
||||
printf("Reserved Exception %d at %04x:%08x\n", irq, seg, ip);
|
||||
break;
|
||||
|
||||
default:
|
||||
/* Hardware or User IRQ */
|
||||
do_irq(irq);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* OK - This looks really horrible, but it serves a purpose - It helps create
|
||||
* fully relocatable code.
|
||||
* - The call to irq_llsr will be a relative jump
|
||||
* - The IRQ entries will be guaranteed to be in order
|
||||
* It's a bit annoying that we need to waste 3 bytes per interrupt entry
|
||||
* (total of 768 code bytes), but we MUST create a Stack Frame and this is
|
||||
* the easiest way I could do it. Maybe it can be made better later.
|
||||
*/
|
||||
asm(".globl irq_common_entry\n" \
|
||||
"irq_common_entry:\n" \
|
||||
"pushl $0\n" \
|
||||
"pushl $0\n" \
|
||||
"call irq_llsr\n" \
|
||||
"popl %eax\n" \
|
||||
"popl %eax\n" \
|
||||
"popl %eax\n" \
|
||||
"popa\n" \
|
||||
"leave\n"\
|
||||
"iret\n" \
|
||||
DECLARE_INTERRUPT(0) \
|
||||
DECLARE_INTERRUPT(1) \
|
||||
DECLARE_INTERRUPT(2) \
|
||||
DECLARE_INTERRUPT(3) \
|
||||
DECLARE_INTERRUPT(4) \
|
||||
DECLARE_INTERRUPT(5) \
|
||||
DECLARE_INTERRUPT(6) \
|
||||
DECLARE_INTERRUPT(7) \
|
||||
DECLARE_INTERRUPT(8) \
|
||||
DECLARE_INTERRUPT(9) \
|
||||
DECLARE_INTERRUPT(10) \
|
||||
DECLARE_INTERRUPT(11) \
|
||||
DECLARE_INTERRUPT(12) \
|
||||
DECLARE_INTERRUPT(13) \
|
||||
DECLARE_INTERRUPT(14) \
|
||||
DECLARE_INTERRUPT(15) \
|
||||
DECLARE_INTERRUPT(16) \
|
||||
DECLARE_INTERRUPT(17) \
|
||||
DECLARE_INTERRUPT(18) \
|
||||
DECLARE_INTERRUPT(19) \
|
||||
DECLARE_INTERRUPT(20) \
|
||||
DECLARE_INTERRUPT(21) \
|
||||
DECLARE_INTERRUPT(22) \
|
||||
DECLARE_INTERRUPT(23) \
|
||||
DECLARE_INTERRUPT(24) \
|
||||
DECLARE_INTERRUPT(25) \
|
||||
DECLARE_INTERRUPT(26) \
|
||||
DECLARE_INTERRUPT(27) \
|
||||
DECLARE_INTERRUPT(28) \
|
||||
DECLARE_INTERRUPT(29) \
|
||||
DECLARE_INTERRUPT(30) \
|
||||
DECLARE_INTERRUPT(31) \
|
||||
DECLARE_INTERRUPT(32) \
|
||||
DECLARE_INTERRUPT(33) \
|
||||
DECLARE_INTERRUPT(34) \
|
||||
DECLARE_INTERRUPT(35) \
|
||||
DECLARE_INTERRUPT(36) \
|
||||
DECLARE_INTERRUPT(37) \
|
||||
DECLARE_INTERRUPT(38) \
|
||||
DECLARE_INTERRUPT(39) \
|
||||
DECLARE_INTERRUPT(40) \
|
||||
DECLARE_INTERRUPT(41) \
|
||||
DECLARE_INTERRUPT(42) \
|
||||
DECLARE_INTERRUPT(43) \
|
||||
DECLARE_INTERRUPT(44) \
|
||||
DECLARE_INTERRUPT(45) \
|
||||
DECLARE_INTERRUPT(46) \
|
||||
DECLARE_INTERRUPT(47) \
|
||||
DECLARE_INTERRUPT(48) \
|
||||
DECLARE_INTERRUPT(49) \
|
||||
DECLARE_INTERRUPT(50) \
|
||||
DECLARE_INTERRUPT(51) \
|
||||
DECLARE_INTERRUPT(52) \
|
||||
DECLARE_INTERRUPT(53) \
|
||||
DECLARE_INTERRUPT(54) \
|
||||
DECLARE_INTERRUPT(55) \
|
||||
DECLARE_INTERRUPT(56) \
|
||||
DECLARE_INTERRUPT(57) \
|
||||
DECLARE_INTERRUPT(58) \
|
||||
DECLARE_INTERRUPT(59) \
|
||||
DECLARE_INTERRUPT(60) \
|
||||
DECLARE_INTERRUPT(61) \
|
||||
DECLARE_INTERRUPT(62) \
|
||||
DECLARE_INTERRUPT(63) \
|
||||
DECLARE_INTERRUPT(64) \
|
||||
DECLARE_INTERRUPT(65) \
|
||||
DECLARE_INTERRUPT(66) \
|
||||
DECLARE_INTERRUPT(67) \
|
||||
DECLARE_INTERRUPT(68) \
|
||||
DECLARE_INTERRUPT(69) \
|
||||
DECLARE_INTERRUPT(70) \
|
||||
DECLARE_INTERRUPT(71) \
|
||||
DECLARE_INTERRUPT(72) \
|
||||
DECLARE_INTERRUPT(73) \
|
||||
DECLARE_INTERRUPT(74) \
|
||||
DECLARE_INTERRUPT(75) \
|
||||
DECLARE_INTERRUPT(76) \
|
||||
DECLARE_INTERRUPT(77) \
|
||||
DECLARE_INTERRUPT(78) \
|
||||
DECLARE_INTERRUPT(79) \
|
||||
DECLARE_INTERRUPT(80) \
|
||||
DECLARE_INTERRUPT(81) \
|
||||
DECLARE_INTERRUPT(82) \
|
||||
DECLARE_INTERRUPT(83) \
|
||||
DECLARE_INTERRUPT(84) \
|
||||
DECLARE_INTERRUPT(85) \
|
||||
DECLARE_INTERRUPT(86) \
|
||||
DECLARE_INTERRUPT(87) \
|
||||
DECLARE_INTERRUPT(88) \
|
||||
DECLARE_INTERRUPT(89) \
|
||||
DECLARE_INTERRUPT(90) \
|
||||
DECLARE_INTERRUPT(91) \
|
||||
DECLARE_INTERRUPT(92) \
|
||||
DECLARE_INTERRUPT(93) \
|
||||
DECLARE_INTERRUPT(94) \
|
||||
DECLARE_INTERRUPT(95) \
|
||||
DECLARE_INTERRUPT(97) \
|
||||
DECLARE_INTERRUPT(96) \
|
||||
DECLARE_INTERRUPT(98) \
|
||||
DECLARE_INTERRUPT(99) \
|
||||
DECLARE_INTERRUPT(100) \
|
||||
DECLARE_INTERRUPT(101) \
|
||||
DECLARE_INTERRUPT(102) \
|
||||
DECLARE_INTERRUPT(103) \
|
||||
DECLARE_INTERRUPT(104) \
|
||||
DECLARE_INTERRUPT(105) \
|
||||
DECLARE_INTERRUPT(106) \
|
||||
DECLARE_INTERRUPT(107) \
|
||||
DECLARE_INTERRUPT(108) \
|
||||
DECLARE_INTERRUPT(109) \
|
||||
DECLARE_INTERRUPT(110) \
|
||||
DECLARE_INTERRUPT(111) \
|
||||
DECLARE_INTERRUPT(112) \
|
||||
DECLARE_INTERRUPT(113) \
|
||||
DECLARE_INTERRUPT(114) \
|
||||
DECLARE_INTERRUPT(115) \
|
||||
DECLARE_INTERRUPT(116) \
|
||||
DECLARE_INTERRUPT(117) \
|
||||
DECLARE_INTERRUPT(118) \
|
||||
DECLARE_INTERRUPT(119) \
|
||||
DECLARE_INTERRUPT(120) \
|
||||
DECLARE_INTERRUPT(121) \
|
||||
DECLARE_INTERRUPT(122) \
|
||||
DECLARE_INTERRUPT(123) \
|
||||
DECLARE_INTERRUPT(124) \
|
||||
DECLARE_INTERRUPT(125) \
|
||||
DECLARE_INTERRUPT(126) \
|
||||
DECLARE_INTERRUPT(127) \
|
||||
DECLARE_INTERRUPT(128) \
|
||||
DECLARE_INTERRUPT(129) \
|
||||
DECLARE_INTERRUPT(130) \
|
||||
DECLARE_INTERRUPT(131) \
|
||||
DECLARE_INTERRUPT(132) \
|
||||
DECLARE_INTERRUPT(133) \
|
||||
DECLARE_INTERRUPT(134) \
|
||||
DECLARE_INTERRUPT(135) \
|
||||
DECLARE_INTERRUPT(136) \
|
||||
DECLARE_INTERRUPT(137) \
|
||||
DECLARE_INTERRUPT(138) \
|
||||
DECLARE_INTERRUPT(139) \
|
||||
DECLARE_INTERRUPT(140) \
|
||||
DECLARE_INTERRUPT(141) \
|
||||
DECLARE_INTERRUPT(142) \
|
||||
DECLARE_INTERRUPT(143) \
|
||||
DECLARE_INTERRUPT(144) \
|
||||
DECLARE_INTERRUPT(145) \
|
||||
DECLARE_INTERRUPT(146) \
|
||||
DECLARE_INTERRUPT(147) \
|
||||
DECLARE_INTERRUPT(148) \
|
||||
DECLARE_INTERRUPT(149) \
|
||||
DECLARE_INTERRUPT(150) \
|
||||
DECLARE_INTERRUPT(151) \
|
||||
DECLARE_INTERRUPT(152) \
|
||||
DECLARE_INTERRUPT(153) \
|
||||
DECLARE_INTERRUPT(154) \
|
||||
DECLARE_INTERRUPT(155) \
|
||||
DECLARE_INTERRUPT(156) \
|
||||
DECLARE_INTERRUPT(157) \
|
||||
DECLARE_INTERRUPT(158) \
|
||||
DECLARE_INTERRUPT(159) \
|
||||
DECLARE_INTERRUPT(160) \
|
||||
DECLARE_INTERRUPT(161) \
|
||||
DECLARE_INTERRUPT(162) \
|
||||
DECLARE_INTERRUPT(163) \
|
||||
DECLARE_INTERRUPT(164) \
|
||||
DECLARE_INTERRUPT(165) \
|
||||
DECLARE_INTERRUPT(166) \
|
||||
DECLARE_INTERRUPT(167) \
|
||||
DECLARE_INTERRUPT(168) \
|
||||
DECLARE_INTERRUPT(169) \
|
||||
DECLARE_INTERRUPT(170) \
|
||||
DECLARE_INTERRUPT(171) \
|
||||
DECLARE_INTERRUPT(172) \
|
||||
DECLARE_INTERRUPT(173) \
|
||||
DECLARE_INTERRUPT(174) \
|
||||
DECLARE_INTERRUPT(175) \
|
||||
DECLARE_INTERRUPT(176) \
|
||||
DECLARE_INTERRUPT(177) \
|
||||
DECLARE_INTERRUPT(178) \
|
||||
DECLARE_INTERRUPT(179) \
|
||||
DECLARE_INTERRUPT(180) \
|
||||
DECLARE_INTERRUPT(181) \
|
||||
DECLARE_INTERRUPT(182) \
|
||||
DECLARE_INTERRUPT(183) \
|
||||
DECLARE_INTERRUPT(184) \
|
||||
DECLARE_INTERRUPT(185) \
|
||||
DECLARE_INTERRUPT(186) \
|
||||
DECLARE_INTERRUPT(187) \
|
||||
DECLARE_INTERRUPT(188) \
|
||||
DECLARE_INTERRUPT(189) \
|
||||
DECLARE_INTERRUPT(190) \
|
||||
DECLARE_INTERRUPT(191) \
|
||||
DECLARE_INTERRUPT(192) \
|
||||
DECLARE_INTERRUPT(193) \
|
||||
DECLARE_INTERRUPT(194) \
|
||||
DECLARE_INTERRUPT(195) \
|
||||
DECLARE_INTERRUPT(196) \
|
||||
DECLARE_INTERRUPT(197) \
|
||||
DECLARE_INTERRUPT(198) \
|
||||
DECLARE_INTERRUPT(199) \
|
||||
DECLARE_INTERRUPT(200) \
|
||||
DECLARE_INTERRUPT(201) \
|
||||
DECLARE_INTERRUPT(202) \
|
||||
DECLARE_INTERRUPT(203) \
|
||||
DECLARE_INTERRUPT(204) \
|
||||
DECLARE_INTERRUPT(205) \
|
||||
DECLARE_INTERRUPT(206) \
|
||||
DECLARE_INTERRUPT(207) \
|
||||
DECLARE_INTERRUPT(208) \
|
||||
DECLARE_INTERRUPT(209) \
|
||||
DECLARE_INTERRUPT(210) \
|
||||
DECLARE_INTERRUPT(211) \
|
||||
DECLARE_INTERRUPT(212) \
|
||||
DECLARE_INTERRUPT(213) \
|
||||
DECLARE_INTERRUPT(214) \
|
||||
DECLARE_INTERRUPT(215) \
|
||||
DECLARE_INTERRUPT(216) \
|
||||
DECLARE_INTERRUPT(217) \
|
||||
DECLARE_INTERRUPT(218) \
|
||||
DECLARE_INTERRUPT(219) \
|
||||
DECLARE_INTERRUPT(220) \
|
||||
DECLARE_INTERRUPT(221) \
|
||||
DECLARE_INTERRUPT(222) \
|
||||
DECLARE_INTERRUPT(223) \
|
||||
DECLARE_INTERRUPT(224) \
|
||||
DECLARE_INTERRUPT(225) \
|
||||
DECLARE_INTERRUPT(226) \
|
||||
DECLARE_INTERRUPT(227) \
|
||||
DECLARE_INTERRUPT(228) \
|
||||
DECLARE_INTERRUPT(229) \
|
||||
DECLARE_INTERRUPT(230) \
|
||||
DECLARE_INTERRUPT(231) \
|
||||
DECLARE_INTERRUPT(232) \
|
||||
DECLARE_INTERRUPT(233) \
|
||||
DECLARE_INTERRUPT(234) \
|
||||
DECLARE_INTERRUPT(235) \
|
||||
DECLARE_INTERRUPT(236) \
|
||||
DECLARE_INTERRUPT(237) \
|
||||
DECLARE_INTERRUPT(238) \
|
||||
DECLARE_INTERRUPT(239) \
|
||||
DECLARE_INTERRUPT(240) \
|
||||
DECLARE_INTERRUPT(241) \
|
||||
DECLARE_INTERRUPT(242) \
|
||||
DECLARE_INTERRUPT(243) \
|
||||
DECLARE_INTERRUPT(244) \
|
||||
DECLARE_INTERRUPT(245) \
|
||||
DECLARE_INTERRUPT(246) \
|
||||
DECLARE_INTERRUPT(247) \
|
||||
DECLARE_INTERRUPT(248) \
|
||||
DECLARE_INTERRUPT(249) \
|
||||
DECLARE_INTERRUPT(250) \
|
||||
DECLARE_INTERRUPT(251) \
|
||||
DECLARE_INTERRUPT(252) \
|
||||
DECLARE_INTERRUPT(253) \
|
||||
DECLARE_INTERRUPT(254) \
|
||||
DECLARE_INTERRUPT(255));
|
||||
|
|
|
|||
|
|
@ -43,31 +43,4 @@ extern char exception_stack[];
|
|||
|
||||
#define __isr__ void __attribute__ ((regparm(0)))
|
||||
|
||||
#define DECLARE_INTERRUPT(x) \
|
||||
asm(".globl irq_"#x"\n" \
|
||||
"irq_"#x":\n" \
|
||||
"pusha \n" \
|
||||
"pushl $"#x"\n" \
|
||||
"pushl $irq_return\n" \
|
||||
"jmp do_irq\n"); \
|
||||
__isr__ irq_##x(void)
|
||||
|
||||
#define DECLARE_EXCEPTION(x, f) \
|
||||
asm(".globl exp_"#x"\n" \
|
||||
"exp_"#x":\n" \
|
||||
"pusha \n" \
|
||||
"movl %esp, %ebx\n" \
|
||||
"movl $exception_stack, %eax\n" \
|
||||
"movl %eax, %esp \n" \
|
||||
"pushl %ebx\n" \
|
||||
"movl 32(%esp), %ebx\n" \
|
||||
"xorl %edx, %edx\n" \
|
||||
"movw 36(%esp), %dx\n" \
|
||||
"pushl %edx\n" \
|
||||
"pushl %ebx\n" \
|
||||
"pushl $"#x"\n" \
|
||||
"pushl $exp_return\n" \
|
||||
"jmp "#f"\n"); \
|
||||
__isr__ exp_##x(void)
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -55,9 +55,6 @@ int timer_init(void);
|
|||
/* cpu/.../interrupts.c */
|
||||
int cpu_init_interrupts(void);
|
||||
|
||||
/* cpu/.../exceptions.c */
|
||||
int cpu_init_exceptions(void);
|
||||
|
||||
/* board/.../... */
|
||||
int board_init(void);
|
||||
int dram_init(void);
|
||||
|
|
|
|||
|
|
@ -109,8 +109,10 @@ void irq_free_handler(int irq)
|
|||
return;
|
||||
}
|
||||
|
||||
__isr__ do_irq(int irq)
|
||||
void do_irq(int hw_irq)
|
||||
{
|
||||
int irq = hw_irq - 0x20;
|
||||
|
||||
if (irq < 0 || irq >= CONFIG_SYS_NUM_IRQS) {
|
||||
printf("do_irq: bad irq number %d\n", irq);
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -40,45 +40,12 @@
|
|||
#error "CONFIG_SYS_NUM_IRQS must equal 16 if CONFIG_SYS_NUM_IRQS is defined"
|
||||
#endif
|
||||
|
||||
DECLARE_INTERRUPT(0);
|
||||
DECLARE_INTERRUPT(1);
|
||||
DECLARE_INTERRUPT(3);
|
||||
DECLARE_INTERRUPT(4);
|
||||
DECLARE_INTERRUPT(5);
|
||||
DECLARE_INTERRUPT(6);
|
||||
DECLARE_INTERRUPT(7);
|
||||
DECLARE_INTERRUPT(8);
|
||||
DECLARE_INTERRUPT(9);
|
||||
DECLARE_INTERRUPT(10);
|
||||
DECLARE_INTERRUPT(11);
|
||||
DECLARE_INTERRUPT(12);
|
||||
DECLARE_INTERRUPT(13);
|
||||
DECLARE_INTERRUPT(14);
|
||||
DECLARE_INTERRUPT(15);
|
||||
|
||||
int interrupt_init(void)
|
||||
{
|
||||
u8 i;
|
||||
|
||||
disable_interrupts();
|
||||
|
||||
/* Setup interrupts */
|
||||
set_vector(0x20, irq_0);
|
||||
set_vector(0x21, irq_1);
|
||||
set_vector(0x23, irq_3);
|
||||
set_vector(0x24, irq_4);
|
||||
set_vector(0x25, irq_5);
|
||||
set_vector(0x26, irq_6);
|
||||
set_vector(0x27, irq_7);
|
||||
set_vector(0x28, irq_8);
|
||||
set_vector(0x29, irq_9);
|
||||
set_vector(0x2a, irq_10);
|
||||
set_vector(0x2b, irq_11);
|
||||
set_vector(0x2c, irq_12);
|
||||
set_vector(0x2d, irq_13);
|
||||
set_vector(0x2e, irq_14);
|
||||
set_vector(0x2f, irq_15);
|
||||
|
||||
/* Mask all interrupts */
|
||||
outb(0xff, MASTER_PIC + IMR);
|
||||
outb(0xff, SLAVE_PIC + IMR);
|
||||
|
|
|
|||
Loading…
Reference in New Issue