aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClyne Sullivan <clyne@bitgloo.com>2024-09-29 08:51:32 -0400
committerClyne Sullivan <clyne@bitgloo.com>2024-09-29 08:51:32 -0400
commitabfdd6eb3ed61d13a47735812eca0028caf6b6da (patch)
tree79c744895401a7779e80289c927fcbba72e8f91b
parent2d0245a85deb62cbed66c053f80f339e0d97ed70 (diff)
some fixes
-rw-r--r--Makefile2
-rw-r--r--idt.cpp6
-rw-r--r--link.ld20
3 files changed, 14 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index cb08991..284f931 100644
--- a/Makefile
+++ b/Makefile
@@ -39,5 +39,5 @@ clean:
run: myos.iso
@echo " QEMU"
- @qemu-system-i386 -drive file=$<,index=2,media=cdrom -monitor stdio -no-reboot #-s -S #-d int
+ @qemu-system-i386 -drive file=$<,index=2,media=cdrom -monitor stdio -no-reboot -s -S #-d int
diff --git a/idt.cpp b/idt.cpp
index de15ec9..8c4a796 100644
--- a/idt.cpp
+++ b/idt.cpp
@@ -62,8 +62,8 @@ struct StubEntry
asm volatile(R"(
pusha
- mov %%ds, %%ax
- push %%ax
+ mov %%ds, %%eax
+ push %%eax
mov $0x10, %%ax
mov %%ax, %%ds
mov %%ax, %%es
@@ -73,7 +73,7 @@ struct StubEntry
cld
call interruptGeneralHandler
pop %%eax
- pop %%ax
+ pop %%eax
mov %%ax, %%ds
mov %%ax, %%es
mov %%ax, %%fs
diff --git a/link.ld b/link.ld
index 7e61bf3..074caf7 100644
--- a/link.ld
+++ b/link.ld
@@ -34,12 +34,12 @@ SECTIONS
*(.rodata)
}
- .init_array :
- {
- __init_array_start = .;
- *(.init_array)
- __init_array_end = .;
- }
+ .init_array :
+ {
+ __init_array_start = .;
+ *(.init_array)
+ __init_array_end = .;
+ }
/* Read-write data (initialized) */
.data BLOCK(4K) : ALIGN(4K)
@@ -58,9 +58,9 @@ SECTIONS
a segment with the same name. Simply add stuff here as needed. */
.note :
- {
- *(.note)
- *(.note*)
- }
+ {
+ *(.note)
+ *(.note*)
+ }
}