diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-12-20 20:03:22 +0100 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-12-20 20:03:22 +0100 |
| commit | 09353da6e91a0968ae24d4b4d97ed434520e6217 (patch) | |
| tree | 016694d12e9dfebc773cef629eb56556d0024b22 /Source/Kernel/Core/Sys.ns.cpp | |
| parent | 247070cc7e5ae117fd0d1b551fafdf5c13f0dd6b (diff) | |
| parent | 18454dc8be12827a84c2ebc58aa5d31bb44e1e6a (diff) | |
| download | Melon-09353da6e91a0968ae24d4b4d97ed434520e6217.tar.gz Melon-09353da6e91a0968ae24d4b4d97ed434520e6217.zip | |
Merge branch 'framework'
Conflicts:
.gitignore
Diffstat (limited to 'Source/Kernel/Core/Sys.ns.cpp')
| -rw-r--r-- | Source/Kernel/Core/Sys.ns.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Kernel/Core/Sys.ns.cpp b/Source/Kernel/Core/Sys.ns.cpp index c5af3e8..59da244 100644 --- a/Source/Kernel/Core/Sys.ns.cpp +++ b/Source/Kernel/Core/Sys.ns.cpp @@ -85,9 +85,9 @@ void dumpRegs(registers_t *regs, VirtualTerminal& vt) { vt << "eflags=" << (u32int)regs->eflags << ", useresp=" << (u32int)regs->useresp << ", ss=" << (u32int)regs->ss << "\n"; } -void stackTrace(u32int ebp, VirtualTerminal& vt, u32int maxframes) { +void stackTrace(u32int ebp, VirtualTerminal& vt, u32int maxframes, bool isUser) { u32int *stack = (u32int*)ebp; - for (u32int i = 0; i < maxframes and (u32int)stack > 0xC0000000 and (u32int)stack < (ebp + 0x10000); i++) { + for (u32int i = 0; i < maxframes and (isUser or ((u32int)stack > 0xC0000000)) and (u32int)stack < (ebp + 0x10000); i++) { vt << "Frame: " << (u32int)stack << " n:" << stack[0] << " r:" << stack[1] << "\n"; stack = (u32int*)stack[0]; } |