From 6d5880d56afb2c6a900e480c891fb40e05457ea3 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sun, 15 Jan 2012 17:51:48 +0800 Subject: [PATCH] Kernel/x86 - Cleaning up dead code --- Kernel/arch/x86/errors.c | 16 ++++++++-------- Kernel/arch/x86/proc.asm | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Kernel/arch/x86/errors.c b/Kernel/arch/x86/errors.c index d73fcea4..c1c3ae67 100644 --- a/Kernel/arch/x86/errors.c +++ b/Kernel/arch/x86/errors.c @@ -199,8 +199,8 @@ void Proc_PrintBacktrace(void) void Error_Backtrace(Uint eip, Uint ebp) { int i = 0; - Uint delta = 0; - char *str = NULL; +// Uint delta = 0; +// char *str = NULL; //if(eip < 0xC0000000 && eip > 0x1000) //{ @@ -221,10 +221,10 @@ void Error_Backtrace(Uint eip, Uint ebp) } //str = Debug_GetSymbol(eip, &delta); - if(str == NULL) +// if(str == NULL) LogF("Backtrace: 0x%x", eip); - else - LogF("Backtrace: %s+0x%x", str, delta); +// else +// LogF("Backtrace: %s+0x%x", str, delta); if(!MM_GetPhysAddr(ebp)) { LogF("\nBacktrace: Invalid EBP, stopping\n"); @@ -236,10 +236,10 @@ void Error_Backtrace(Uint eip, Uint ebp) { if( ebp >= MM_KERNEL_STACKS_END ) break; //str = Debug_GetSymbol(*(Uint*)(ebp+4), &delta); - if(str == NULL) +// if(str == NULL) LogF(" >> 0x%x", *(Uint*)(ebp+4)); - else - LogF(" >> %s+0x%x", str, delta); +// else +// LogF(" >> %s+0x%x", str, delta); ebp = *(Uint*)ebp; i++; } diff --git a/Kernel/arch/x86/proc.asm b/Kernel/arch/x86/proc.asm index 014cfed1..00ea9e1e 100644 --- a/Kernel/arch/x86/proc.asm +++ b/Kernel/arch/x86/proc.asm @@ -76,7 +76,6 @@ SwitchTasks: jmp ecx .restore: - popa xor eax, eax ret -- 2.20.1