linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Put the BUG __FILE__ and __LINE__ info out of line
@ 2006-09-28  6:00 Jeremy Fitzhardinge
  2006-09-28  6:35 ` Andrew Morton
  2006-09-28  7:16 ` Andi Kleen
  0 siblings, 2 replies; 15+ messages in thread
From: Jeremy Fitzhardinge @ 2006-09-28  6:00 UTC (permalink / raw)
  To: Andi Kleen, Andrew Morton; +Cc: Linux Kernel Mailing List

When CONFIG_DEBUG_BUGVERBOSE is enabled, the embedded file and line
information makes a disassembler very unhappy, because it tries to
parse them as instructions (it probably makes the CPU's instruction
decoder a little unhappy too).

This patch moves them out of line, and calls the ud2 from the code -
the call makes sure the original %eip is available on the top of the
stack.  The result is a happy disassembler, with no loss of debugging
information.

Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>

--
 arch/i386/kernel/vmlinux.lds.S |    2 ++
 include/asm-i386/bug.h         |   13 ++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff -r 1d29394927f3 arch/i386/kernel/vmlinux.lds.S
--- a/arch/i386/kernel/vmlinux.lds.S	Tue Sep 26 01:20:38 2006 -0700
+++ b/arch/i386/kernel/vmlinux.lds.S	Wed Sep 27 22:18:23 2006 -0700
@@ -27,6 +27,8 @@ SECTIONS
   _text = .;			/* Text and read-only data */
   .text : AT(ADDR(.text) - LOAD_OFFSET) {
 	*(.text)
+	__bugs = .;
+	*(.text.bugs)
 	SCHED_TEXT
 	LOCK_TEXT
 	KPROBES_TEXT
diff -r 1d29394927f3 include/asm-i386/bug.h
--- a/include/asm-i386/bug.h	Tue Sep 26 01:20:38 2006 -0700
+++ b/include/asm-i386/bug.h	Wed Sep 27 18:59:41 2006 -0700
@@ -11,11 +11,14 @@
 #ifdef CONFIG_BUG
 #define HAVE_ARCH_BUG
 #ifdef CONFIG_DEBUG_BUGVERBOSE
-#define BUG()				\
- __asm__ __volatile__(	"ud2\n"		\
-			"\t.word %c0\n"	\
-			"\t.long %c1\n"	\
-			 : : "i" (__LINE__), "i" (__FILE__))
+#define BUG()								\
+	__asm__ __volatile__("call 1f\n"				\
+			     ".section .text.bugs\n"			\
+			     "1:\tud2\n"					\
+			     "\t.word %c0\n"				\
+			     "\t.long %c1\n"				\
+			     ".previous\n"				\
+			     : : "i" (__LINE__), "i" (__FILE__))
 #else
 #define BUG() __asm__ __volatile__("ud2\n")
 #endif



^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2006-09-28 19:44 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-09-28  6:00 [PATCH] Put the BUG __FILE__ and __LINE__ info out of line Jeremy Fitzhardinge
2006-09-28  6:35 ` Andrew Morton
2006-09-28  6:49   ` Jeremy Fitzhardinge
2006-09-28  7:00     ` Andrew Morton
2006-09-28  7:17       ` Andi Kleen
2006-09-28  7:26         ` Andrew Morton
2006-09-28 10:15           ` Andi Kleen
2006-09-28 10:30             ` Jeremy Fitzhardinge
2006-09-28 10:38               ` Andi Kleen
2006-09-28 15:30                 ` Hugh Dickins
2006-09-28 19:44                   ` Andi Kleen
2006-09-28 10:27       ` Jeremy Fitzhardinge
2006-09-28 16:18         ` Andrew Morton
2006-09-28 16:32           ` Jeremy Fitzhardinge
2006-09-28  7:16 ` Andi Kleen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).