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

Add enhanced debugging for segment exceptions

Browse Source 
Co-authored-by: ParrotXray <87219725+ParrotXray@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2025-10-14 07:46:09 +00:00
parent ccde0f125b
commit 7509a5d77f
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/src/arch/amd64/gdt.rs
View File

@ -131,4 +131,8 @@ pub fn print_info() {
log_info!("User Code: {:#x} (ring 3)", selectors.user_code_selector.0);
log_info!("User Data: {:#x} (ring 3)", selectors.user_data_selector.0);
log_info!("TSS: {:#x}", selectors.tss_selector.0);
// Verify that user segments have correct RPL bits
log_debug!("User Code RPL: {:?}", selectors.user_code_selector.rpl());
log_debug!("User Data RPL: {:?}", selectors.user_data_selector.rpl());
}

18
kernel/src/arch/amd64/isr.rs
View File

@ -97,6 +97,15 @@ pub extern "x86-interrupt" fn invalid_tss_handler(
kprintln!();
log_fatal!("EXCEPTION: INVALID TSS (#TS)");
log_fatal!("Error Code: {:#x}", error_code);
// Decode the error code to provide more information
let selector_index = (error_code >> 3) & 0x1FFF; // Bits 15-3
let ti = (error_code >> 2) & 0x1; // Bit 2: Table Indicator (0=GDT, 1=LDT)
let rpl = error_code & 0x3; // Bits 1-0: RPL
log_fatal!("Segment Selector Index: {:#x} ({})", selector_index, selector_index);
log_fatal!("Table Indicator: {} ({})", ti, if ti == 0 { "GDT" } else { "LDT" });
log_fatal!("Requested Privilege Level: {}", rpl);
log_fatal!("{:#?}", stack_frame);
loop {
cpu::cpu_halt();
@ -111,6 +120,15 @@ pub extern "x86-interrupt" fn segment_not_present_handler(
kprintln!();
log_fatal!("EXCEPTION: SEGMENT NOT PRESENT (#NP)");
log_fatal!("Error Code: {:#x}", error_code);
// Decode the error code to provide more information
let selector_index = (error_code >> 3) & 0x1FFF; // Bits 15-3
let ti = (error_code >> 2) & 0x1; // Bit 2: Table Indicator (0=GDT, 1=LDT)
let rpl = error_code & 0x3; // Bits 1-0: RPL
log_fatal!("Segment Selector Index: {:#x} ({})", selector_index, selector_index);
log_fatal!("Table Indicator: {} ({})", ti, if ti == 0 { "GDT" } else { "LDT" });
log_fatal!("Requested Privilege Level: {}", rpl);
log_fatal!("{:#?}", stack_frame);
loop {
cpu::cpu_halt();