Remove kernel_entry
This commit is contained in:
parent
c73d8a6b69
commit
bfd057c541
bootloader
@ -43,8 +43,6 @@ stage3.entry:
|
|||||||
xor eax, eax
|
xor eax, eax
|
||||||
mov al, [disk]
|
mov al, [disk]
|
||||||
push eax
|
push eax
|
||||||
mov eax, 0x00
|
|
||||||
push eax
|
|
||||||
mov eax, [stage3 + 0x18]
|
mov eax, [stage3 + 0x18]
|
||||||
call eax
|
call eax
|
||||||
|
|
||||||
|
@ -29,13 +29,6 @@ pub(crate) static VGA: Mutex<Vga> = Mutex::new(unsafe { Vga::new(VGA_ADDR, 80, 2
|
|||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
pub unsafe extern "C" fn start(
|
pub unsafe extern "C" fn start(
|
||||||
_kernel_entry: extern "C" fn(
|
|
||||||
page_table: usize,
|
|
||||||
stack: u64,
|
|
||||||
func: u64,
|
|
||||||
args: *const KernelArgs,
|
|
||||||
long_mode: usize,
|
|
||||||
) -> !,
|
|
||||||
_boot_disk: usize,
|
_boot_disk: usize,
|
||||||
thunk10: extern "C" fn(),
|
thunk10: extern "C" fn(),
|
||||||
_thunk13: extern "C" fn(),
|
_thunk13: extern "C" fn(),
|
||||||
@ -69,14 +62,4 @@ pub unsafe extern "C" fn start(
|
|||||||
// let (page_phys, func, args) = crate::run_main(&mut os);
|
// let (page_phys, func, args) = crate::run_main(&mut os);
|
||||||
|
|
||||||
panic!("kernel");
|
panic!("kernel");
|
||||||
|
|
||||||
/*
|
|
||||||
kernel_entry(
|
|
||||||
page_phys,
|
|
||||||
args.stack_base + args.stack_size + crate::arch::x32::PHYS_OFFSET as u64,
|
|
||||||
func,
|
|
||||||
&args,
|
|
||||||
0,
|
|
||||||
);
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user