1
0

Remove unused start() args

This commit is contained in:
Mark 2025-03-02 10:06:10 -08:00
parent e3bdce6065
commit 1db789889c
Signed by: Mark
GPG Key ID: C6D63995FE72FD80
3 changed files with 2 additions and 41 deletions

View File

@ -31,18 +31,9 @@ stage3.entry:
; stage3 stack at 448 KiB (512KiB minus 64KiB disk buffer)
mov esp, 0x70000
; push arguments
mov eax, thunk.int16
push eax
mov eax, thunk.int15
push eax
mov eax, thunk.int13
push eax
; push arguments to `start()`
mov eax, thunk.int10
push eax
xor eax, eax
mov al, [disk]
push eax
mov eax, [stage3 + 0x18]
call eax

View File

@ -6,18 +6,6 @@ thunk:
mov dword [.func], .int10_real
jmp .enter
.int13:
mov dword [.func], .int13_real
jmp .enter
.int15:
mov dword [.func], .int15_real
jmp .enter
.int16:
mov dword [.func], .int16_real
jmp .enter
.func: dd 0
.esp: dd 0
.cr0: dd 0
@ -65,18 +53,6 @@ USE16
int 0x10
ret
.int13_real:
int 0x13
ret
.int15_real:
int 0x15
ret
.int16_real:
int 0x16
ret
.pm16:
; set segment selectors to protected mode 16-bit
mov eax, gdt.pm16_data

View File

@ -123,13 +123,7 @@ extern "x86-interrupt" fn double_fault_handler(
}
#[no_mangle]
pub unsafe extern "C" fn start(
_boot_disk: usize,
thunk10: extern "C" fn(),
_thunk13: extern "C" fn(),
_thunk15: extern "C" fn(),
_thunk16: extern "C" fn(),
) -> ! {
pub unsafe extern "C" fn start(thunk10: extern "C" fn()) -> ! {
println!("Entered Rust, serial ready.");
{