ParrotXray/CureOS
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Fixed a small problem

Browse Source
This commit is contained in:
ParrotXray 2025-05-07 01:42:54 +08:00
parent a199fa4509
commit f84fc02eaf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/kernel/asm/x86/gdt.rs
View File

@ -24,9 +24,9 @@ pub const fn seg_lim_l(x: u64) -> u64 { x & 0x0ffff }
#[allow(dead_code)]
pub const fn seg_lim_h(x: u64) -> u64 { x & 0xf0000 }
#[allow(dead_code)]
pub const fn seg_base_l(x: u64) -> u64 { (x & 0x0000ffff) << 16 }
pub const fn seg_base_l(x: u64) -> u64 { ((x & 0x0000ffff) << 16) }
#[allow(dead_code)]
pub const fn seg_base_m(x: u64) -> u64 { (x & 0x00ff0000) >> 16 }
pub const fn seg_base_m(x: u64) -> u64 { ((x & 0x00ff0000) >> 16) }
#[allow(dead_code)]
pub const fn seg_base_h(x: u64) -> u64 { x & 0xff000000 }
@ -98,7 +98,7 @@ pub static mut _GDT_LIMIT: u16 = (mem::size_of::<[u64; GDT_ENTRY]>() - 1) as u16
#[no_mangle]
pub fn _set_gdt_entry(index: usize, base: u64, limit: u64, flags: u64) {
unsafe {
_GDT[index] = seg_base_h(base) | flags | seg_lim_h(limit) | seg_base_h(base);
_GDT[index] = seg_base_h(base) | flags | seg_lim_h(limit) | seg_base_m(base);
_GDT[index] <<= 32;
_GDT[index] |= seg_base_l(base) | seg_lim_l(limit);
}

2
src/kernel/kernel.rs
View File

@ -41,7 +41,7 @@ pub extern "C" fn _kernel_main() {
println!("10: {}, 16: {:x}", value, value);
unsafe {
let x = gdt::_GDT_LIMIT;
let x = gdt::_GDT_LIMIT;
println!("GDT Limit: {}", x);
}