Skip to content

[HUST CSE][libcpu][ia32]fix pic irq mask umask vector bounds handling #11312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Telecaster2147 wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −2
Open

[HUST CSE][libcpu][ia32]fix pic irq mask umask vector bounds handling #11312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions libcpu/ia32/interrupt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ struct rt_irq_desc irq_desc[MAX_HANDLERS];

rt_uint16_t irq_mask_8259A = 0xFFFF;

rt_inline rt_bool_t _interrupt_vector_is_valid(int vector)
{
return (vector >= 0) && (vector < MAX_HANDLERS);
}

void rt_hw_interrupt_handle(int vector, void* param);

/**
Expand Down Expand Up @@ -92,14 +97,24 @@ void rt_hw_interrupt_init(void)

void rt_hw_interrupt_umask(int vector)
{
irq_mask_8259A = irq_mask_8259A&~(1<<vector);
if (!_interrupt_vector_is_valid(vector))
{
return;
}

irq_mask_8259A = irq_mask_8259A & ~(rt_uint16_t)(1U << vector);
outb(IO_PIC1+1, (char)irq_mask_8259A);
outb(IO_PIC2+1, (char)(irq_mask_8259A >> 8));
}

void rt_hw_interrupt_mask(int vector)
{
irq_mask_8259A = irq_mask_8259A | (1<<vector);
if (!_interrupt_vector_is_valid(vector))
{
return;
}

irq_mask_8259A = irq_mask_8259A | (rt_uint16_t)(1U << vector);
outb(IO_PIC1+1, (char)irq_mask_8259A);
outb(IO_PIC2+1, (char)(irq_mask_8259A >> 8));
}
Expand Down
Loading