PERFORCE change 52707 for review
Marcel Moolenaar
marcel at FreeBSD.org
Tue May 11 22:45:02 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=52707
Change 52707 by marcel at marcel_nfs on 2004/05/11 22:44:30
Call kdb_reenter() instead of kdb_trap() when kdb_active is
non-zero. While here, make sure it's conditional upon KDB.
Affected files ...
.. //depot/projects/gdb/sys/alpha/alpha/trap.c#6 edit
.. //depot/projects/gdb/sys/amd64/amd64/trap.c#8 edit
.. //depot/projects/gdb/sys/i386/i386/trap.c#10 edit
.. //depot/projects/gdb/sys/ia64/ia64/trap.c#9 edit
.. //depot/projects/gdb/sys/sparc64/sparc64/trap.c#6 edit
Differences ...
==== //depot/projects/gdb/sys/alpha/alpha/trap.c#6 (text+ko) ====
@@ -283,10 +283,12 @@
#endif
p = td->td_proc;
+#ifdef KDB
if (kdb_active) {
- kdb_trap(entry, a0, framep);
+ kdb_reenter();
return;
}
+#endif
td->td_last_frame = framep;
==== //depot/projects/gdb/sys/amd64/amd64/trap.c#8 (text+ko) ====
@@ -166,8 +166,8 @@
type = frame.tf_trapno;
#ifdef KDB
- if (kdb_active && type == T_PAGEFLT) {
- kdb_trap(type, 0, &frame);
+ if (kdb_active) {
+ kdb_reenter();
goto out;
}
#endif
==== //depot/projects/gdb/sys/i386/i386/trap.c#10 (text+ko) ====
@@ -188,7 +188,7 @@
#ifdef KDB
if (kdb_active) {
- kdb_trap(type, 0, &frame);
+ kdb_reenter();
goto out;
}
#endif
==== //depot/projects/gdb/sys/ia64/ia64/trap.c#9 (text+ko) ====
@@ -373,8 +373,8 @@
KASSERT(cold || td->td_ucred != NULL,
("kernel trap doesn't have ucred"));
#ifdef KDB
- if (kdb_active && vector == IA64_VEC_PAGE_NOT_PRESENT)
- kdb_trap(vector, 0, tf);
+ if (kdb_active)
+ kdb_reenter();
#endif
}
==== //depot/projects/gdb/sys/sparc64/sparc64/trap.c#6 (text+ko) ====
@@ -298,11 +298,12 @@
KASSERT((tf->tf_type & T_KERNEL) != 0,
("trap: kernel trap isn't"));
+#ifdef KDB
if (kdb_active) {
- kdb_trap(tf->tf_type, 0, tf);
- TF_DONE(tf);
+ kdb_reenter();
return;
}
+#endif
td->td_last_frame = tf;
More information about the p4-projects
mailing list