From f999815e290b498643e081b23e4686c2800ebcd5 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Tue, 16 Aug 2011 19:19:53 +0200 Subject: [PATCH] Fix sleb128 reading (BZ 720332). --- gdb-upstream.patch | 157 +++++++++++++++++++++++++++++++++++++++++++++ gdb.spec | 5 +- 2 files changed, 161 insertions(+), 1 deletion(-) diff --git a/gdb-upstream.patch b/gdb-upstream.patch index e2c1ff9..8b7777c 100644 --- a/gdb-upstream.patch +++ b/gdb-upstream.patch @@ -118,3 +118,160 @@ http://sourceware.org/ml/gdb-cvs/2011-08/msg00047.html DisablePrettyPrinter() + +register_pretty_printer_commands() + + + +[commit] Fix sleb128 reading +http://sourceware.org/ml/gdb-patches/2011-07/msg00270.html +http://sourceware.org/ml/gdb-cvs/2011-07/msg00112.html + +### src/gdb/ChangeLog 2011/07/11 13:07:36 1.13180 +### src/gdb/ChangeLog 2011/07/11 13:40:23 1.13181 +## -1,3 +1,8 @@ ++2011-07-11 Jan Kratochvil ++ ++ * dwarf2expr.c (read_sleb128): Fix signed extension overflowing host ++ `int'. ++ + 2011-07-11 Phil Muldoon + + PR python/12438 +--- src/gdb/dwarf2expr.c 2011/07/08 16:02:59 1.67 ++++ src/gdb/dwarf2expr.c 2011/07/11 13:40:23 1.68 +@@ -418,7 +418,7 @@ + break; + } + if (shift < (sizeof (*r) * 8) && (byte & 0x40) != 0) +- result |= -(1 << shift); ++ result |= -(((LONGEST) 1) << shift); + + *r = result; + return buf; +### src/gdb/testsuite/ChangeLog 2011/07/11 13:07:37 1.2788 +### src/gdb/testsuite/ChangeLog 2011/07/11 13:40:24 1.2789 +## -1,3 +1,10 @@ ++2011-07-11 Jan Kratochvil ++ ++ * gdb.dwarf2/dw2-const.S (Pointer size): Change from 4 to 8. ++ (DW_AT_high_pc, DW_AT_low_pc): Remove them. ++ (val8, .Ltype_const8, .Ltype_int8, DW_TAG_variable): New. ++ * gdb.dwarf2/dw2-const.exp (print/x val8): New test. ++ + 2011-07-11 Phil Muldoon + + PR python/12438 +--- src/gdb/testsuite/gdb.dwarf2/dw2-const.S 2011/01/01 15:33:44 1.4 ++++ src/gdb/testsuite/gdb.dwarf2/dw2-const.S 2011/07/11 13:40:24 1.5 +@@ -37,13 +37,11 @@ + .Lcu1_start: + .2byte 2 /* DWARF Version */ + .4byte .Labbrev1_begin /* Offset into abbrev section */ +- .byte 4 /* Pointer size */ ++ .byte 8 /* Pointer size */ + + /* CU die */ + .uleb128 1 /* Abbrev: DW_TAG_compile_unit */ + .4byte .Lline1_begin /* DW_AT_stmt_list */ +- .4byte .Lend_text1 /* DW_AT_high_pc */ +- .4byte .Lbegin_text1 /* DW_AT_low_pc */ + .ascii "file1.txt\0" /* DW_AT_name */ + .ascii "GNU C 3.3.3\0" /* DW_AT_producer */ + .byte 1 /* DW_AT_language (C) */ +@@ -57,6 +55,27 @@ + .uleb128 0x9 /* Abbrev: DW_TAG_const_type */ + .4byte .Ltype_int-.Lcu1_begin /* DW_AT_type */ + ++ .uleb128 0xa /* Abbrev: DW_TAG_variable */ ++ .ascii "val8\0" /* DW_AT_name */ ++ .4byte .Ltype_const8-.Lcu1_begin /* DW_AT_type */ ++ .byte 2f - 1f /* DW_AT_location */ ++1: .byte 0x11 /* DW_OP_consts */ ++#if 0 /* gas encodes it explicitly. */ ++ .slab128 0xffffffff00000000 ++#endif ++#if 0 /* gas encoded it correctly - formed GDB FAILed. */ ++ .sleb128 -4294967296 ++#endif ++#if 1 /* Rather encode sleb128 by hand. */ ++ .byte 0x80, 0x80, 0x80, 0x80, 0x70 ++#endif ++ .byte 0x9f /* DW_OP_stack_value */ ++2: ++ ++.Ltype_const8: ++ .uleb128 0x9 /* Abbrev: DW_TAG_const_type */ ++ .4byte .Ltype_int8-.Lcu1_begin /* DW_AT_type */ ++ + /* func_cu1 */ + .uleb128 2 /* Abbrev: DW_TAG_subprogram */ + .byte 1 /* DW_AT_external */ +@@ -64,8 +83,6 @@ + .byte 2 /* DW_AT_decl_line */ + .ascii "func_cu1\0" /* DW_AT_name */ + .4byte .Ltype_int-.Lcu1_begin /* DW_AT_type */ +- .4byte .Lbegin_func_cu1 /* DW_AT_low_pc */ +- .4byte .Lend_func_cu1 /* DW_AT_high_pc */ + .byte 1 /* DW_AT_frame_base: length */ + .byte 0x55 /* DW_AT_frame_base: DW_OP_reg5 */ + +@@ -75,6 +92,12 @@ + .byte 4 /* DW_AT_byte_size */ + .byte 5 /* DW_AT_encoding */ + ++.Ltype_int8: ++ .uleb128 3 /* Abbrev: DW_TAG_base_type */ ++ .ascii "int8\0" /* DW_AT_name */ ++ .byte 8 /* DW_AT_byte_size */ ++ .byte 5 /* DW_AT_encoding */ ++ + .byte 0 /* End of children of CU */ + + .Lcu1_end: +@@ -87,10 +110,6 @@ + .byte 1 /* has_children */ + .uleb128 0x10 /* DW_AT_stmt_list */ + .uleb128 0x6 /* DW_FORM_data4 */ +- .uleb128 0x12 /* DW_AT_high_pc */ +- .uleb128 0x1 /* DW_FORM_addr */ +- .uleb128 0x11 /* DW_AT_low_pc */ +- .uleb128 0x1 /* DW_FORM_addr */ + .uleb128 0x3 /* DW_AT_name */ + .uleb128 0x8 /* DW_FORM_string */ + .uleb128 0x25 /* DW_AT_producer */ +@@ -113,10 +132,6 @@ + .uleb128 0x8 /* DW_FORM_string */ + .uleb128 0x49 /* DW_AT_type */ + .uleb128 0x13 /* DW_FORM_ref4 */ +- .uleb128 0x11 /* DW_AT_low_pc */ +- .uleb128 0x1 /* DW_FORM_addr */ +- .uleb128 0x12 /* DW_AT_high_pc */ +- .uleb128 0x1 /* DW_FORM_addr */ + .uleb128 0x40 /* DW_AT_frame_base */ + .uleb128 0xa /* DW_FORM_block1 */ + .byte 0x0 /* Terminator */ +@@ -154,6 +169,18 @@ + .byte 0x0 /* Terminator */ + .byte 0x0 /* Terminator */ + ++ .uleb128 0xa /* abbrev code */ ++ .uleb128 0x34 /* TAG: DW_TAG_variable */ ++ .byte 0x0 /* DW_children_no */ ++ .uleb128 0x3 /* DW_AT_name */ ++ .uleb128 0x8 /* DW_FORM_string */ ++ .uleb128 0x49 /* DW_AT_type */ ++ .uleb128 0x13 /* DW_FORM_ref4 */ ++ .uleb128 0x02 /* DW_AT_location */ ++ .uleb128 0xa /* DW_FORM_block1 */ ++ .byte 0x0 /* Terminator */ ++ .byte 0x0 /* Terminator */ ++ + .byte 0x0 /* Terminator */ + .byte 0x0 /* Terminator */ + +--- src/gdb/testsuite/gdb.dwarf2/dw2-const.exp 2011/01/19 20:26:09 1.3 ++++ src/gdb/testsuite/gdb.dwarf2/dw2-const.exp 2011/07/11 13:40:24 1.4 +@@ -39,3 +39,4 @@ + + gdb_test "print twelve" "= 12" + ++gdb_test "print/x val8" " = 0xffffffff00000000" diff --git a/gdb.spec b/gdb.spec index 5c25290..2e9561f 100644 --- a/gdb.spec +++ b/gdb.spec @@ -27,7 +27,7 @@ Version: 7.3 # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 42%{?_with_upstream:.upstream}%{?dist} +Release: 43%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain Group: Development/Debuggers @@ -1265,6 +1265,9 @@ fi %{_infodir}/gdb.info* %changelog +* Tue Aug 16 2011 Jan Kratochvil - 7.3-43.fc15 +- Fix sleb128 reading (BZ 720332). + * Tue Aug 16 2011 Jan Kratochvil - 7.3-42.fc15 - Python command/function auto-loading (Phil Muldoon, BZ 730976).