Merge branch 'main' of https://git.whitedwarf.me/Turner/OS_Project into main

Updating local files that contain changes.
Completed Part2: 06_irq.
2023-09-15 11:08:33 -04:00 · 2023-09-15 11:08:01 -04:00
12 changed files with 1 additions and 1 deletions
--- a/Part2/A4/06_irq/boot/bootsect.bin
+++ b/Part2/A4/06_irq/boot/bootsect.bin
--- a/Part2/A4/06_irq/boot/kernel_entry.o
+++ b/Part2/A4/06_irq/boot/kernel_entry.o
--- a/Part2/A4/06_irq/cpu/idt.o
+++ b/Part2/A4/06_irq/cpu/idt.o
--- a/Part2/A4/06_irq/cpu/interrupt.o
+++ b/Part2/A4/06_irq/cpu/interrupt.o
--- a/Part2/A4/06_irq/cpu/isr.c
+++ b/Part2/A4/06_irq/cpu/isr.c
@ -79,7 +79,7 @@ void isr_install() {
 char *exception_messages[] = {
    "Division By Zero",
    "Debug",
-    "Non Maskable Interrupt | C",
+    "Non Maskable Interrupt | Z",
    "Breakpoint | S",
    "Into Detected Overflow",
    "Out of Bounds",
--- a/Part2/A4/06_irq/cpu/isr.o
+++ b/Part2/A4/06_irq/cpu/isr.o
--- a/Part2/A4/06_irq/drivers/ports.o
+++ b/Part2/A4/06_irq/drivers/ports.o
--- a/Part2/A4/06_irq/drivers/screen.o
+++ b/Part2/A4/06_irq/drivers/screen.o
--- a/Part2/A4/06_irq/kernel.bin
+++ b/Part2/A4/06_irq/kernel.bin
--- a/Part2/A4/06_irq/kernel/kernel.o
+++ b/Part2/A4/06_irq/kernel/kernel.o
--- a/Part2/A4/06_irq/kernel/util.o
+++ b/Part2/A4/06_irq/kernel/util.o
--- a/Part2/A4/06_irq/os-image.bin
+++ b/Part2/A4/06_irq/os-image.bin
Author	SHA1	Message	Date
Jonathan Turner	e45f28f10a	Merge branch 'main' of https://git.whitedwarf.me/Turner/OS_Project into main Updating local files that contain changes.	2023-09-15 11:08:33 -04:00
Jonathan Turner	33c4b91102	Completed Part2: 06_irq.	2023-09-15 11:08:01 -04:00