[PATCH] Put the BUG __FILE__ and __LINE__ info out of line

[Jeremy Fitzhardinge]

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@xxxxxxxx>

--
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


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/