From 3c97ab97bf79000ff834ae0397b14553fbf2fcd1 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Mon, 19 Feb 2007 10:57:47 +0000 Subject: [PATCH] Unbreak ddb stepping over special frames after the following commit: Revision Changes Path 1.113 +4 -2 src/sys/i386/i386/apic_vector.s 1.117 +7 -1 src/sys/i386/i386/exception.s 1.36 +7 -7 src/sys/i386/i386/local_apic.c 1.298 +61 -63 src/sys/i386/i386/trap.c 1.62 +15 -22 src/sys/i386/i386/vm86.c 1.32 +4 -2 src/sys/i386/i386/vm86bios.s 1.21 +2 -2 src/sys/i386/include/apicvar.h 1.27 +2 -2 src/sys/i386/isa/atpic.c 1.50 +2 -1 src/sys/i386/isa/atpic_vector.s 1.35 +1 -1 src/sys/i386/isa/icu.h Tested by: kris, Peter Holm No objections from: kmacy --- sys/i386/i386/db_trace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c index cb88085f395..2ac0fcf542d 100644 --- a/sys/i386/i386/db_trace.c +++ b/sys/i386/i386/db_trace.c @@ -360,9 +360,9 @@ db_nextframe(struct i386_frame **fp, db_addr_t *ip, struct thread *td) * current frame. */ if (frame_type == INTERRUPT) - tf = (struct trapframe *)((int)*fp + 12); + tf = (struct trapframe *)((int)*fp + 16); else - tf = (struct trapframe *)((int)*fp + 8); + tf = (struct trapframe *)((int)*fp + 12); if (INKERNEL((int) tf)) { esp = get_esp(tf);