fucking clippy bullshit
This commit is contained in:
parent
6997fcba6f
commit
eeac6fea0d
@ -5,6 +5,6 @@ wallpaper_style: centered
|
|||||||
/Gila
|
/Gila
|
||||||
protocol: limine
|
protocol: limine
|
||||||
kernel_path: boot():/boot/${ARCH}/gila
|
kernel_path: boot():/boot/${ARCH}/gila
|
||||||
cmdline: -loglevel=Trace -logdev=display,serial -initramfs=/boot/${ARCH}/initramfs.tar.lzma
|
cmdline: -loglevel=Info -logdev=display,serial -initramfs=/boot/${ARCH}/initramfs.tar.lzma
|
||||||
kaslr: yes
|
kaslr: yes
|
||||||
randomize_hhdm_base: yes
|
randomize_hhdm_base: yes
|
||||||
|
|||||||
@ -9,7 +9,7 @@ use x86_64::structures::gdt;
|
|||||||
use x86_64::structures::gdt::*;
|
use x86_64::structures::gdt::*;
|
||||||
|
|
||||||
use crate::log::*;
|
use crate::log::*;
|
||||||
use crate::log_info;
|
use crate::{log_info, log_trace};
|
||||||
use crate::memory::alloc::format;
|
use crate::memory::alloc::format;
|
||||||
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
@ -60,7 +60,7 @@ pub fn dump_gdt() {
|
|||||||
for entry in gdt.entries() {
|
for entry in gdt.entries() {
|
||||||
let flags = x86_64::structures::gdt::DescriptorFlags::from_bits_retain(entry.raw());
|
let flags = x86_64::structures::gdt::DescriptorFlags::from_bits_retain(entry.raw());
|
||||||
let seg_type = SegmentType::try_from(entry);
|
let seg_type = SegmentType::try_from(entry);
|
||||||
log_info!(
|
log_trace!(
|
||||||
"GDT entry: type: {:?} (ring {}), width: {}, length: 0x{:x}, raw flags: 0b{:04b}, access: 0b{:08b}",
|
"GDT entry: type: {:?} (ring {}), width: {}, length: 0x{:x}, raw flags: 0b{:04b}, access: 0b{:08b}",
|
||||||
seg_type.unwrap(),
|
seg_type.unwrap(),
|
||||||
entry.access().bits(5..=6),
|
entry.access().bits(5..=6),
|
||||||
|
|||||||
@ -31,7 +31,6 @@ use limine::firmware::{
|
|||||||
FIRMWARE_TYPE_EFI32, FIRMWARE_TYPE_EFI64, FIRMWARE_TYPE_SBI, FIRMWARE_TYPE_X86BIOS,
|
FIRMWARE_TYPE_EFI32, FIRMWARE_TYPE_EFI64, FIRMWARE_TYPE_SBI, FIRMWARE_TYPE_X86BIOS,
|
||||||
};
|
};
|
||||||
use spin::mutex::Mutex;
|
use spin::mutex::Mutex;
|
||||||
use x86_64::VirtAddr;
|
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
arch::{
|
arch::{
|
||||||
@ -41,7 +40,7 @@ use crate::{
|
|||||||
gdt::dump_gdt,
|
gdt::dump_gdt,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
memory::paging::{self, active_root_table, virt_to_phys},
|
memory::paging::{self, active_root_table},
|
||||||
};
|
};
|
||||||
|
|
||||||
lazy_static! {
|
lazy_static! {
|
||||||
|
|||||||
@ -91,7 +91,7 @@ pub fn log_address() {
|
|||||||
log_info!("Kernel physical start address: 0x{:x}", resp.physical_base);
|
log_info!("Kernel physical start address: 0x{:x}", resp.physical_base);
|
||||||
log_info!("Kernel virtual start address: 0x{:x}", resp.virtual_base);
|
log_info!("Kernel virtual start address: 0x{:x}", resp.virtual_base);
|
||||||
log_info!(
|
log_info!(
|
||||||
"Testing virt_to_phys: 0x{:x}",
|
"Testing virt_to_phys(): 0x{:x}",
|
||||||
resp.virtual_base
|
resp.virtual_base
|
||||||
);
|
);
|
||||||
let hhdm_vaddr = VirtAddr::new(resp.virtual_base);
|
let hhdm_vaddr = VirtAddr::new(resp.virtual_base);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user