some fixes

main
Clyne 3 weeks ago
parent 2d0245a85d
commit abfdd6eb3e
Signed by: clyne
GPG Key ID: 1B74EE6C49C96795

@ -39,5 +39,5 @@ clean:
run: myos.iso run: myos.iso
@echo " QEMU" @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

@ -62,8 +62,8 @@ struct StubEntry
asm volatile(R"( asm volatile(R"(
pusha pusha
mov %%ds, %%ax mov %%ds, %%eax
push %%ax push %%eax
mov $0x10, %%ax mov $0x10, %%ax
mov %%ax, %%ds mov %%ax, %%ds
mov %%ax, %%es mov %%ax, %%es
@ -73,7 +73,7 @@ struct StubEntry
cld cld
call interruptGeneralHandler call interruptGeneralHandler
pop %%eax pop %%eax
pop %%ax pop %%eax
mov %%ax, %%ds mov %%ax, %%ds
mov %%ax, %%es mov %%ax, %%es
mov %%ax, %%fs mov %%ax, %%fs

@ -34,12 +34,12 @@ SECTIONS
*(.rodata) *(.rodata)
} }
.init_array : .init_array :
{ {
__init_array_start = .; __init_array_start = .;
*(.init_array) *(.init_array)
__init_array_end = .; __init_array_end = .;
} }
/* Read-write data (initialized) */ /* Read-write data (initialized) */
.data BLOCK(4K) : ALIGN(4K) .data BLOCK(4K) : ALIGN(4K)
@ -58,9 +58,9 @@ SECTIONS
a segment with the same name. Simply add stuff here as needed. */ a segment with the same name. Simply add stuff here as needed. */
.note : .note :
{ {
*(.note) *(.note)
*(.note*) *(.note*)
} }
} }

Loading…
Cancel
Save