gbowne1/ClassicOS
2
2
Fork 0
mirror of https://github.com/gbowne1/ClassicOS.git synced 2024-11-22 06:06:52 -08:00
Code Issues 2 Packages Projects 1 Releases Wiki Activity

Fixed the declarations in gdt.c idt.c isr.c and isr.h

Browse Source
This commit is contained in:
Gregory Kenneth Bowne 2023-09-27 15:57:12 -07:00
parent 8b290ded1a
commit 058f61d3ba
4 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/arch/x86/gdt.c
View File

@ -71,7 +71,7 @@ void (*isr_table[256])(void) = {0};
void isr_register(uint8_t num, void (*handler)(struct isr_regs *regs)); void isr_register(uint8_t num, void (*handler)(struct isr_regs *regs));
// ISR handler // ISR handler
void isr_handler(struct isr_regs *regs) void isr_handler(struct idt_regs *regs);
{ {
void (*handler)(void); void (*handler)(void);

50
src/kernel/arch/x86/isr.c
View File

@ -1,5 +1,6 @@
#include "isr.h" #include "isr.h"
#include "idt.h" #include "idt.h"
#include <stdint.h>
#include <stdio.h> #include <stdio.h>
enum enum
@ -21,27 +22,48 @@ void isr_register(uint8_t num, void (*handler)(struct isr_regs *regs))
} }
// ISR handler // ISR handler
// ISR handler void isr_handler(struct idt_regs *regs)
void isr_handler(struct isr_regs *regs)
{ {
switch (regs->int_no) switch (regs->int_no)
{ {
case 0: case 0x00:
divide_error(); divide_error();
break; break;
case 13: case 0x06:
invalid_opcode();
break;
case 0x0D:
general_protection_fault(regs); general_protection_fault(regs);
break; break;
case 14: case 0x0E:
page_fault(regs); page_fault(regs);
break; break;
case 0x08:
double_fault();
break;
case 0x80:
system_call(regs);
break;
case 0x20:
timer();
break;
case 0x21:
keyboard();
break;
case 0x2F:
device();
break;
case 0x28:
network();
break;
case 0x2E:
disk();
break;
case 0x24:
serial_port();
break;
default: default:
void (*handler)(struct isr_regs *regs); printf("Unhandled interrupt: %d\n", regs->int_no);
handler = isr_table[regs->int_no];
if (handler)
{
handler(regs);
}
break; break;
} }
} }
@ -53,7 +75,7 @@ void divide_error()
// Additional actions can be taken as needed // Additional actions can be taken as needed
} }
void page_fault(struct isr_regs *regs) void page_fault(struct idt_regs *regs)
{ {
uint32_t faulting_address; uint32_t faulting_address;
@ -67,7 +89,7 @@ void page_fault(struct isr_regs *regs)
// Additional actions can be taken as needed // Additional actions can be taken as needed
} }
void general_protection_fault(struct isr_regs *regs) void general_protection_fault(struct idt_regs *regs)
{ {
printf("General protection fault occurred!\n"); printf("General protection fault occurred!\n");
// Additional actions can be taken as needed // Additional actions can be taken as needed
@ -79,7 +101,7 @@ void double_fault()
} }
// Interrupt handlers // Interrupt handlers
void system_call(struct isr_regs *regs) void system_call(struct idt_regs *regs)
{ {
// Get the system call number from the eax register // Get the system call number from the eax register
uint32_t syscall_number = regs->eax; uint32_t syscall_number = regs->eax;

2
src/kernel/arch/x86/isr.h
View File

@ -19,6 +19,6 @@ struct isr_regs
void isr_register(uint8_t num, void (*handler)(struct isr_regs *regs)); void isr_register(uint8_t num, void (*handler)(struct isr_regs *regs));
// ISR handler // ISR handler
void isr_handler(struct isr_regs *regs); void isr_handler(struct idt_regs *regs);
#endif /* ISR_H */ #endif /* ISR_H */