diff options
95 files changed, 3542 insertions, 2638 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index be3ee82..88288e0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -65,6 +65,12 @@ repos: - id: isort types_or: [file] files: 'gdb/.*\.py(\.in)?$' + - repo: https://github.com/codespell-project/codespell + rev: v2.4.1 + hooks: + - id: codespell + files: '^(gdbsupport|gdbserver)/' + args: [--config, gdb/contrib/setup.cfg] - repo: local hooks: - id: check-include-guards diff --git a/bfd/elf-attrs.c b/bfd/elf-attrs.c index e80575b..bc653d7 100644 --- a/bfd/elf-attrs.c +++ b/bfd/elf-attrs.c @@ -510,8 +510,8 @@ bfd_elf_parse_attr_section_v1 (bfd *abfd, bfd_byte *p, bfd_byte *p_end) if (section_len <= 4) { _bfd_error_handler - (_("%pB: error: attribute section length too small: %ld"), - abfd, (long) section_len); + (_("%pB: error: attribute section length too small: %ld"), + abfd, (long) section_len); break; } section_len -= 4; @@ -541,15 +541,15 @@ bfd_elf_parse_attr_section_v1 (bfd *abfd, bfd_byte *p, bfd_byte *p_end) orig_p = p; tag = _bfd_safe_read_leb128 (abfd, &p, false, p_end); if (p_end - p >= 4) - { - subsection_len = bfd_get_32 (abfd, p); - p += 4; - } + { + subsection_len = bfd_get_32 (abfd, p); + p += 4; + } else - { - p = p_end; - break; - } + { + p = p_end; + break; + } if (subsection_len > section_len) subsection_len = section_len; section_len -= subsection_len; @@ -638,12 +638,12 @@ _bfd_elf_parse_attributes (bfd *abfd, Elf_Internal_Shdr * hdr) /* The first character is the version of the attributes. Currently only version 'A' is recognised here. */ if (*cursor != 'A') - { - _bfd_error_handler (_("%pB: error: unknown attributes version '%c'(%d) " - "- expecting 'A'\n"), abfd, *cursor, *cursor); - bfd_set_error (bfd_error_wrong_format); - goto free_data; - } + { + _bfd_error_handler (_("%pB: error: unknown attributes version '%c'(%d) " + "- expecting 'A'\n"), abfd, *cursor, *cursor); + bfd_set_error (bfd_error_wrong_format); + goto free_data; + } ++cursor; @@ -685,9 +685,9 @@ _bfd_elf_merge_object_attributes (bfd *ibfd, struct bfd_link_info *info) { _bfd_error_handler /* xgettext:c-format */ - (_("error: %pB: object has vendor-specific contents that " - "must be processed by the '%s' toolchain"), - ibfd, in_attr->s); + (_("error: %pB: object has vendor-specific contents that " + "must be processed by the '%s' toolchain"), + ibfd, in_attr->s); return false; } diff --git a/bfd/elf32-nds32.c b/bfd/elf32-nds32.c index e240c31..1aff60a 100644 --- a/bfd/elf32-nds32.c +++ b/bfd/elf32-nds32.c @@ -2692,7 +2692,7 @@ nds32_elf_do_9_pcrel_reloc (bfd * abfd, bfd_vma symbol_value, bfd_vma addend) { - bfd_signed_vma relocation; + bfd_vma relocation; unsigned short x; bfd_reloc_status_type status; @@ -2708,7 +2708,7 @@ nds32_elf_do_9_pcrel_reloc (bfd * abfd, before doing pcrel calculations. */ relocation -= (offset & -(bfd_vma) 2); - if (relocation < -ACCURATE_8BIT_S1 || relocation >= ACCURATE_8BIT_S1) + if (relocation + ACCURATE_8BIT_S1 >= 2 * ACCURATE_8BIT_S1) status = bfd_reloc_overflow; else status = bfd_reloc_ok; diff --git a/bfd/version.h b/bfd/version.h index d642861..8cb9007 100644 --- a/bfd/version.h +++ b/bfd/version.h @@ -16,7 +16,7 @@ In releases, the date is not included in either version strings or sonames. */ -#define BFD_VERSION_DATE 20250328 +#define BFD_VERSION_DATE 20250403 #define BFD_VERSION @bfd_version@ #define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@ #define REPORT_BUGS_TO @report_bugs_to@ diff --git a/binutils/debug.c b/binutils/debug.c index dcc8ccd..465b18e 100644 --- a/binutils/debug.c +++ b/binutils/debug.c @@ -2554,9 +2554,6 @@ debug_write_type (struct debug_handle *info, case DEBUG_KIND_UNION_CLASS: return debug_write_class_type (info, fns, fhandle, type, tag); case DEBUG_KIND_ENUM: - if (type->u.kenum == NULL) - return (*fns->enum_type) (fhandle, tag, (const char **) NULL, - (bfd_signed_vma *) NULL); return (*fns->enum_type) (fhandle, tag, type->u.kenum->names, type->u.kenum->values); case DEBUG_KIND_POINTER: @@ -3097,9 +3094,9 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1, break; case DEBUG_KIND_ENUM: - if (t1->u.kenum == NULL) - ret = t2->u.kenum == NULL; - else if (t2->u.kenum == NULL) + if (t1->u.kenum->names == NULL) + ret = t2->u.kenum->names == NULL; + else if (t2->u.kenum->names == NULL) ret = false; else { diff --git a/binutils/testsuite/binutils-all/compress.exp b/binutils/testsuite/binutils-all/compress.exp index 5db9417..db167f0 100644 --- a/binutils/testsuite/binutils-all/compress.exp +++ b/binutils/testsuite/binutils-all/compress.exp @@ -163,24 +163,24 @@ if ![string match "" $got] then { } set testname "objdump compress debug sections" -set got [remote_exec host "$OBJDUMP -W ${compressedfile}.o" "" "/dev/null" "objdump.out"] +set got [remote_exec host "$OBJDUMP -W ${compressedfile}.o" "" "/dev/null" "tmpdir/objdump.out"] if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { fail "$testname" send_log "$got\n" } -if { [regexp_diff objdump.out $srcdir/$subdir/dw2-1.W] } then { +if { [regexp_diff tmpdir/objdump.out $srcdir/$subdir/dw2-1.W] } then { fail "$testname" } else { pass "$testname" } set testname "objdump compress debug sections 3" -set got [remote_exec host "$OBJDUMP -W ${compressedfile3}.o" "" "/dev/null" "objdump.out"] +set got [remote_exec host "$OBJDUMP -W ${compressedfile3}.o" "" "/dev/null" "tmpdir/objdump.out"] if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { fail "$testname" send_log "$got\n" } -if { [regexp_diff objdump.out $srcdir/$subdir/dw2-3.W] } then { +if { [regexp_diff tmpdir/objdump.out $srcdir/$subdir/dw2-3.W] } then { fail "$testname" } else { pass "$testname" @@ -565,12 +565,12 @@ if ![string match "" $got] then { } set testname "objdump compress debug sections 3 with zlib-gabi" -set got [remote_exec host "$OBJDUMP -W ${compressedfile3}gabi.o" "" "/dev/null" "objdump.out"] +set got [remote_exec host "$OBJDUMP -W ${compressedfile3}gabi.o" "" "/dev/null" "tmpdir/objdump.out"] if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { fail "$testname" send_log "$got\n" } -if { [regexp_diff objdump.out $srcdir/$subdir/dw2-3gabi.W] } then { +if { [regexp_diff tmpdir/objdump.out $srcdir/$subdir/dw2-3gabi.W] } then { fail "$testname" } else { pass "$testname" @@ -639,7 +639,7 @@ proc convert_test { testname as_flags objcop_flags } { return } - set got [remote_exec host "$OBJDUMP -W ${copyfile}.o" "" "/dev/null" "objdump.out"] + set got [remote_exec host "$OBJDUMP -W ${copyfile}.o" "" "/dev/null" "tmpdir/objdump.out"] if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { fail "$testname (reason: unexpected output)" @@ -648,7 +648,7 @@ proc convert_test { testname as_flags objcop_flags } { return } - if { [regexp_diff objdump.out $srcdir/$subdir/dw2-3.W] } then { + if { [regexp_diff tmpdir/objdump.out $srcdir/$subdir/dw2-3.W] } then { fail "$testname" } else { pass "$testname" diff --git a/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp index 76ee30f..f3142b1 100644 --- a/binutils/testsuite/binutils-all/objdump.exp +++ b/binutils/testsuite/binutils-all/objdump.exp @@ -454,7 +454,7 @@ if { ![is_elf_format] } then { set compressed_testfile tmpdir/dw2-compressed.${obj} } - set got [remote_exec host "$OBJDUMP $OBJDUMPFLAGS -s -j .zdebug_abbrev $compressed_testfile" "" "/dev/null" "objdump.out"] + set got [remote_exec host "$OBJDUMP $OBJDUMPFLAGS -s -j .zdebug_abbrev $compressed_testfile" "" "/dev/null" "tmpdir/objdump.out"] if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { fail "objdump -s -j .zdebug_abbrev (reason: unexpected output)" @@ -462,7 +462,7 @@ if { ![is_elf_format] } then { send_log "\n" } - if { [regexp_diff objdump.out $srcdir/$subdir/objdump.s] } then { + if { [regexp_diff tmpdir/objdump.out $srcdir/$subdir/objdump.s] } then { fail "objdump -s -j .zdebug_abbrev" } else { pass "objdump -s -j .zdebug_abbrev" @@ -470,7 +470,7 @@ if { ![is_elf_format] } then { # Test objdump -W on a file that contains some compressed .debug sections - set got [remote_exec host "$OBJDUMP $OBJDUMPFLAGS -W $compressed_testfile" "" "/dev/null" "objdump.out"] + set got [remote_exec host "$OBJDUMP $OBJDUMPFLAGS -W $compressed_testfile" "" "/dev/null" "tmpdir/objdump.out"] if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { fail "objdump -W (reason: unexpected output)" @@ -478,7 +478,7 @@ if { ![is_elf_format] } then { send_log "\n" } - if { [regexp_diff objdump.out $srcdir/$subdir/objdump.W] } then { + if { [regexp_diff tmpdir/objdump.out $srcdir/$subdir/objdump.W] } then { fail "objdump -W" } else { pass "objdump -W" @@ -486,7 +486,7 @@ if { ![is_elf_format] } then { # Test objdump -Z -s on a file that contains some compressed .debug sections - set got [remote_exec host "$OBJDUMP $OBJDUMPFLAGS -Z -s -j .zdebug_abbrev $compressed_testfile" "" "/dev/null" "objdump.out"] + set got [remote_exec host "$OBJDUMP $OBJDUMPFLAGS -Z -s -j .zdebug_abbrev $compressed_testfile" "" "/dev/null" "tmpdir/objdump.out"] if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { fail "objdump -Z -s (reason: unexpected output)" @@ -494,7 +494,7 @@ if { ![is_elf_format] } then { send_log "\n" } - if { [regexp_diff objdump.out $srcdir/$subdir/objdump.Zs] } then { + if { [regexp_diff tmpdir/objdump.out $srcdir/$subdir/objdump.Zs] } then { fail "objdump -Z -s" } else { pass "objdump -Z -s" @@ -530,7 +530,7 @@ if { ![is_elf_format] set decodedline_testfile tmpdir/dw2-decodedline.${obj} } - set got [remote_exec host "$OBJDUMP $OBJDUMPFLAGS -WL $decodedline_testfile" "" "/dev/null" "objdump.out"] + set got [remote_exec host "$OBJDUMP $OBJDUMPFLAGS -WL $decodedline_testfile" "" "/dev/null" "tmpdir/objdump.out"] if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { fail "objdump -WL (reason: unexpected output)" @@ -538,7 +538,7 @@ if { ![is_elf_format] send_log "\n" } - if { [regexp_diff objdump.out $srcdir/$subdir/objdump.WL] } then { + if { [regexp_diff tmpdir/objdump.out $srcdir/$subdir/objdump.WL] } then { fail "objdump -WL" } else { pass "objdump -WL" @@ -558,7 +558,7 @@ if { ![is_elf_format] } then { set ranges_testfile tmpdir/dw2-ranges.${obj} } - set got [remote_exec host "$OBJDUMP $OBJDUMPFLAGS --dwarf=Ranges $ranges_testfile" "" "/dev/null" "objdump.out"] + set got [remote_exec host "$OBJDUMP $OBJDUMPFLAGS --dwarf=Ranges $ranges_testfile" "" "/dev/null" "tmpdir/objdump.out"] if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { fail "objdump -W for debug_ranges (reason: unexpected output)" @@ -567,7 +567,7 @@ if { ![is_elf_format] } then { } setup_xfail "msp430-*-*" - if { [regexp_diff objdump.out $srcdir/$subdir/dw2-ranges.W] } then { + if { [regexp_diff tmpdir/objdump.out $srcdir/$subdir/dw2-ranges.W] } then { fail "objdump -W for debug_ranges" } else { pass "objdump -W for debug_ranges" @@ -587,7 +587,7 @@ if { ![is_elf_format] } then { set op_testfile tmpdir/dw5-op.${obj} } - set got [remote_exec host "$OBJDUMP $OBJDUMPFLAGS -Wi $op_testfile" "" "/dev/null" "objdump.out"] + set got [remote_exec host "$OBJDUMP $OBJDUMPFLAGS -Wi $op_testfile" "" "/dev/null" "tmpdir/objdump.out"] if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { fail "objdump -Wi (reason: unexpected output)" @@ -595,8 +595,8 @@ if { ![is_elf_format] } then { send_log "\n" } - set got [remote_exec host "tail -n +4 objdump.out" "" "/dev/null" "objdump.out"] - set output [remote_upload host objdump.out] + set got [remote_exec host "tail -n +4 tmpdir/objdump.out" "" "/dev/null" "tmpdir/objdump.tail"] + set output [remote_upload host tmpdir/objdump.tail] if ![file size $output] then { # If the output file is empty, then this target does not @@ -606,7 +606,7 @@ if { ![is_elf_format] } then { return } - if { [regexp_diff objdump.out $srcdir/$subdir/dw5-op.W] } then { + if { [regexp_diff tmpdir/objdump.tail $srcdir/$subdir/dw5-op.W] } then { fail "objdump -Wi for DW_OP_*" } else { pass "objdump -Wi for DW_OP_*" @@ -712,7 +712,7 @@ if { [is_elf_format] } then { set testfile tmpdir/debuglink.${obj} } - set got [remote_exec host "$OBJDUMP $OBJDUMPFLAGS -Wk -WN $testfile" "" "/dev/null" "objdump.out"] + set got [remote_exec host "$OBJDUMP $OBJDUMPFLAGS -Wk -WN $testfile" "" "/dev/null" "tmpdir/objdump.out"] if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { fail "objdump -Wk (reason: unexpected output)" @@ -720,7 +720,7 @@ if { [is_elf_format] } then { send_log "\n" } - if { [regexp_diff objdump.out $srcdir/$subdir/objdump.Wk] } then { + if { [regexp_diff tmpdir/objdump.out $srcdir/$subdir/objdump.Wk] } then { fail "objdump -Wk (reason: output does not match expectations)" } else { pass "objdump -Wk" @@ -764,7 +764,7 @@ proc test_follow_debuglink { options dumpfile } { if { [regexp_diff tmpdir/objdump.out $srcdir/$subdir/$dumpfile] } then { fail $test - verbose "output is \n[file_contents objdump.out]" 2 + verbose "output is \n[file_contents tmpdir/objdump.out]" 2 return } diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 2319840..2c61353 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -513,6 +513,9 @@ static struct pseudo_prefixes { disp_encoding_32bit } disp_encoding; + /* Exclude sign-extended 8bit immediate in encoding. */ + bool no_imm8s; + /* Prefer the REX byte in encoding. */ bool rex_encoding; @@ -2589,6 +2592,19 @@ operand_size_match (const insn_template *t) /* Check memory and accumulator operand size. */ for (j = 0; j < i.operands; j++) { + /* Instruction templates with only sign-extended 8-bit immediate + operand also have a second template with full-operand-size + immediate operand under a different opcode. Don't match the + first template if sign-extended 8-bit immediate operand should + be excluded. */ + if (pp.no_imm8s + && !t->operand_types[j].bitfield.imm8 + && t->operand_types[j].bitfield.imm8s) + { + match = 0; + break; + } + if (i.types[j].bitfield.class != Reg && i.types[j].bitfield.class != RegSIMD && t->opcode_modifier.operandconstraint == ANY_SIZE) @@ -7764,6 +7780,10 @@ parse_insn (const char *line, char *mnemonic, enum parse_mode mode) /* {nooptimize} */ pp.no_optimize = true; break; + case Prefix_NoImm8s: + /* {noimm8s} */ + pp.no_imm8s = true; + break; default: abort (); } diff --git a/gas/doc/c-i386.texi b/gas/doc/c-i386.texi index 4d59958..b1f3b04 100644 --- a/gas/doc/c-i386.texi +++ b/gas/doc/c-i386.texi @@ -1046,6 +1046,9 @@ prefix which generates REX prefix unconditionally. instructions (APX_F only). @item +@samp{@{noimm8s@}} -- exclude sign-extended 8-bit immediate. + +@item @samp{@{nooptimize@}} -- disable instruction size optimization. @end itemize diff --git a/gas/testsuite/gas/i386/pseudos.d b/gas/testsuite/gas/i386/pseudos.d index 47dca19..5c0bc3b 100644 --- a/gas/testsuite/gas/i386/pseudos.d +++ b/gas/testsuite/gas/i386/pseudos.d @@ -443,4 +443,29 @@ Disassembly of section .text: +[a-f0-9]+: 67 8a 86 00 00 mov 0x0\(%bp\),%al +[a-f0-9]+: e9 fb ff ff ff jmp [0-9a-f]* <.*> +[a-f0-9]+: e9 fd ff ff ff jmp [0-9a-f]* <.*> + +[a-f0-9]+: 81 03 00 00 00 00 addl \$0x0,\(%ebx\) + +[a-f0-9]+: 81 03 ff 00 00 00 addl \$0xff,\(%ebx\) + +[a-f0-9]+: 66 81 03 00 00 addw \$0x0,\(%ebx\) + +[a-f0-9]+: 66 81 03 ff 00 addw \$0xff,\(%ebx\) + +[a-f0-9]+: 80 03 00 addb \$0x0,\(%ebx\) + +[a-f0-9]+: 80 03 ff addb \$0xff,\(%ebx\) + +[a-f0-9]+: 81 c3 00 00 00 00 add \$0x0,%ebx + +[a-f0-9]+: 81 c3 ff 00 00 00 add \$0xff,%ebx + +[a-f0-9]+: 66 81 c3 00 00 add \$0x0,%bx + +[a-f0-9]+: 66 81 c3 ff 00 add \$0xff,%bx + +[a-f0-9]+: 80 c3 00 add \$0x0,%bl + +[a-f0-9]+: 80 c3 ff add \$0xff,%bl + +[a-f0-9]+: c7 03 00 00 00 00 movl \$0x0,\(%ebx\) + +[a-f0-9]+: c7 03 ff 00 00 00 movl \$0xff,\(%ebx\) + +[a-f0-9]+: 66 c7 03 00 00 movw \$0x0,\(%ebx\) + +[a-f0-9]+: 66 c7 03 ff 00 movw \$0xff,\(%ebx\) + +[a-f0-9]+: c6 03 00 movb \$0x0,\(%ebx\) + +[a-f0-9]+: c6 03 ff movb \$0xff,\(%ebx\) + +[a-f0-9]+: bb 00 00 00 00 mov \$0x0,%ebx + +[a-f0-9]+: bb ff 00 00 00 mov \$0xff,%ebx + +[a-f0-9]+: 66 bb 00 00 mov \$0x0,%bx + +[a-f0-9]+: 66 bb ff 00 mov \$0xff,%bx + +[a-f0-9]+: b3 00 mov \$0x0,%bl + +[a-f0-9]+: b3 ff mov \$0xff,%bl + +[a-f0-9]+: c1 c3 ff rol \$0xff,%ebx #pass diff --git a/gas/testsuite/gas/i386/pseudos.s b/gas/testsuite/gas/i386/pseudos.s index 7e3600e..3806b23 100644 --- a/gas/testsuite/gas/i386/pseudos.s +++ b/gas/testsuite/gas/i386/pseudos.s @@ -408,3 +408,31 @@ _start: .code16 {disp16} jmp . .byte -1, -1 + + .att_syntax prefix + .code32 +{noimm8s} addl $0,(%ebx) +{noimm8s} addl $255,(%ebx) +{noimm8s} addw $0,(%ebx) +{noimm8s} addw $255,(%ebx) +{noimm8s} addb $0,(%ebx) +{noimm8s} addb $255,(%ebx) +{noimm8s} add $0,%ebx +{noimm8s} add $255,%ebx +{noimm8s} add $0,%bx +{noimm8s} add $255,%bx +{noimm8s} add $0,%bl +{noimm8s} add $255,%bl +{noimm8s} movl $0,(%ebx) +{noimm8s} movl $255,(%ebx) +{noimm8s} movw $0,(%ebx) +{noimm8s} movw $255,(%ebx) +{noimm8s} movb $0,(%ebx) +{noimm8s} movb $255,(%ebx) +{noimm8s} mov $0,%ebx +{noimm8s} mov $255,%ebx +{noimm8s} mov $0,%bx +{noimm8s} mov $255,%bx +{noimm8s} mov $0,%bl +{noimm8s} mov $255,%bl +{noimm8s} rol $255,%ebx diff --git a/gas/testsuite/gas/i386/x86-64-pseudos.d b/gas/testsuite/gas/i386/x86-64-pseudos.d index ea5a358..5a43901 100644 --- a/gas/testsuite/gas/i386/x86-64-pseudos.d +++ b/gas/testsuite/gas/i386/x86-64-pseudos.d @@ -534,4 +534,36 @@ Disassembly of section .text: +[a-f0-9]+: 67 41 8a 45 00 mov 0x0\(%r13d\),%al +[a-f0-9]+: 67 41 8a 85 00 00 00 00 mov 0x0\(%r13d\),%al +[a-f0-9]+: 40 8a c1 rex mov %cl,%al + +[a-f0-9]+: 48 81 03 00 00 00 00 addq \$0x0,\(%rbx\) + +[a-f0-9]+: 48 81 03 ff 00 00 00 addq \$0xff,\(%rbx\) + +[a-f0-9]+: 81 03 00 00 00 00 addl \$0x0,\(%rbx\) + +[a-f0-9]+: 81 03 ff 00 00 00 addl \$0xff,\(%rbx\) + +[a-f0-9]+: 66 81 03 00 00 addw \$0x0,\(%rbx\) + +[a-f0-9]+: 66 81 03 ff 00 addw \$0xff,\(%rbx\) + +[a-f0-9]+: 80 03 00 addb \$0x0,\(%rbx\) + +[a-f0-9]+: 80 03 ff addb \$0xff,\(%rbx\) + +[a-f0-9]+: 48 81 c3 00 00 00 00 add \$0x0,%rbx + +[a-f0-9]+: 48 81 c3 ff 00 00 00 add \$0xff,%rbx + +[a-f0-9]+: 81 c3 00 00 00 00 add \$0x0,%ebx + +[a-f0-9]+: 81 c3 ff 00 00 00 add \$0xff,%ebx + +[a-f0-9]+: 66 81 c3 00 00 add \$0x0,%bx + +[a-f0-9]+: 66 81 c3 ff 00 add \$0xff,%bx + +[a-f0-9]+: 80 c3 00 add \$0x0,%bl + +[a-f0-9]+: 80 c3 ff add \$0xff,%bl + +[a-f0-9]+: 48 c7 03 00 00 00 00 movq \$0x0,\(%rbx\) + +[a-f0-9]+: 48 c7 03 ff 00 00 00 movq \$0xff,\(%rbx\) + +[a-f0-9]+: c7 03 00 00 00 00 movl \$0x0,\(%rbx\) + +[a-f0-9]+: c7 03 ff 00 00 00 movl \$0xff,\(%rbx\) + +[a-f0-9]+: 66 c7 03 00 00 movw \$0x0,\(%rbx\) + +[a-f0-9]+: 66 c7 03 ff 00 movw \$0xff,\(%rbx\) + +[a-f0-9]+: c6 03 00 movb \$0x0,\(%rbx\) + +[a-f0-9]+: c6 03 ff movb \$0xff,\(%rbx\) + +[a-f0-9]+: bb 00 00 00 00 mov \$0x0,%ebx + +[a-f0-9]+: bb ff 00 00 00 mov \$0xff,%ebx + +[a-f0-9]+: 66 bb 00 00 mov \$0x0,%bx + +[a-f0-9]+: 66 bb ff 00 mov \$0xff,%bx + +[a-f0-9]+: b3 00 mov \$0x0,%bl + +[a-f0-9]+: b3 ff mov \$0xff,%bl + +[a-f0-9]+: 48 c1 c3 ff rol \$0xff,%rbx + +[a-f0-9]+: c1 c3 ff rol \$0xff,%ebx #pass diff --git a/gas/testsuite/gas/i386/x86-64-pseudos.s b/gas/testsuite/gas/i386/x86-64-pseudos.s index 041f98e..3658f34 100644 --- a/gas/testsuite/gas/i386/x86-64-pseudos.s +++ b/gas/testsuite/gas/i386/x86-64-pseudos.s @@ -504,3 +504,37 @@ _start: {disp32} mov al, BYTE PTR [r13d] .insn {rex} 0x8a, al, cl + + .att_syntax prefix +{noimm8s} addq $0,(%rbx) +{noimm8s} addq $255,(%rbx) +{noimm8s} addl $0,(%rbx) +{noimm8s} addl $255,(%rbx) +{noimm8s} addw $0,(%rbx) +{noimm8s} addw $255,(%rbx) +{noimm8s} addb $0,(%rbx) +{noimm8s} addb $255,(%rbx) +{noimm8s} add $0,%rbx +{noimm8s} add $255,%rbx +{noimm8s} add $0,%ebx +{noimm8s} add $255,%ebx +{noimm8s} add $0,%bx +{noimm8s} add $255,%bx +{noimm8s} add $0,%bl +{noimm8s} add $255,%bl +{noimm8s} movq $0,(%rbx) +{noimm8s} movq $255,(%rbx) +{noimm8s} movl $0,(%rbx) +{noimm8s} movl $255,(%rbx) +{noimm8s} movw $0,(%rbx) +{noimm8s} movw $255,(%rbx) +{noimm8s} movb $0,(%rbx) +{noimm8s} movb $255,(%rbx) +{noimm8s} mov $0,%ebx +{noimm8s} mov $255,%ebx +{noimm8s} mov $0,%bx +{noimm8s} mov $255,%bx +{noimm8s} mov $0,%bl +{noimm8s} mov $255,%bl +{noimm8s} rol $255,%rbx +{noimm8s} rol $255,%ebx diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 6203bcf..0c4102d 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1097,7 +1097,9 @@ COMMON_SFILES = \ dwarf2/attribute.c \ dwarf2/comp-unit-head.c \ dwarf2/cooked-index.c \ - dwarf2/cooked-index-storage.c \ + dwarf2/cooked-index-entry.c \ + dwarf2/cooked-index-shard.c \ + dwarf2/cooked-index-worker.c \ dwarf2/cooked-indexer.c \ dwarf2/cu.c \ dwarf2/die.c \ @@ -1356,7 +1358,9 @@ HFILES_NO_SRCDIR = \ dummy-frame.h \ dwarf2/aranges.h \ dwarf2/cooked-index.h \ - dwarf2/cooked-index-storage.h \ + dwarf2/cooked-index-entry.h \ + dwarf2/cooked-index-shard.h \ + dwarf2/cooked-index-worker.h \ dwarf2/cooked-indexer.h \ dwarf2/cu.h \ dwarf2/frame-tailcall.h \ diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c index 0b4ae7f..c825699 100644 --- a/gdb/aarch64-linux-tdep.c +++ b/gdb/aarch64-linux-tdep.c @@ -2275,7 +2275,7 @@ aarch64_canonicalize_syscall (enum aarch64_syscall syscall_number) SYSCALL_MAP (clone); SYSCALL_MAP (execve); - SYSCALL_MAP_RENAME (mmap, gdb_sys_mmap2); + SYSCALL_MAP_RENAME (mmap, gdb_sys_old_mmap); SYSCALL_MAP (fadvise64); SYSCALL_MAP (swapon); diff --git a/gdb/addrmap.c b/gdb/addrmap.c index 9eb330b..1fc95f3 100644 --- a/gdb/addrmap.c +++ b/gdb/addrmap.c @@ -178,6 +178,29 @@ addrmap_mutable::force_transition (CORE_ADDR addr) } +/* Compare keys as CORE_ADDR * values. */ +static int +splay_compare_CORE_ADDR_ptr (splay_tree_key ak, splay_tree_key bk) +{ + CORE_ADDR a = * (CORE_ADDR *) ak; + CORE_ADDR b = * (CORE_ADDR *) bk; + + /* We can't just return a-b here, because of over/underflow. */ + if (a < b) + return -1; + else if (a == b) + return 0; + else + return 1; +} + + +static void +xfree_wrapper (splay_tree_key key) +{ + xfree ((void *) key); +} + void addrmap_mutable::set_empty (CORE_ADDR start, CORE_ADDR end_inclusive, void *obj) @@ -185,6 +208,10 @@ addrmap_mutable::set_empty (CORE_ADDR start, CORE_ADDR end_inclusive, splay_tree_node n, next; void *prior_value; + if (tree == nullptr) + tree = splay_tree_new (splay_compare_CORE_ADDR_ptr, xfree_wrapper, + nullptr /* no delete value */); + /* If we're being asked to set all empty portions of the given address range to empty, then probably the caller is confused. (If that turns out to be useful in some cases, then we can change @@ -233,6 +260,9 @@ addrmap_mutable::set_empty (CORE_ADDR start, CORE_ADDR end_inclusive, void * addrmap_mutable::do_find (CORE_ADDR addr) const { + if (tree == nullptr) + return nullptr; + splay_tree_node n = splay_tree_lookup (addr); if (n != nullptr) { @@ -287,16 +317,6 @@ addrmap_fixed::addrmap_fixed (struct obstack *obstack, gdb_assert (num_transitions == transition_count); } - -void -addrmap_mutable::relocate (CORE_ADDR offset) -{ - /* Not needed yet. */ - internal_error (_("addrmap_relocate is not implemented yet " - "for mutable addrmaps")); -} - - /* This is a splay_tree_foreach_fn. */ static int @@ -311,43 +331,20 @@ addrmap_mutable_foreach_worker (splay_tree_node node, void *data) int addrmap_mutable::do_foreach (addrmap_foreach_fn fn) const { - return splay_tree_foreach (tree, addrmap_mutable_foreach_worker, &fn); -} - - -/* Compare keys as CORE_ADDR * values. */ -static int -splay_compare_CORE_ADDR_ptr (splay_tree_key ak, splay_tree_key bk) -{ - CORE_ADDR a = * (CORE_ADDR *) ak; - CORE_ADDR b = * (CORE_ADDR *) bk; - - /* We can't just return a-b here, because of over/underflow. */ - if (a < b) - return -1; - else if (a == b) + if (tree == nullptr) return 0; - else - return 1; -} - - -static void -xfree_wrapper (splay_tree_key key) -{ - xfree ((void *) key); + return splay_tree_foreach (tree, addrmap_mutable_foreach_worker, &fn); } -addrmap_mutable::addrmap_mutable () - : tree (splay_tree_new (splay_compare_CORE_ADDR_ptr, xfree_wrapper, - nullptr /* no delete value */)) -{ -} -addrmap_mutable::~addrmap_mutable () +void +addrmap_mutable::clear () { if (tree != nullptr) - splay_tree_delete (tree); + { + splay_tree_delete (tree); + tree = nullptr; + } } @@ -443,7 +440,7 @@ test_addrmap () CHECK_ADDRMAP_FIND (map, array, 13, 19, nullptr); /* Create corresponding fixed addrmap. */ - struct addrmap *map2 + addrmap_fixed *map2 = new (&temp_obstack) addrmap_fixed (&temp_obstack, map.get ()); SELF_CHECK (map2 != nullptr); CHECK_ADDRMAP_FIND (map2, array, 0, 9, nullptr); diff --git a/gdb/addrmap.h b/gdb/addrmap.h index 95f6ec8..a2feb68 100644 --- a/gdb/addrmap.h +++ b/gdb/addrmap.h @@ -52,10 +52,6 @@ struct addrmap void *find (CORE_ADDR addr) { return this->do_find (addr); } - /* Relocate all the addresses in MAP by OFFSET. (This can be applied - to either mutable or immutable maps.) */ - virtual void relocate (CORE_ADDR offset) = 0; - /* Call FN for every address in MAP, following an in-order traversal. If FN ever returns a non-zero value, the iteration ceases immediately, and the value is returned. Otherwise, this function @@ -94,7 +90,8 @@ public: addrmap_fixed (addrmap_fixed &&other) = default; addrmap_fixed &operator= (addrmap_fixed &&) = default; - void relocate (CORE_ADDR offset) override; + /* Relocate all the addresses in this map by OFFSET. */ + void relocate (CORE_ADDR offset); private: void *do_find (CORE_ADDR addr) const override; @@ -126,8 +123,12 @@ struct addrmap_mutable final : public addrmap { public: - addrmap_mutable (); - ~addrmap_mutable (); + addrmap_mutable () = default; + ~addrmap_mutable () + { + clear (); + } + DISABLE_COPY_AND_ASSIGN (addrmap_mutable); addrmap_mutable (addrmap_mutable &&other) @@ -138,7 +139,13 @@ public: addrmap_mutable &operator= (addrmap_mutable &&other) { - std::swap (tree, other.tree); + /* Handle self-move. */ + if (this != &other) + { + clear (); + tree = other.tree; + other.tree = nullptr; + } return *this; } @@ -181,7 +188,9 @@ public: representation. */ void set_empty (CORE_ADDR start, CORE_ADDR end_inclusive, void *obj); - void relocate (CORE_ADDR offset) override; + + /* Clear this addrmap. */ + void clear (); private: void *do_find (CORE_ADDR addr) const override; @@ -204,7 +213,7 @@ private: function, we can't keep a freelist for keys. Since mutable addrmaps are only used temporarily right now, we just leak keys from deleted nodes; they'll be freed when the obstack is freed. */ - splay_tree tree; + splay_tree tree = nullptr; /* Various helper methods. */ splay_tree_key allocate_key (CORE_ADDR addr); diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c index e290d2c..a7868c3 100644 --- a/gdb/amd64-linux-tdep.c +++ b/gdb/amd64-linux-tdep.c @@ -412,7 +412,7 @@ amd64_canonicalize_syscall (enum amd64_syscall syscall_number) case amd64_sys_mmap: case amd64_x32_sys_mmap: - return gdb_sys_mmap2; + return gdb_sys_old_mmap; case amd64_sys_mprotect: case amd64_x32_sys_mprotect: diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c index 858705e..53c8a05 100644 --- a/gdb/arm-linux-tdep.c +++ b/gdb/arm-linux-tdep.c @@ -1361,8 +1361,8 @@ arm_canonicalize_syscall (int syscall) case 86: return gdb_sys_uselib; case 87: return gdb_sys_swapon; case 88: return gdb_sys_reboot; - case 89: return gdb_old_readdir; - case 90: return gdb_old_mmap; + case 89: return gdb_sys_old_readdir; + case 90: return gdb_sys_old_mmap; case 91: return gdb_sys_munmap; case 92: return gdb_sys_truncate; case 93: return gdb_sys_ftruncate; diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 3085ca1..0fb6fd9 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -1535,6 +1535,11 @@ void breakpoint_set_commands (struct breakpoint *b, counted_command_line &&commands) { + /* If the commands have not changed then there's no need to update + anything, and no need to emit a breakpoint modified event. */ + if (commands_equal (b->commands.get (), commands.get ())) + return; + validate_commands_for_breakpoint (b, commands.get ()); b->commands = std::move (commands); @@ -3099,7 +3104,6 @@ insert_bp_location (struct bp_location *bl, || shared_objfile_contains_address_p (bl->pspace, bl->address))) { - /* See also: disable_breakpoints_in_shlibs. */ bl->shlib_disabled = 1; notify_breakpoint_modified (bl->owner); if (!*disabled_breaks) @@ -8079,44 +8083,19 @@ create_and_insert_solib_event_breakpoint (struct gdbarch *gdbarch, CORE_ADDR add return b; } -/* See breakpoint.h. */ - -void -disable_breakpoints_in_shlibs (program_space *pspace) -{ - for (bp_location *loc : all_bp_locations ()) - { - /* ALL_BP_LOCATIONS bp_location has LOC->OWNER always non-NULL. */ - struct breakpoint *b = loc->owner; - - /* We apply the check to all breakpoints, including disabled for - those with loc->duplicate set. This is so that when breakpoint - becomes enabled, or the duplicate is removed, gdb will try to - insert all breakpoints. If we don't set shlib_disabled here, - we'll try to insert those breakpoints and fail. */ - if (((b->type == bp_jit_event) - || is_breakpoint (b) - || is_tracepoint (b)) - && loc->pspace == pspace - && !loc->shlib_disabled - && solib_name_from_address (loc->pspace, loc->address) - ) - { - loc->shlib_disabled = 1; - } - } -} - /* Disable any breakpoints and tracepoints that are in SOLIB upon notification of unloaded_shlib. Only apply to enabled breakpoints, disabled ones can just stay disabled. When STILL_IN_USE is true, SOLIB hasn't really been unmapped from - the inferior. In this case, don't disable anything. */ + the inferior. In this case, don't disable anything. + + When SILENT is false notify the user if any breakpoints are disabled, + otherwise, still disable the breakpoints, but don't tell the user. */ static void disable_breakpoints_in_unloaded_shlib (program_space *pspace, const solib &solib, - bool still_in_use) + bool still_in_use, bool silent) { if (still_in_use) return; @@ -8160,7 +8139,7 @@ disable_breakpoints_in_unloaded_shlib (program_space *pspace, const solib &solib bp_modified = true; - if (!disabled_shlib_breaks && user_breakpoint_p (&b)) + if (!disabled_shlib_breaks && !silent && user_breakpoint_p (&b)) { target_terminal::ours_for_output (); warning (_("Temporarily disabling breakpoints " diff --git a/gdb/bsd-uthread.c b/gdb/bsd-uthread.c index 67db0ca..129e7a6 100644 --- a/gdb/bsd-uthread.c +++ b/gdb/bsd-uthread.c @@ -295,7 +295,7 @@ bsd_uthread_solib_loaded (solib &so) static void bsd_uthread_solib_unloaded (program_space *pspace, const solib &so, - bool still_in_use) + bool still_in_use, bool /* silent */) { if (bsd_uthread_solib_name.empty () || still_in_use) return; diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c index c14480f..0337d01 100644 --- a/gdb/cli/cli-script.c +++ b/gdb/cli/cli-script.c @@ -1625,6 +1625,65 @@ define_prefix_command (const char *comname, int from_tty) c->allow_unknown = c->user_commands.get () != nullptr; } +/* See cli/cli-script.h. */ + +bool +commands_equal (const command_line *a, const command_line *b) +{ + if ((a == nullptr) != (b == nullptr)) + return false; + + while (a != nullptr) + { + /* We are either at the end of both command lists, or there's + another command in both lists. */ + if ((a->next == nullptr) != (b->next == nullptr)) + return false; + + /* There's a command line for both, or neither. */ + if ((a->line == nullptr) != (b->line == nullptr)) + return false; + + /* Check control_type matches. */ + if (a->control_type != b->control_type) + return false; + + if (a->control_type == compile_control) + { + if (a->control_u.compile.scope != b->control_u.compile.scope) + return false; + + /* This is where we "fail safe". The scope_data is a 'void *' + pointer which changes in meaning based on the value of + 'scope'. It is possible that two different 'void *' pointers + could point to the equal scope data, however, we just assume + that if the pointers are different, then the scope_data is + different. This could be improved in the future. */ + if (a->control_u.compile.scope_data + != b->control_u.compile.scope_data) + return false; + } + + /* Check lines are identical. */ + if (a->line != nullptr && strcmp (a->line, b->line) != 0) + return false; + + /* Check body_list_0. */ + if (!commands_equal (a->body_list_0.get (), b->body_list_0.get ())) + return false; + + /* Check body_list_1. */ + if (!commands_equal (a->body_list_1.get (), b->body_list_1.get ())) + return false; + + /* Move to the next element in each chain. */ + a = a->next; + b = b->next; + } + + return true; +} + /* Used to implement source_command. */ diff --git a/gdb/cli/cli-script.h b/gdb/cli/cli-script.h index df7316e..23a1e1f 100644 --- a/gdb/cli/cli-script.h +++ b/gdb/cli/cli-script.h @@ -184,4 +184,14 @@ extern void print_command_trace (const char *cmd, ...) extern void reset_command_nest_depth (void); +/* Return true if A and B are identical. Some commands carry around a + 'void *' compilation context, in this case this function doesn't try to + validate if the context is actually the same or not, and will just + return false indicating the commands have changed. That is, a return + value of true is a guarantee that the commands are equal, a return + value of false means the commands are possibly different (and in most + cases are different). */ + +extern bool commands_equal (const command_line *a, const command_line *b); + #endif /* GDB_CLI_CLI_SCRIPT_H */ diff --git a/gdb/contrib/common-misspellings.txt b/gdb/contrib/common-misspellings.txt deleted file mode 100644 index 5772f66..0000000 --- a/gdb/contrib/common-misspellings.txt +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2024 Free Software Foundation, Inc. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# This file contains additions to and overrides for -# wikipedia-common-misspellings.txt. - -# Common spelling mistakes. - -inbetween->between, in between, in-between -sofar->so far -doens't->doesn't -behavour->behavior -behaviour->behavior -arrithemetic->arithmetic -electricaly->electrically - -# Identity rules. - -thru->thru diff --git a/gdb/contrib/setup.cfg b/gdb/contrib/setup.cfg new file mode 100644 index 0000000..dbff165 --- /dev/null +++ b/gdb/contrib/setup.cfg @@ -0,0 +1,6 @@ +[codespell] + +# Skip ChangeLogs and generated files. +skip = */ChangeLog*,*/configure,gdbsupport/Makefile.in,*.dat,*.eps,gdb/features/*.c,gdb/ada-casefold.h,gdb/copying.c,gdb/gdbarch-gen.h,gdb/gdbarch-gen.c,gdb/target-delegates-gen.c + +ignore-words = gdb/contrib/codespell-ignore-words.txt diff --git a/gdb/contrib/spellcheck.sh b/gdb/contrib/spellcheck.sh deleted file mode 100755 index 420891f..0000000 --- a/gdb/contrib/spellcheck.sh +++ /dev/null @@ -1,536 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2024 Free Software Foundation, Inc. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Script to auto-correct common spelling mistakes. -# -# Example usage: -# $ ./gdb/contrib/spellcheck.sh gdb* - -scriptdir=$(cd "$(dirname "$0")" || exit; pwd -P) -this_script=$scriptdir/$(basename "$0") - -url=https://en.wikipedia.org/wiki/Wikipedia:Lists_of_common_misspellings/For_machines -cache_dir=$scriptdir/../../.git -cache_file=wikipedia-common-misspellings.txt -dictionary=$cache_dir/$cache_file -local_dictionary=$scriptdir/common-misspellings.txt -cache_file2=spell-check.pat1 - -bash_version_at_least () -{ - local major - major="$1" - local minor - minor="$2" - - if [ "$bash_major" = "" ]; then - bash_major=$(echo "$BASH_VERSION" | awk -F '.' '{print $1}') - bash_minor=$(echo "$BASH_VERSION" | awk -F '.' '{print $2}') - fi - - if [ "$bash_major" -lt "$major" ]; then - # Major version less then required, return false. - return 1 - fi - - if [ "$bash_major" -gt "$major" ]; then - # Major version more then required, return true. - return 0 - fi - - # Check minor version. - [ "$bash_minor" -ge "$minor" ] -} - -# Separators: space, slash, tab, colon, comma. -declare -a grep_separators -grep_separators=( - " " - "/" - " " - ":" - "," - "\"" -) -declare -a sed_separators -sed_separators=( - " " - "/" - "\t" - ":" - "," - "\"" -) - -# Pre: start of line, left parenthesis. -declare -a grep_pre -grep_pre=( - "^" - "\(" -) -declare -a sed_pre -sed_pre=( - "^" - "(" -) - -# Post: dot, right parenthesis, end of line. -declare -a grep_post -grep_post=( - "\." - "\)" - "$" -) -declare -a sed_post -sed_post=( - "\." - ")" - "$" -) - -join () -{ - local or - or="$1" - shift - - local res - res="" - - local first - first=true - - for item in "$@"; do - if $first; then - first=false - res="$item" - else - res="$res$or$item" - fi - done - - echo "$res" -} - -grep_or="|" -sed_or="\|" - -grep_join () -{ - local res - res=$(join $grep_or "$@") - echo "($res)" -} - -sed_join () -{ - local res - res=$(join $sed_or "$@") - echo "\($res\)" -} - -usage () -{ - echo "usage: $(basename "$0") [--check] <file|dir>+" - echo " $(basename "$0") --print-dictionary" -} - -make_absolute () -{ - local arg - arg="$1" - - case "$arg" in - /*) - ;; - *) - arg=$(pwd -P)/"$arg" - ;; - esac - - echo "$arg" -} - -parse_args () -{ - local files - files=$(mktemp) - trap 'rm -f "$files"' EXIT - - if [ $# -eq 1 ] && [ "$1" = "--print-dictionary" ]; then - print_dictionary=true - return - fi - - while true; do - case " $1 " in - " --check ") - check=true - shift - ;; - *) - break - ;; - esac - done - - if [ $# -eq -0 ]; then - usage - exit 1 - fi - - local arg - for arg in "$@"; do - if [ -f "$arg" ]; then - arg=$(make_absolute "$arg") - readlink -e "$arg" \ - >> "$files" - elif [ -d "$arg" ]; then - arg=$(make_absolute "$arg") - local f - find "$arg" -type f -exec readlink -e {} \; \ - >> "$files" - else - echo "Not a file or directory: $arg" - exit 1 - fi - done - - mapfile -t unique_files \ - < <(sort -u "$files" \ - | grep -v ChangeLog) - - rm -f "$files" - trap "" EXIT -} - -get_dictionary () -{ - if [ -f "$dictionary" ]; then - return - fi - - local webpage - webpage=$(mktemp) - trap 'rm -f "$webpage"' EXIT - - # Download web page containing table. - wget $url -O "$webpage" - - # Extract table from web page. - awk '/<pre>/,/<\/pre>/' "$webpage" \ - | sed 's/<pre>//;s/<\/pre>//' \ - | grep -E -v "^$" \ - > "$dictionary" - - rm -f "$webpage" - trap "" EXIT -} - -output_local_dictionary () -{ - # Filter out comments and empty lines. - grep -E -v \ - "^#|^$" \ - "$local_dictionary" -} - -output_dictionaries () -{ - ( - output_local_dictionary - cat "$dictionary" - ) | grep -E -v "[A-Z]" -} - -parse_dictionary () -{ - # Parse dictionary. - mapfile -t words \ - < <(awk -F '->' '{print $1}' <(output_dictionaries)) - mapfile -t replacements \ - < <(awk -F '->' '{print $2}' <(output_dictionaries)) - - local words_done - declare -A words_done - local i word replacement - i=0 - for word in "${words[@]}"; do - replacement=${replacements[i]} - - # Skip words that are already handled. This ensures that the local - # dictionary overrides the wiki dictionary. - if [ "${words_done[$word]}" == 1 ]; then - words[i]="" - replacements[i]="" - i=$((i + 1)) - continue - fi - words_done[$word]=1 - - # Skip identity rules. - if [ "$word" = "$replacement" ]; then - words[i]="" - replacements[i]="" - fi - - i=$((i + 1)) - done -} - -print_dictionary () -{ - local i word replacement - i=0 - for word in "${words[@]}"; do - replacement=${replacements[i]} - i=$((i + 1)) - - if [ "$word" == "" ]; then - continue - fi - - echo "$word -> $replacement" - done -} - -find_files_matching_words () -{ - local cache_id - cache_id=$(cat "$local_dictionary" "$dictionary" "$this_script" \ - | md5sum \ - | awk '{print $1}') - - local patfile - patfile="$cache_dir/$cache_file2".$cache_id - - local pat - if [ -f "$patfile" ]; then - pat=$(cat "$patfile") - else - rm -f "$cache_dir/$cache_file2".* - - declare -a re_words - mapfile -t re_words \ - < <(for f in "${words[@]}"; do - if [ "$f" = "" ]; then - continue - fi - echo "$f" - done \ - | sed "s/^\(.\)/[\u\1\1]/") - - pat=$(grep_join "${re_words[@]}") - - local before after - before=$(grep_join \ - "${grep_pre[@]}" \ - "${grep_separators[@]}") - after=$(grep_join \ - "${grep_separators[@]}" \ - "${grep_post[@]}") - - pat="$before$pat$after" - - echo "$pat" \ - > "$patfile" - fi - - grep -E \ - -l \ - "$pat" \ - "$@" -} - -find_files_matching_word () -{ - local pat - pat="$1" - shift - - local before after - before=$(grep_join \ - "${grep_pre[@]}" \ - "${grep_separators[@]}") - after=$(grep_join \ - "${grep_separators[@]}" \ - "${grep_post[@]}") - - if bash_version_at_least 5 1; then - patc=${pat@u} - else - # shellcheck disable=SC2001 - patc=$(echo "$pat" | sed 's/^\(.\)/\u\1/') - fi - pat="($patc|$pat)" - - pat="$before$pat$after" - - grep -E \ - -l \ - "$pat" \ - "$@" -} - -replace_word_in_file () -{ - local word - word="$1" - - local replacement - replacement="$2" - - local file - file="$3" - - local before after - before=$(sed_join \ - "${sed_pre[@]}" \ - "${sed_separators[@]}") - after=$(sed_join \ - "${sed_separators[@]}" \ - "${sed_post[@]}") - - if bash_version_at_least 5 1; then - wordc=${word@u} - replacementc=${replacement@u} - else - # shellcheck disable=SC2001 - wordc=$(echo "$word" | sed 's/^\(.\)/\u\1/') - # shellcheck disable=SC2001 - replacementc=$(echo "$replacement" | sed 's/^\(.\)/\u\1/') - fi - - local repl1 - local repl2 - repl1="s%$before$word$after%\1$replacement\2%g" - repl2="s%$before$wordc$after%\1$replacementc\2%g" - - sed -i \ - "$repl1;$repl2" \ - "$file" -} - -replace_word_in_files () -{ - local word - word="$1" - - local replacement - replacement="$2" - - shift 2 - - local id - id="$word -> $replacement" - - # Reduce set of files for sed to operate on. - local files_matching_word - declare -a files_matching_word - mapfile -t files_matching_word \ - < <(find_files_matching_word "$word" "$@") - - if [ ${#files_matching_word[@]} -eq 0 ]; then - return - fi - - if echo "$replacement"| grep -q ","; then - echo "TODO: $id" - return - fi - - declare -A md5sums - - local changed f before after - changed=false - for f in "${files_matching_word[@]}"; do - if [ "${md5sums[$f]}" = "" ]; then - md5sums[$f]=$(md5sum "$f") - fi - - before="${md5sums[$f]}" - - replace_word_in_file \ - "$word" \ - "$replacement" \ - "$f" - - after=$(md5sum "$f") - - if [ "$after" != "$before" ]; then - md5sums[$f]="$after" - changed=true - fi - done - - if $changed; then - echo "$id" - fi - - find_files_matching_word "$word" "${files_matching_word[@]}" \ - | awk "{ printf \"TODO: $id: replacement failed: %s\n\", \$0}" -} - -main () -{ - declare -a unique_files - check=false - print_dictionary=false - parse_args "$@" - - get_dictionary - - declare -a words - declare -a replacements - parse_dictionary - - if $print_dictionary; then - print_dictionary - exit 0 - fi - - # Reduce set of files for sed to operate on. - local files_matching_words - declare -a files_matching_words - mapfile -t files_matching_words \ - < <(find_files_matching_words "${unique_files[@]}") - - if [ ${#files_matching_words[@]} -eq 0 ]; then - return - fi - - if $check; then - exit 1 - fi - - local i word replacement - i=0 - for word in "${words[@]}"; do - replacement=${replacements[i]} - i=$((i + 1)) - - if [ "$word" = "" ]; then - continue - fi - - replace_word_in_files \ - "$word" \ - "$replacement" \ - "${files_matching_words[@]}" - done -} - -main "$@" diff --git a/gdb/copyright.py b/gdb/copyright.py index 1a155b9..5ec9944 100755 --- a/gdb/copyright.py +++ b/gdb/copyright.py @@ -1,6 +1,6 @@ #! /usr/bin/env python3 -# Copyright (C) 2011-2024 Free Software Foundation, Inc. +# Copyright (C) 2011-2025 Free Software Foundation, Inc. # # This file is part of GDB. # @@ -20,7 +20,7 @@ # This script updates the list of years in the copyright notices in # most files maintained by the GDB project. # -# Usage: cd src/gdb && ./copyright.py +# Usage: ./gdb/copyright.py # # Always review the output of this script before committing it! # @@ -46,39 +46,41 @@ def get_update_list(): of the GDB source tree (NOT the gdb/ subdirectory!). The names of the files are relative to that root directory. """ - result = [] - for gdb_dir in ( - "gdb", - "gdbserver", - "gdbsupport", - "gnulib", - "sim", - "include/gdb", - ): - for root, dirs, files in os.walk(gdb_dir, topdown=True): - for dirname in dirs: - reldirname = "%s/%s" % (root, dirname) - if ( - dirname in EXCLUDE_ALL_LIST - or reldirname in EXCLUDE_LIST - or reldirname in NOT_FSF_LIST - or reldirname in BY_HAND - ): - # Prune this directory from our search list. - dirs.remove(dirname) - for filename in files: - relpath = "%s/%s" % (root, filename) - if ( - filename in EXCLUDE_ALL_LIST - or relpath in EXCLUDE_LIST - or relpath in NOT_FSF_LIST - or relpath in BY_HAND - ): - # Ignore this file. - pass - else: - result.append(relpath) - return result + result = ( + subprocess.check_output( + [ + "git", + "ls-files", + "-z", + "--", + "gdb", + "gdbserver", + "gdbsupport", + "gnulib", + "sim", + "include/gdb", + ], + text=True, + ) + .rstrip("\0") + .split("\0") + ) + + def include_file(filename): + (dirname, basename) = os.path.split(filename) + dirbasename = os.path.basename(dirname) + return not ( + basename in EXCLUDE_ALL_LIST + or dirbasename in EXCLUDE_ALL_LIST + or dirname in EXCLUDE_LIST + or dirname in NOT_FSF_LIST + or dirname in BY_HAND + or filename in EXCLUDE_LIST + or filename in NOT_FSF_LIST + or filename in BY_HAND + ) + + return filter(include_file, result) def update_files(update_list): @@ -168,13 +170,9 @@ def main(argv: List[str]) -> Optional[int]: """The main subprogram.""" parser = get_parser() _ = parser.parse_args(argv) - root_dir = os.path.dirname(os.getcwd()) - os.chdir(root_dir) - if not ( - os.path.isdir("gdb") and os.path.isfile("gnulib/import/extra/update-copyright") - ): - sys.exit("Error: This script must be called from the gdb directory.") + if not os.path.isfile("gnulib/import/extra/update-copyright"): + sys.exit("Error: This script must be called from the top-level directory.") update_list = get_update_list() update_files(update_list) @@ -214,9 +212,11 @@ def main(argv: List[str]) -> Optional[int]: # # Filenames are relative to the root directory. EXCLUDE_LIST = ( + "gdb/copying.c", "gdb/nat/glibc_thread_db.h", "gdb/CONTRIBUTE", "gdbsupport/Makefile.in", + "gdbsupport/unordered_dense.h", "gnulib/doc/gendocs_template", "gnulib/doc/gendocs_template_min", "gnulib/import", @@ -235,9 +235,7 @@ EXCLUDE_LIST = ( EXCLUDE_ALL_LIST = ( "COPYING", "COPYING.LIB", - "CVS", "configure", - "copying.c", "fdl.texi", "gpl.texi", "aclocal.m4", @@ -296,131 +294,7 @@ NOT_FSF_LIST = ( "sim/mips/sim-main.c", "sim/moxie/moxie-gdb.dts", # Not a single file in sim/ppc/ appears to be copyright FSF :-(. - "sim/ppc/filter.h", - "sim/ppc/gen-support.h", - "sim/ppc/ld-insn.h", - "sim/ppc/hw_sem.c", - "sim/ppc/hw_disk.c", - "sim/ppc/idecode_branch.h", - "sim/ppc/sim-endian.h", - "sim/ppc/table.c", - "sim/ppc/hw_core.c", - "sim/ppc/gen-support.c", - "sim/ppc/gen-semantics.h", - "sim/ppc/cpu.h", - "sim/ppc/sim_callbacks.h", - "sim/ppc/RUN", - "sim/ppc/Makefile.in", - "sim/ppc/emul_chirp.c", - "sim/ppc/hw_nvram.c", - "sim/ppc/dc-test.01", - "sim/ppc/hw_phb.c", - "sim/ppc/hw_eeprom.c", - "sim/ppc/bits.h", - "sim/ppc/hw_vm.c", - "sim/ppc/cap.h", - "sim/ppc/os_emul.h", - "sim/ppc/options.h", - "sim/ppc/gen-idecode.c", - "sim/ppc/filter.c", - "sim/ppc/corefile-n.h", - "sim/ppc/std-config.h", - "sim/ppc/ld-decode.h", - "sim/ppc/filter_filename.h", - "sim/ppc/hw_shm.c", - "sim/ppc/pk_disklabel.c", - "sim/ppc/dc-simple", - "sim/ppc/misc.h", - "sim/ppc/device_table.h", - "sim/ppc/ld-insn.c", - "sim/ppc/inline.c", - "sim/ppc/emul_bugapi.h", - "sim/ppc/hw_cpu.h", - "sim/ppc/debug.h", - "sim/ppc/hw_ide.c", - "sim/ppc/debug.c", - "sim/ppc/gen-itable.h", - "sim/ppc/interrupts.c", - "sim/ppc/hw_glue.c", - "sim/ppc/emul_unix.c", - "sim/ppc/sim_calls.c", - "sim/ppc/dc-complex", - "sim/ppc/ld-cache.c", - "sim/ppc/registers.h", - "sim/ppc/dc-test.02", - "sim/ppc/options.c", - "sim/ppc/igen.h", - "sim/ppc/registers.c", - "sim/ppc/device.h", - "sim/ppc/emul_chirp.h", - "sim/ppc/hw_register.c", - "sim/ppc/hw_init.c", - "sim/ppc/sim-endian-n.h", - "sim/ppc/filter_filename.c", - "sim/ppc/bits.c", - "sim/ppc/idecode_fields.h", - "sim/ppc/hw_memory.c", - "sim/ppc/misc.c", - "sim/ppc/double.c", - "sim/ppc/psim.h", - "sim/ppc/hw_trace.c", - "sim/ppc/emul_netbsd.h", - "sim/ppc/psim.c", - "sim/ppc/powerpc.igen", - "sim/ppc/tree.h", - "sim/ppc/README", - "sim/ppc/gen-icache.h", - "sim/ppc/gen-model.h", - "sim/ppc/ld-cache.h", - "sim/ppc/mon.c", - "sim/ppc/corefile.h", - "sim/ppc/vm.c", - "sim/ppc/INSTALL", - "sim/ppc/gen-model.c", - "sim/ppc/hw_cpu.c", - "sim/ppc/corefile.c", - "sim/ppc/hw_opic.c", - "sim/ppc/gen-icache.c", - "sim/ppc/events.h", - "sim/ppc/os_emul.c", - "sim/ppc/emul_generic.c", - "sim/ppc/main.c", - "sim/ppc/hw_com.c", - "sim/ppc/gen-semantics.c", - "sim/ppc/emul_bugapi.c", - "sim/ppc/device.c", - "sim/ppc/emul_generic.h", - "sim/ppc/tree.c", - "sim/ppc/mon.h", - "sim/ppc/interrupts.h", - "sim/ppc/cap.c", - "sim/ppc/cpu.c", - "sim/ppc/hw_phb.h", - "sim/ppc/device_table.c", - "sim/ppc/lf.c", - "sim/ppc/lf.c", - "sim/ppc/dc-stupid", - "sim/ppc/hw_pal.c", - "sim/ppc/ppc-spr-table", - "sim/ppc/emul_unix.h", - "sim/ppc/words.h", - "sim/ppc/basics.h", - "sim/ppc/hw_htab.c", - "sim/ppc/lf.h", - "sim/ppc/ld-decode.c", - "sim/ppc/sim-endian.c", - "sim/ppc/gen-itable.c", - "sim/ppc/idecode_expression.h", - "sim/ppc/table.h", - "sim/ppc/dgen.c", - "sim/ppc/events.c", - "sim/ppc/gen-idecode.h", - "sim/ppc/emul_netbsd.c", - "sim/ppc/igen.c", - "sim/ppc/vm_n.h", - "sim/ppc/vm.h", - "sim/ppc/hw_iobus.c", - "sim/ppc/inline.h", + "sim/ppc", "sim/testsuite/mips/mips32-dsp2.s", ) diff --git a/gdb/dbxread.c b/gdb/dbxread.c index 86e59ab..9e2e572 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -31,36 +31,18 @@ for real. dbx_psymtab_to_symtab() is the function that does this */ -#include "event-top.h" -#include "gdbsupport/gdb_obstack.h" #include <sys/stat.h> #include "symtab.h" -#include "breakpoint.h" #include "target.h" -#include "gdbcore.h" #include "libaout.h" -#include "filenames.h" #include "objfiles.h" -#include "buildsym-legacy.h" #include "stabsread.h" #include "gdb-stabs.h" -#include "demangle.h" -#include "complaints.h" -#include "cp-abi.h" #include "cp-support.h" -#include "c-lang.h" -#include "psymtab.h" -#include "block.h" -#include "aout/aout64.h" -#include "aout/stab_gnu.h" - + /* Required for the following registry. */ #include "gdb-stabs.h" - - - - /* Local function prototypes. */ static void dbx_symfile_init (struct objfile *); diff --git a/gdb/dwarf2/abbrev-table-cache.h b/gdb/dwarf2/abbrev-table-cache.h index 8469948..d99fb8d 100644 --- a/gdb/dwarf2/abbrev-table-cache.h +++ b/gdb/dwarf2/abbrev-table-cache.h @@ -30,6 +30,9 @@ public: abbrev_table_cache () = default; DISABLE_COPY_AND_ASSIGN (abbrev_table_cache); + abbrev_table_cache (abbrev_table_cache &&) = default; + abbrev_table_cache &operator= (abbrev_table_cache &&) = default; + /* Find an abbrev table coming from the abbrev section SECTION at offset OFFSET. Return the table, or nullptr if it has not yet been registered. */ diff --git a/gdb/dwarf2/cooked-index-entry.c b/gdb/dwarf2/cooked-index-entry.c new file mode 100644 index 0000000..3e322f1 --- /dev/null +++ b/gdb/dwarf2/cooked-index-entry.c @@ -0,0 +1,242 @@ +/* Entry in the cooked index + + Copyright (C) 2022-2024 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "dwarf2/cooked-index-entry.h" +#include "dwarf2/tag.h" +#include "gdbsupport/gdb-safe-ctype.h" +#include "gdbsupport/selftest.h" + +/* See cooked-index-entry.h. */ + +std::string +to_string (cooked_index_flag flags) +{ + static constexpr cooked_index_flag::string_mapping mapping[] = { + MAP_ENUM_FLAG (IS_MAIN), + MAP_ENUM_FLAG (IS_STATIC), + MAP_ENUM_FLAG (IS_LINKAGE), + MAP_ENUM_FLAG (IS_TYPE_DECLARATION), + MAP_ENUM_FLAG (IS_PARENT_DEFERRED), + }; + + return flags.to_string (mapping); +} + +/* See cooked-index-entry.h. */ + +int +cooked_index_entry::compare (const char *stra, const char *strb, + comparison_mode mode) +{ +#if defined (__GNUC__) && !defined (__clang__) && __GNUC__ <= 7 + /* Work around error with gcc 7.5.0. */ + auto munge = [] (char c) -> unsigned char +#else + auto munge = [] (char c) constexpr -> unsigned char +#endif + { + /* Treat '<' as if it ended the string. This lets something + like "func<t>" match "func<t<int>>". See the "Breakpoints in + template functions" section in the manual. */ + if (c == '<') + return '\0'; + return TOLOWER ((unsigned char) c); + }; + + unsigned char a = munge (*stra); + unsigned char b = munge (*strb); + + while (a != '\0' && b != '\0' && a == b) + { + a = munge (*++stra); + b = munge (*++strb); + } + + if (a == b) + return 0; + + /* When completing, if STRB ends earlier than STRA, consider them as + equal. */ + if (mode == COMPLETE && b == '\0') + return 0; + + return a < b ? -1 : 1; +} + +#if GDB_SELF_TEST + +namespace { + +void +test_compare () +{ + /* Convenience aliases. */ + const auto mode_compare = cooked_index_entry::MATCH; + const auto mode_sort = cooked_index_entry::SORT; + const auto mode_complete = cooked_index_entry::COMPLETE; + + SELF_CHECK (cooked_index_entry::compare ("abcd", "abcd", + mode_compare) == 0); + SELF_CHECK (cooked_index_entry::compare ("abcd", "abcd", + mode_complete) == 0); + + SELF_CHECK (cooked_index_entry::compare ("abcd", "ABCDE", + mode_compare) < 0); + SELF_CHECK (cooked_index_entry::compare ("ABCDE", "abcd", + mode_compare) > 0); + SELF_CHECK (cooked_index_entry::compare ("abcd", "ABCDE", + mode_complete) < 0); + SELF_CHECK (cooked_index_entry::compare ("ABCDE", "abcd", + mode_complete) == 0); + + SELF_CHECK (cooked_index_entry::compare ("name", "name<>", + mode_compare) == 0); + SELF_CHECK (cooked_index_entry::compare ("name<>", "name", + mode_compare) == 0); + SELF_CHECK (cooked_index_entry::compare ("name", "name<>", + mode_complete) == 0); + SELF_CHECK (cooked_index_entry::compare ("name<>", "name", + mode_complete) == 0); + + SELF_CHECK (cooked_index_entry::compare ("name<arg>", "name<arg>", + mode_compare) == 0); + SELF_CHECK (cooked_index_entry::compare ("name<arg>", "name<ag>", + mode_compare) == 0); + SELF_CHECK (cooked_index_entry::compare ("name<arg>", "name<arg>", + mode_complete) == 0); + SELF_CHECK (cooked_index_entry::compare ("name<arg>", "name<ag>", + mode_complete) == 0); + + SELF_CHECK (cooked_index_entry::compare ("name<arg<more>>", + "name<arg<more>>", + mode_compare) == 0); + SELF_CHECK (cooked_index_entry::compare ("name<arg>", + "name<arg<more>>", + mode_compare) == 0); + + SELF_CHECK (cooked_index_entry::compare ("name", "name<arg<more>>", + mode_compare) == 0); + SELF_CHECK (cooked_index_entry::compare ("name<arg<more>>", "name", + mode_compare) == 0); + SELF_CHECK (cooked_index_entry::compare ("name<arg<more>>", "name<arg<", + mode_compare) == 0); + SELF_CHECK (cooked_index_entry::compare ("name<arg<more>>", "name<arg<", + mode_complete) == 0); + + SELF_CHECK (cooked_index_entry::compare ("", "abcd", mode_compare) < 0); + SELF_CHECK (cooked_index_entry::compare ("", "abcd", mode_complete) < 0); + SELF_CHECK (cooked_index_entry::compare ("abcd", "", mode_compare) > 0); + SELF_CHECK (cooked_index_entry::compare ("abcd", "", mode_complete) == 0); + + SELF_CHECK (cooked_index_entry::compare ("func", "func<type>", + mode_sort) == 0); + SELF_CHECK (cooked_index_entry::compare ("func<type>", "func1", + mode_sort) < 0); +} + +} /* anonymous namespace */ + +#endif /* GDB_SELF_TEST */ + +/* See cooked-index-entry.h. */ + +bool +cooked_index_entry::matches (domain_search_flags kind) const +{ + /* Just reject type declarations. */ + if ((flags & IS_TYPE_DECLARATION) != 0) + return false; + + return tag_matches_domain (tag, kind, lang); +} + +/* See cooked-index-entry.h. */ + +const char * +cooked_index_entry::full_name (struct obstack *storage, + cooked_index_full_name_flag name_flags, + const char *default_sep) const +{ + const char *local_name = ((name_flags & FOR_MAIN) != 0) ? name : canonical; + + if ((flags & IS_LINKAGE) != 0 || get_parent () == nullptr) + return local_name; + + const char *sep = default_sep; + switch (lang) + { + case language_cplus: + case language_rust: + case language_fortran: + sep = "::"; + break; + + case language_ada: + if ((name_flags & FOR_ADA_LINKAGE_NAME) != 0) + { + sep = "__"; + break; + } + [[fallthrough]]; + case language_go: + case language_d: + sep = "."; + break; + + default: + if (sep == nullptr) + return local_name; + break; + } + + /* The FOR_ADA_LINKAGE_NAME flag should only affect Ada entries, so + disable it here if we don't need it. */ + if (lang != language_ada) + name_flags &= ~FOR_ADA_LINKAGE_NAME; + + get_parent ()->write_scope (storage, sep, name_flags); + obstack_grow0 (storage, local_name, strlen (local_name)); + return (const char *) obstack_finish (storage); +} + +/* See cooked-index-entry.h. */ + +void +cooked_index_entry::write_scope (struct obstack *storage, + const char *sep, + cooked_index_full_name_flag flags) const +{ + if (get_parent () != nullptr) + get_parent ()->write_scope (storage, sep, flags); + /* When computing the Ada linkage name, the entry might not have + been canonicalized yet, so use the 'name'. */ + const char *local_name = ((flags & (FOR_MAIN | FOR_ADA_LINKAGE_NAME)) != 0 + ? name + : canonical); + obstack_grow (storage, local_name, strlen (local_name)); + obstack_grow (storage, sep, strlen (sep)); +} + +void _initialize_dwarf2_entry (); +void _initialize_dwarf2_entry () +{ +#if GDB_SELF_TEST + selftests::register_test ("cooked_index_entry::compare", test_compare); +#endif +} diff --git a/gdb/dwarf2/cooked-index-entry.h b/gdb/dwarf2/cooked-index-entry.h new file mode 100644 index 0000000..bb47e32 --- /dev/null +++ b/gdb/dwarf2/cooked-index-entry.h @@ -0,0 +1,258 @@ +/* Entry in the cooked index + + Copyright (C) 2022-2024 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef GDB_DWARF2_COOKED_INDEX_ENTRY_H +#define GDB_DWARF2_COOKED_INDEX_ENTRY_H + +#include "dwarf2/parent-map.h" +#include "dwarf2/types.h" +#include "symtab.h" +#include "gdbsupport/gdb_obstack.h" +#include "quick-symbol.h" + +/* Flags that describe an entry in the index. */ +enum cooked_index_flag_enum : unsigned char +{ + /* True if this entry is the program's "main". */ + IS_MAIN = 1, + /* True if this entry represents a "static" object. */ + IS_STATIC = 2, + /* True if this entry uses the linkage name. */ + IS_LINKAGE = 4, + /* True if this entry is just for the declaration of a type, not the + definition. */ + IS_TYPE_DECLARATION = 8, + /* True is parent_entry.deferred has a value rather than parent_entry + .resolved. */ + IS_PARENT_DEFERRED = 16, + /* True if this entry was synthesized by gdb (as opposed to coming + directly from the DWARF). */ + IS_SYNTHESIZED = 32, +}; +DEF_ENUM_FLAGS_TYPE (enum cooked_index_flag_enum, cooked_index_flag); + +/* Flags used when requesting the full name of an entry. */ +enum cooked_index_full_name_enum : unsigned char +{ + /* Set when requesting the name of "main". See the method for the + full description. */ + FOR_MAIN = 1, + /* Set when requesting the linkage name for an Ada entry. */ + FOR_ADA_LINKAGE_NAME = 2, +}; +DEF_ENUM_FLAGS_TYPE (enum cooked_index_full_name_enum, cooked_index_full_name_flag); + +/* Type representing either a resolved or deferred cooked_index_entry. */ + +union cooked_index_entry_ref +{ + cooked_index_entry_ref (parent_map::addr_type deferred_) + { + deferred = deferred_; + } + + cooked_index_entry_ref (const cooked_index_entry *resolved_) + { + resolved = resolved_; + } + + const cooked_index_entry *resolved; + parent_map::addr_type deferred; +}; + +/* Return a string representation of FLAGS. */ + +std::string to_string (cooked_index_flag flags); + +/* A cooked_index_entry represents a single item in the index. Note + that two entries can be created for the same DIE -- one using the + name, and another one using the linkage name, if any. + + This is an "open" class and the members are all directly + accessible. It is read-only after the index has been fully read + and processed. */ +struct cooked_index_entry : public allocate_on_obstack<cooked_index_entry> +{ + cooked_index_entry (sect_offset die_offset_, enum dwarf_tag tag_, + cooked_index_flag flags_, + enum language lang_, const char *name_, + cooked_index_entry_ref parent_entry_, + dwarf2_per_cu *per_cu_) + : name (name_), + tag (tag_), + flags (flags_), + lang (lang_), + die_offset (die_offset_), + per_cu (per_cu_), + m_parent_entry (parent_entry_) + { + } + + /* Return true if this entry matches SEARCH_FLAGS. */ + bool matches (block_search_flags search_flags) const + { + /* Just reject type declarations. */ + if ((flags & IS_TYPE_DECLARATION) != 0) + return false; + + if ((search_flags & SEARCH_STATIC_BLOCK) != 0 + && (flags & IS_STATIC) != 0) + return true; + if ((search_flags & SEARCH_GLOBAL_BLOCK) != 0 + && (flags & IS_STATIC) == 0) + return true; + return false; + } + + /* Return true if this entry matches KIND. */ + bool matches (domain_search_flags kind) const; + + /* Construct the fully-qualified name of this entry and return a + pointer to it. If allocation is needed, it will be done on + STORAGE. + + FLAGS affects the result. If the FOR_MAIN flag is set, we are + computing the name of the "main" entry -- one marked + DW_AT_main_subprogram. This matters for avoiding name + canonicalization and also a related race (if "main" computation + is done during finalization). + + If the FOR_ADA_LINKAGE_NAME flag is set, then Ada-language + symbols will have their "linkage-style" name computed. The + default is source-style. + + If the language doesn't prescribe a separator, one can be + specified using DEFAULT_SEP. */ + const char *full_name (struct obstack *storage, + cooked_index_full_name_flag name_flags = 0, + const char *default_sep = nullptr) const; + + /* Comparison modes for the 'compare' function. See the function + for a description. */ + enum comparison_mode + { + MATCH, + SORT, + COMPLETE, + }; + + /* Compare two strings, case-insensitively. Return -1 if STRA is + less than STRB, 0 if they are equal, and 1 if STRA is greater. + + When comparing, '<' is considered to be less than all other + printable characters. This ensures that "t<x>" sorts before + "t1", which is necessary when looking up "t". This '<' handling + is to ensure that certain C++ lookups work correctly. It is + inexact, and applied regardless of the search language, but this + is ok because callers of this code do more precise filtering + according to their needs. This is also why using a + case-insensitive comparison works even for languages that are + case sensitive. + + MODE controls how the comparison proceeds. + + MODE==SORT is used when sorting and the only special '<' handling + that it does is to ensure that '<' sorts before all other + printable characters. This ensures that the resulting ordering + will be binary-searchable. + + MODE==MATCH is used when searching for a symbol. In this case, + STRB must always be the search name, and STRA must be the name in + the index that is under consideration. In compare mode, early + termination of STRB may match STRA -- for example, "t<int>" and + "t" will be considered to be equal. (However, if A=="t" and + B=="t<int>", then this will not consider them as equal.) + + MODE==COMPLETE is used when searching for a symbol for + completion. In this case, STRB must always be the search name, + and STRA must be the name in the index that is under + consideration. In completion mode, early termination of STRB + always results in a match. */ + static int compare (const char *stra, const char *strb, + comparison_mode mode); + + /* Compare two entries by canonical name. */ + bool operator< (const cooked_index_entry &other) const + { + return compare (canonical, other.canonical, SORT) < 0; + } + + /* Set parent entry to PARENT. */ + void set_parent (const cooked_index_entry *parent) + { + gdb_assert ((flags & IS_PARENT_DEFERRED) == 0); + m_parent_entry.resolved = parent; + } + + /* Resolve deferred parent entry to PARENT. */ + void resolve_parent (const cooked_index_entry *parent) + { + gdb_assert ((flags & IS_PARENT_DEFERRED) != 0); + flags = flags & ~IS_PARENT_DEFERRED; + m_parent_entry.resolved = parent; + } + + /* Return parent entry. */ + const cooked_index_entry *get_parent () const + { + gdb_assert ((flags & IS_PARENT_DEFERRED) == 0); + return m_parent_entry.resolved; + } + + /* Return deferred parent entry. */ + parent_map::addr_type get_deferred_parent () const + { + gdb_assert ((flags & IS_PARENT_DEFERRED) != 0); + return m_parent_entry.deferred; + } + + /* The name as it appears in DWARF. This always points into one of + the mapped DWARF sections. Note that this may be the name or the + linkage name -- two entries are created for DIEs which have both + attributes. */ + const char *name; + /* The canonical name. This may be equal to NAME. */ + const char *canonical = nullptr; + /* The DWARF tag. */ + enum dwarf_tag tag; + /* Any flags attached to this entry. */ + cooked_index_flag flags; + /* The language of this symbol. */ + ENUM_BITFIELD (language) lang : LANGUAGE_BITS; + /* The offset of this DIE. */ + sect_offset die_offset; + /* The CU from which this entry originates. */ + dwarf2_per_cu *per_cu; + +private: + + /* A helper method for full_name. Emits the full scope of this + object, followed by the separator, to STORAGE. If this entry has + a parent, its write_scope method is called first. See full_name + for a description of the FLAGS parameter. */ + void write_scope (struct obstack *storage, const char *sep, + cooked_index_full_name_flag flags) const; + + /* The parent entry. This is NULL for top-level entries. + Otherwise, it points to the parent entry, such as a namespace or + class. */ + cooked_index_entry_ref m_parent_entry; +}; + +#endif /* GDB_DWARF2_COOKED_INDEX_ENTRY_H */ diff --git a/gdb/dwarf2/cooked-index-shard.c b/gdb/dwarf2/cooked-index-shard.c new file mode 100644 index 0000000..683feb2 --- /dev/null +++ b/gdb/dwarf2/cooked-index-shard.c @@ -0,0 +1,331 @@ +/* Shards for the cooked index + + Copyright (C) 2022-2024 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "dwarf2/cooked-index-shard.h" +#include "dwarf2/tag.h" +#include "dwarf2/index-common.h" +#include "cp-support.h" +#include "c-lang.h" +#include "ada-lang.h" + +/* Return true if a plain "main" could be the main program for this + language. Languages that are known to use some other mechanism are + excluded here. */ + +static bool +language_may_use_plain_main (enum language lang) +{ + /* No need to handle "unknown" here. */ + return (lang == language_c + || lang == language_objc + || lang == language_cplus + || lang == language_m2 + || lang == language_asm + || lang == language_opencl + || lang == language_minimal); +} + +/* See cooked-index-shard.h. */ + +cooked_index_entry * +cooked_index_shard::create (sect_offset die_offset, + enum dwarf_tag tag, + cooked_index_flag flags, + enum language lang, + const char *name, + cooked_index_entry_ref parent_entry, + dwarf2_per_cu *per_cu) +{ + if (tag == DW_TAG_module || tag == DW_TAG_namespace) + flags &= ~IS_STATIC; + else if (lang == language_cplus + && (tag == DW_TAG_class_type + || tag == DW_TAG_interface_type + || tag == DW_TAG_structure_type + || tag == DW_TAG_union_type + || tag == DW_TAG_enumeration_type + || tag == DW_TAG_enumerator)) + flags &= ~IS_STATIC; + else if (tag_is_type (tag)) + flags |= IS_STATIC; + + return new (&m_storage) cooked_index_entry (die_offset, tag, flags, + lang, name, parent_entry, + per_cu); +} + +/* See cooked-index-shard.h. */ + +cooked_index_entry * +cooked_index_shard::add (sect_offset die_offset, enum dwarf_tag tag, + cooked_index_flag flags, enum language lang, + const char *name, cooked_index_entry_ref parent_entry, + dwarf2_per_cu *per_cu) +{ + cooked_index_entry *result = create (die_offset, tag, flags, lang, name, + parent_entry, per_cu); + m_entries.push_back (result); + + /* An explicitly-tagged main program should always override the + implicit "main" discovery. */ + if ((flags & IS_MAIN) != 0) + m_main = result; + else if ((flags & IS_PARENT_DEFERRED) == 0 + && parent_entry.resolved == nullptr + && m_main == nullptr + && language_may_use_plain_main (lang) + && strcmp (name, "main") == 0) + m_main = result; + + return result; +} + +/* See cooked-index-shard.h. */ + +void +cooked_index_shard::handle_gnat_encoded_entry + (cooked_index_entry *entry, + htab_t gnat_entries, + std::vector<cooked_index_entry *> &new_entries) +{ + /* We decode Ada names in a particular way: operators and wide + characters are left as-is. This is done to make name matching a + bit simpler; and for wide characters, it means the choice of Ada + source charset does not affect the indexer directly. */ + std::string canonical = ada_decode (entry->name, false, false, false); + if (canonical.empty ()) + { + entry->canonical = entry->name; + return; + } + std::vector<std::string_view> names = split_name (canonical.c_str (), + split_style::DOT_STYLE); + std::string_view tail = names.back (); + names.pop_back (); + + const cooked_index_entry *parent = nullptr; + for (const auto &name : names) + { + uint32_t hashval = dwarf5_djb_hash (name); + void **slot = htab_find_slot_with_hash (gnat_entries, &name, + hashval, INSERT); + /* CUs are processed in order, so we only need to check the most + recent entry. */ + cooked_index_entry *last = (cooked_index_entry *) *slot; + if (last == nullptr || last->per_cu != entry->per_cu) + { + const char *new_name = m_names.insert (name); + last = create (entry->die_offset, DW_TAG_module, + IS_SYNTHESIZED, language_ada, new_name, parent, + entry->per_cu); + last->canonical = last->name; + new_entries.push_back (last); + *slot = last; + } + + parent = last; + } + + entry->set_parent (parent); + entry->canonical = m_names.insert (tail); +} + +/* Hash a cooked index entry by name pointer value. + + We can use pointer equality here because names come from .debug_str, which + will normally be unique-ified by the linker. Also, duplicates are relatively + harmless -- they just mean a bit of extra memory is used. */ + +struct cooked_index_entry_name_ptr_hash +{ + using is_avalanching = void; + + std::uint64_t operator () (const cooked_index_entry *entry) const noexcept + { + return ankerl::unordered_dense::hash<const char *> () (entry->name); + } +}; + +/* Compare cooked index entries by name pointer value. */ + +struct cooked_index_entry_name_ptr_eq +{ + bool operator () (const cooked_index_entry *a, + const cooked_index_entry *b) const noexcept + { + return a->name == b->name; + } +}; + +/* See cooked-index-shard.h. */ + +void +cooked_index_shard::finalize (const parent_map_map *parent_maps) +{ + gdb::unordered_set<const cooked_index_entry *, + cooked_index_entry_name_ptr_hash, + cooked_index_entry_name_ptr_eq> seen_names; + + auto hash_entry = [] (const void *e) + { + const cooked_index_entry *entry = (const cooked_index_entry *) e; + return dwarf5_djb_hash (entry->canonical); + }; + + auto eq_entry = [] (const void *a, const void *b) -> int + { + const cooked_index_entry *ae = (const cooked_index_entry *) a; + const std::string_view *sv = (const std::string_view *) b; + return (strlen (ae->canonical) == sv->length () + && strncasecmp (ae->canonical, sv->data (), sv->length ()) == 0); + }; + + htab_up gnat_entries (htab_create_alloc (10, hash_entry, eq_entry, + nullptr, xcalloc, xfree)); + std::vector<cooked_index_entry *> new_gnat_entries; + + for (cooked_index_entry *entry : m_entries) + { + if ((entry->flags & IS_PARENT_DEFERRED) != 0) + { + const cooked_index_entry *new_parent + = parent_maps->find (entry->get_deferred_parent ()); + entry->resolve_parent (new_parent); + } + + /* Note that this code must be kept in sync with + language_requires_canonicalization. */ + gdb_assert (entry->canonical == nullptr); + if ((entry->flags & IS_LINKAGE) != 0) + entry->canonical = entry->name; + else if (entry->lang == language_ada) + { + /* Newer versions of GNAT emit DW_TAG_module and use a + hierarchical structure. In this case, we don't need to + do any extra work. This can be detected by looking for a + GNAT-encoded name. */ + if (strstr (entry->name, "__") == nullptr) + { + entry->canonical = entry->name; + + /* If the entry does not have a parent, then there's + nothing extra to do here -- the entry itself is + sufficient. + + However, if it does have a parent, we have to + synthesize an entry with the full name. This is + unfortunate, but it's necessary due to how some of + the Ada name-lookup code currently works. For + example, without this, ada_get_tsd_type will + fail. + + Eventually it would be good to change the Ada lookup + code, and then remove these entries (and supporting + code in cooked_index_entry::full_name). */ + if (entry->get_parent () != nullptr) + { + const char *fullname + = entry->full_name (&m_storage, FOR_ADA_LINKAGE_NAME); + cooked_index_entry *linkage = create (entry->die_offset, + entry->tag, + (entry->flags + | IS_LINKAGE + | IS_SYNTHESIZED), + language_ada, + fullname, + nullptr, + entry->per_cu); + linkage->canonical = fullname; + new_gnat_entries.push_back (linkage); + } + } + else + handle_gnat_encoded_entry (entry, gnat_entries.get (), + new_gnat_entries); + } + else if (entry->lang == language_cplus || entry->lang == language_c) + { + auto [it, inserted] = seen_names.insert (entry); + + if (inserted) + { + /* No entry with that name was present, compute the canonical + name. */ + gdb::unique_xmalloc_ptr<char> canon_name + = (entry->lang == language_cplus + ? cp_canonicalize_string (entry->name) + : c_canonicalize_name (entry->name)); + if (canon_name == nullptr) + entry->canonical = entry->name; + else + entry->canonical = m_names.insert (std::move (canon_name)); + } + else + { + /* An entry with that name was present, re-use its canonical + name. */ + entry->canonical = (*it)->canonical; + } + } + else + entry->canonical = entry->name; + } + + /* Make sure any new Ada entries end up in the results. This isn't + done when creating these new entries to avoid invalidating the + m_entries iterator used in the foreach above. */ + m_entries.insert (m_entries.end (), new_gnat_entries.begin (), + new_gnat_entries.end ()); + + m_entries.shrink_to_fit (); + std::sort (m_entries.begin (), m_entries.end (), + [] (const cooked_index_entry *a, const cooked_index_entry *b) + { + return *a < *b; + }); +} + +/* See cooked-index-shard.h. */ + +cooked_index_shard::range +cooked_index_shard::find (const std::string &name, bool completing) const +{ + struct comparator + { + cooked_index_entry::comparison_mode mode; + + bool operator() (const cooked_index_entry *entry, + const char *name) const noexcept + { + return cooked_index_entry::compare (entry->canonical, name, mode) < 0; + } + + bool operator() (const char *name, + const cooked_index_entry *entry) const noexcept + { + return cooked_index_entry::compare (entry->canonical, name, mode) > 0; + } + }; + + return std::make_from_tuple<range> + (std::equal_range (m_entries.cbegin (), m_entries.cend (), name.c_str (), + comparator { (completing + ? cooked_index_entry::COMPLETE + : cooked_index_entry::MATCH) })); +} diff --git a/gdb/dwarf2/cooked-index-shard.h b/gdb/dwarf2/cooked-index-shard.h new file mode 100644 index 0000000..eb80926 --- /dev/null +++ b/gdb/dwarf2/cooked-index-shard.h @@ -0,0 +1,134 @@ +/* Shards for the cooked index + + Copyright (C) 2022-2024 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef GDB_DWARF2_COOKED_INDEX_SHARD_H +#define GDB_DWARF2_COOKED_INDEX_SHARD_H + +#include "dwarf2/cooked-index-entry.h" +#include "dwarf2/types.h" +#include "gdbsupport/gdb_obstack.h" +#include "addrmap.h" +#include "gdbsupport/iterator-range.h" +#include "gdbsupport/string-set.h" + +/* An index of interesting DIEs. This is "cooked", in contrast to a + mapped .debug_names or .gdb_index, which are "raw". An entry in + the index is of type cooked_index_entry. + + Operations on the index are described below. They are chosen to + make it relatively simple to implement the symtab "quick" + methods. */ +class cooked_index_shard +{ +public: + cooked_index_shard () = default; + DISABLE_COPY_AND_ASSIGN (cooked_index_shard); + + /* Create a new cooked_index_entry and register it with this object. + Entries are owned by this object. The new item is returned. */ + cooked_index_entry *add (sect_offset die_offset, enum dwarf_tag tag, + cooked_index_flag flags, enum language lang, + const char *name, + cooked_index_entry_ref parent_entry, + dwarf2_per_cu *per_cu); + + /* Install a new fixed addrmap from the given mutable addrmap. */ + void install_addrmap (addrmap_mutable *map) + { + gdb_assert (m_addrmap == nullptr); + m_addrmap = new (&m_storage) addrmap_fixed (&m_storage, map); + } + + friend class cooked_index; + + /* A simple range over part of m_entries. */ + typedef iterator_range<std::vector<cooked_index_entry *>::const_iterator> + range; + + /* Return a range of all the entries. */ + range all_entries () const + { + return { m_entries.cbegin (), m_entries.cend () }; + } + + /* Look up an entry by name. Returns a range of all matching + results. If COMPLETING is true, then a larger range, suitable + for completion, will be returned. */ + range find (const std::string &name, bool completing) const; + +private: + + /* Return the entry that is believed to represent the program's + "main". This will return NULL if no such entry is available. */ + const cooked_index_entry *get_main () const + { + return m_main; + } + + /* Look up ADDR in the address map, and return either the + corresponding CU, or nullptr if the address could not be + found. */ + dwarf2_per_cu *lookup (unrelocated_addr addr) + { + if (m_addrmap == nullptr) + return nullptr; + + return (static_cast<dwarf2_per_cu *> (m_addrmap->find ((CORE_ADDR) addr))); + } + + /* Create a new cooked_index_entry and register it with this object. + Entries are owned by this object. The new item is returned. */ + cooked_index_entry *create (sect_offset die_offset, + enum dwarf_tag tag, + cooked_index_flag flags, + enum language lang, + const char *name, + cooked_index_entry_ref parent_entry, + dwarf2_per_cu *per_cu); + + /* When GNAT emits mangled ("encoded") names in the DWARF, and does + not emit the module structure, we still need this structuring to + do lookups. This function recreates that information for an + existing entry, modifying ENTRY as appropriate. Any new entries + are added to NEW_ENTRIES. */ + void handle_gnat_encoded_entry + (cooked_index_entry *entry, htab_t gnat_entries, + std::vector<cooked_index_entry *> &new_entries); + + /* Finalize the index. This should be called a single time, when + the index has been fully populated. It enters all the entries + into the internal table and fixes up all missing parent links. + This may be invoked in a worker thread. */ + void finalize (const parent_map_map *parent_maps); + + /* Storage for the entries. */ + auto_obstack m_storage; + /* List of all entries. */ + std::vector<cooked_index_entry *> m_entries; + /* If we found an entry with 'is_main' set, store it here. */ + cooked_index_entry *m_main = nullptr; + /* The addrmap. This maps address ranges to dwarf2_per_cu objects. */ + addrmap_fixed *m_addrmap = nullptr; + /* Storage for canonical names. */ + gdb::string_set m_names; +}; + +using cooked_index_shard_up = std::unique_ptr<cooked_index_shard>; + +#endif /* GDB_DWARF2_COOKED_INDEX_SHARD_H */ diff --git a/gdb/dwarf2/cooked-index-storage.c b/gdb/dwarf2/cooked-index-storage.c deleted file mode 100644 index 9c05cf5..0000000 --- a/gdb/dwarf2/cooked-index-storage.c +++ /dev/null @@ -1,84 +0,0 @@ -/* DWARF index storage - - Copyright (C) 2022-2025 Free Software Foundation, Inc. - - This file is part of GDB. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -#include "dwarf2/cooked-index-storage.h" - -/* See cooked-index-storage.h. */ - -cooked_index_storage::cooked_index_storage () - : m_shard (new cooked_index_shard) -{ -} - -/* See cooked-index-storage.h. */ - -cutu_reader * -cooked_index_storage::get_reader (dwarf2_per_cu *per_cu) -{ - auto it = m_reader_hash.find (*per_cu); - return it != m_reader_hash.end () ? it->get () : nullptr; -} - -/* See cooked-index-storage.h. */ - -cutu_reader * -cooked_index_storage::preserve (cutu_reader_up reader) -{ - m_abbrev_table_cache.add (reader->release_abbrev_table ()); - - auto [it, inserted] = m_reader_hash.insert (std::move (reader)); - gdb_assert (inserted); - - return it->get(); -} - -/* See cooked-index-storage.h. */ - -std::uint64_t -cooked_index_storage::cutu_reader_hash::operator() - (const cutu_reader_up &reader) const noexcept -{ - return (*this) (*reader->cu ()->per_cu); -} - -/* See cooked-index-storage.h. */ - -std::uint64_t -cooked_index_storage::cutu_reader_hash::operator() (const dwarf2_per_cu &per_cu) - const noexcept -{ - return per_cu.index; -} - -/* See cooked-index-storage.h. */ - -bool -cooked_index_storage::cutu_reader_eq::operator() (const cutu_reader_up &a, - const cutu_reader_up &b) const noexcept -{ - return (*this) (*a->cu ()->per_cu, b); -} - -/* See cooked-index-storage.h. */ - -bool cooked_index_storage::cutu_reader_eq::operator() - (const dwarf2_per_cu &per_cu, const cutu_reader_up &reader) const noexcept -{ - return per_cu.index == reader->cu ()->per_cu->index; -} diff --git a/gdb/dwarf2/cooked-index-storage.h b/gdb/dwarf2/cooked-index-storage.h deleted file mode 100644 index 449fbe1..0000000 --- a/gdb/dwarf2/cooked-index-storage.h +++ /dev/null @@ -1,131 +0,0 @@ -/* DWARF index storage - - Copyright (C) 2022-2025 Free Software Foundation, Inc. - - This file is part of GDB. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -#ifndef GDB_DWARF2_COOKED_INDEX_STORAGE_H -#define GDB_DWARF2_COOKED_INDEX_STORAGE_H - -#include "dwarf2/abbrev-table-cache.h" -#include "dwarf2/cooked-index.h" -#include "dwarf2/types.h" - -struct cutu_reader; -struct dwarf2_per_cu; - -using cutu_reader_up = std::unique_ptr<cutu_reader>; - -/* An instance of this is created when scanning DWARF to create a - cooked index. */ - -class cooked_index_storage -{ -public: - - cooked_index_storage (); - DISABLE_COPY_AND_ASSIGN (cooked_index_storage); - - /* Return the current abbrev table_cache. */ - const abbrev_table_cache &get_abbrev_table_cache () const - { return m_abbrev_table_cache; } - - /* Return the DIE reader corresponding to PER_CU. If no such reader - has been registered, return NULL. */ - cutu_reader *get_reader (dwarf2_per_cu *per_cu); - - /* Preserve READER by storing it in the local hash table. */ - cutu_reader *preserve (cutu_reader_up reader); - - /* Add an entry to the index. The arguments describe the entry; see - cooked-index.h. The new entry is returned. */ - cooked_index_entry *add (sect_offset die_offset, enum dwarf_tag tag, - cooked_index_flag flags, - const char *name, - cooked_index_entry_ref parent_entry, - dwarf2_per_cu *per_cu) - { - return m_shard->add (die_offset, tag, flags, per_cu->lang (), - name, parent_entry, per_cu); - } - - /* Install the current addrmap into the shard being constructed, - then transfer ownership of the index to the caller. */ - cooked_index_shard_up release () - { - m_shard->install_addrmap (&m_addrmap); - return std::move (m_shard); - } - - /* Return the mutable addrmap that is currently being created. */ - addrmap_mutable *get_addrmap () - { - return &m_addrmap; - } - - /* Return the parent_map that is currently being created. */ - parent_map *get_parent_map () - { - return &m_parent_map; - } - - /* Return the parent_map that is currently being created. Ownership - is passed to the caller. */ - parent_map release_parent_map () - { - return std::move (m_parent_map); - } - -private: - /* The abbrev table cache used by this indexer. */ - abbrev_table_cache m_abbrev_table_cache; - - /* Hash function for a cutu_reader. */ - struct cutu_reader_hash - { - using is_transparent = void; - - std::uint64_t operator() (const cutu_reader_up &reader) const noexcept; - std::uint64_t operator() (const dwarf2_per_cu &per_cu) const noexcept; - }; - - /* Equality function for cutu_reader. */ - struct cutu_reader_eq - { - using is_transparent = void; - - bool operator() (const cutu_reader_up &a, - const cutu_reader_up &b) const noexcept; - - bool operator() (const dwarf2_per_cu &per_cu, - const cutu_reader_up &reader) const noexcept; - }; - - /* A hash table of cutu_reader objects. */ - gdb::unordered_set<cutu_reader_up, cutu_reader_hash, cutu_reader_eq> - m_reader_hash; - - /* The index shard that is being constructed. */ - cooked_index_shard_up m_shard; - - /* Parent map for each CU that is read. */ - parent_map m_parent_map; - - /* A writeable addrmap being constructed by this scanner. */ - addrmap_mutable m_addrmap; -}; - -#endif /* GDB_DWARF2_COOKED_INDEX_STORAGE_H */ diff --git a/gdb/dwarf2/cooked-index-worker.c b/gdb/dwarf2/cooked-index-worker.c new file mode 100644 index 0000000..da51a8c --- /dev/null +++ b/gdb/dwarf2/cooked-index-worker.c @@ -0,0 +1,255 @@ +/* DWARF index storage + + Copyright (C) 2022-2025 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "dwarf2/cooked-index-worker.h" +#include "dwarf2/cooked-index.h" +#include "gdbsupport/thread-pool.h" +#include "run-on-main-thread.h" +#include "event-top.h" +#include "exceptions.h" + +/* See cooked-index-worker.h. */ + +cooked_index_worker_result::cooked_index_worker_result () + : m_shard (new cooked_index_shard) +{ +} + +/* See cooked-index-worker.h. */ + +cutu_reader * +cooked_index_worker_result::get_reader (dwarf2_per_cu *per_cu) +{ + auto it = m_reader_hash.find (*per_cu); + return it != m_reader_hash.end () ? it->get () : nullptr; +} + +/* See cooked-index-worker.h. */ + +cutu_reader * +cooked_index_worker_result::preserve (cutu_reader_up reader) +{ + m_abbrev_table_cache.add (reader->release_abbrev_table ()); + + auto [it, inserted] = m_reader_hash.insert (std::move (reader)); + gdb_assert (inserted); + + return it->get(); +} + +/* See cooked-index-worker.h. */ + +std::uint64_t +cooked_index_worker_result::cutu_reader_hash::operator() + (const cutu_reader_up &reader) const noexcept +{ + return (*this) (*reader->cu ()->per_cu); +} + +/* See cooked-index-worker.h. */ + +std::uint64_t +cooked_index_worker_result::cutu_reader_hash::operator() (const dwarf2_per_cu &per_cu) + const noexcept +{ + return per_cu.index; +} + +/* See cooked-index-worker.h. */ + +bool +cooked_index_worker_result::cutu_reader_eq::operator() (const cutu_reader_up &a, + const cutu_reader_up &b) const noexcept +{ + return (*this) (*a->cu ()->per_cu, b); +} + +/* See cooked-index-worker.h. */ + +bool cooked_index_worker_result::cutu_reader_eq::operator() + (const dwarf2_per_cu &per_cu, const cutu_reader_up &reader) const noexcept +{ + return per_cu.index == reader->cu ()->per_cu->index; +} + +/* See cooked-index-worker.h. */ + +void +cooked_index_worker_result::emit_complaints_and_exceptions + (gdb::unordered_set<gdb_exception> &seen_exceptions) +{ + gdb_assert (is_main_thread ()); + + re_emit_complaints (m_complaints); + + /* Only show a given exception a single time. */ + for (auto &one_exc : m_exceptions) + if (seen_exceptions.insert (one_exc).second) + exception_print (gdb_stderr, one_exc); +} + +/* See cooked-index-worker.h. */ + +void +cooked_index_worker::start () +{ + gdb::thread_pool::g_thread_pool->post_task ([this] () + { + try + { + do_reading (); + } + catch (const gdb_exception &exc) + { + m_failed = exc; + set (cooked_state::CACHE_DONE); + } + + bfd_thread_cleanup (); + }); +} + +/* See cooked-index-worker.h. */ + +bool +cooked_index_worker::wait (cooked_state desired_state, bool allow_quit) +{ + bool done; +#if CXX_STD_THREAD + { + std::unique_lock<std::mutex> lock (m_mutex); + + /* This may be called from a non-main thread -- this functionality + is needed for the index cache -- but in this case we require + that the desired state already have been attained. */ + gdb_assert (is_main_thread () || desired_state <= m_state); + + while (desired_state > m_state) + { + if (allow_quit) + { + std::chrono::milliseconds duration { 15 }; + if (m_cond.wait_for (lock, duration) == std::cv_status::timeout) + QUIT; + } + else + m_cond.wait (lock); + } + done = m_state == cooked_state::CACHE_DONE; + } +#else + /* Without threads, all the work is done immediately on the main + thread, and there is never anything to wait for. */ + done = desired_state == cooked_state::CACHE_DONE; +#endif /* CXX_STD_THREAD */ + + /* Only the main thread is allowed to report complaints and the + like. */ + if (!is_main_thread ()) + return false; + + if (m_reported) + return done; + m_reported = true; + + /* Emit warnings first, maybe they were emitted before an exception + (if any) was thrown. */ + m_warnings.emit (); + + if (m_failed.has_value ()) + { + /* do_reading failed -- report it. */ + exception_print (gdb_stderr, *m_failed); + m_failed.reset (); + return done; + } + + /* Only show a given exception a single time. */ + gdb::unordered_set<gdb_exception> seen_exceptions; + for (auto &one_result : m_results) + one_result.emit_complaints_and_exceptions (seen_exceptions); + + print_stats (); + + struct objfile *objfile = m_per_objfile->objfile; + dwarf2_per_bfd *per_bfd = m_per_objfile->per_bfd; + cooked_index *table + = (gdb::checked_static_cast<cooked_index *> + (per_bfd->index_table.get ())); + + auto_obstack temp_storage; + enum language lang = language_unknown; + const char *main_name = table->get_main_name (&temp_storage, &lang); + if (main_name != nullptr) + set_objfile_main_name (objfile, main_name, lang); + + /* dwarf_read_debug_printf ("Done building psymtabs of %s", */ + /* objfile_name (objfile)); */ + + return done; +} + +/* See cooked-index-worker.h. */ + +void +cooked_index_worker::set (cooked_state desired_state) +{ + gdb_assert (desired_state != cooked_state::INITIAL); + +#if CXX_STD_THREAD + std::lock_guard<std::mutex> guard (m_mutex); + gdb_assert (desired_state > m_state); + m_state = desired_state; + m_cond.notify_one (); +#else + /* Without threads, all the work is done immediately on the main + thread, and there is never anything to do. */ +#endif /* CXX_STD_THREAD */ +} + +/* See cooked-index-worker.h. */ + +void +cooked_index_worker::write_to_cache (const cooked_index *idx) +{ + if (idx != nullptr) + { + /* Writing to the index cache may cause a warning to be emitted. + See PR symtab/30837. This arranges to capture all such + warnings. This is safe because we know the deferred_warnings + object isn't in use by any other thread at this point. */ + scoped_restore_warning_hook defer (&m_warnings); + m_cache_store.store (); + } +} + +/* See cooked-index-worker.h. */ + +void +cooked_index_worker::done_reading () +{ + for (auto &one_result : m_results) + m_all_parents_map.add_map (*one_result.get_parent_map ()); + + dwarf2_per_bfd *per_bfd = m_per_objfile->per_bfd; + cooked_index *table + = (gdb::checked_static_cast<cooked_index *> + (per_bfd->index_table.get ())); + table->set_contents (); +} diff --git a/gdb/dwarf2/cooked-index-worker.h b/gdb/dwarf2/cooked-index-worker.h new file mode 100644 index 0000000..df5c31d --- /dev/null +++ b/gdb/dwarf2/cooked-index-worker.h @@ -0,0 +1,305 @@ +/* DWARF index storage + + Copyright (C) 2022-2025 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef GDB_DWARF2_COOKED_INDEX_WORKER_H +#define GDB_DWARF2_COOKED_INDEX_WORKER_H + +#include "dwarf2/abbrev-table-cache.h" +#include "dwarf2/cooked-index-entry.h" +#include "dwarf2/cooked-index-shard.h" +#include "dwarf2/types.h" +#include "dwarf2/read.h" + +#if CXX_STD_THREAD +#include <mutex> +#include <condition_variable> +#endif /* CXX_STD_THREAD */ + +using cutu_reader_up = std::unique_ptr<cutu_reader>; + +/* An instance of this is created when scanning DWARF to create a + cooked index. This class is the result of a single task to store + results while working -- that is, it is an implementation detail of + the threads managed by cooked_index_worker. Once scanning is done, + selected parts of the state here are stored into the shard, and + then these temporary objects are destroyed. */ + +class cooked_index_worker_result +{ +public: + + cooked_index_worker_result (); + DISABLE_COPY_AND_ASSIGN (cooked_index_worker_result); + + cooked_index_worker_result (cooked_index_worker_result &&) = default; + cooked_index_worker_result &operator= (cooked_index_worker_result &&) + = default; + + /* Return the current abbrev table_cache. */ + const abbrev_table_cache &get_abbrev_table_cache () const + { return m_abbrev_table_cache; } + + /* Return the DIE reader corresponding to PER_CU. If no such reader + has been registered, return NULL. */ + cutu_reader *get_reader (dwarf2_per_cu *per_cu); + + /* Preserve READER by storing it in the local hash table. */ + cutu_reader *preserve (cutu_reader_up reader); + + /* Add an entry to the index. The arguments describe the entry; see + cooked-index.h. The new entry is returned. */ + cooked_index_entry *add (sect_offset die_offset, enum dwarf_tag tag, + cooked_index_flag flags, + const char *name, + cooked_index_entry_ref parent_entry, + dwarf2_per_cu *per_cu) + { + return m_shard->add (die_offset, tag, flags, per_cu->lang (), + name, parent_entry, per_cu); + } + + /* Overload that allows the language to be specified. */ + cooked_index_entry *add (sect_offset die_offset, enum dwarf_tag tag, + cooked_index_flag flags, enum language lang, + const char *name, + cooked_index_entry_ref parent_entry, + dwarf2_per_cu *per_cu) + { + return m_shard->add (die_offset, tag, flags, lang, + name, parent_entry, per_cu); + } + + /* Install the current addrmap into the shard being constructed, + then transfer ownership of the index to the caller. */ + cooked_index_shard_up release_shard () + { + m_shard->install_addrmap (&m_addrmap); + /* This isn't needed any more. */ + m_addrmap.clear (); + return std::move (m_shard); + } + + /* Return the mutable addrmap that is currently being created. */ + addrmap_mutable *get_addrmap () + { + return &m_addrmap; + } + + /* Return the parent_map that is currently being created. */ + parent_map *get_parent_map () + { + return &m_parent_map; + } + + /* Add an exception to the list of exceptions caught while reading. + These are passed forward and printed by the main thread. */ + void note_error (gdb_exception &&except) + { + m_exceptions.push_back (std::move (except)); + } + + /* Called when the thread using this object is done with its work. + This stores any complaints for later emission, and it clears some + data that won't be needed again. */ + void done_reading (complaint_collection &&complaints) + { + /* Hang on to the complaints. */ + m_complaints = std::move (complaints); + /* Discard things that are no longer needed. */ + m_reader_hash.clear (); + } + + /* Called to emit any stored complaints or exceptions. This can + only be called on the main thread. */ + void emit_complaints_and_exceptions + (gdb::unordered_set<gdb_exception> &seen_exceptions); + +private: + /* The abbrev table cache used by this indexer. */ + abbrev_table_cache m_abbrev_table_cache; + + /* Hash function for a cutu_reader. */ + struct cutu_reader_hash + { + using is_transparent = void; + + std::uint64_t operator() (const cutu_reader_up &reader) const noexcept; + std::uint64_t operator() (const dwarf2_per_cu &per_cu) const noexcept; + }; + + /* Equality function for cutu_reader. */ + struct cutu_reader_eq + { + using is_transparent = void; + + bool operator() (const cutu_reader_up &a, + const cutu_reader_up &b) const noexcept; + + bool operator() (const dwarf2_per_cu &per_cu, + const cutu_reader_up &reader) const noexcept; + }; + + /* A hash table of cutu_reader objects. */ + gdb::unordered_set<cutu_reader_up, cutu_reader_hash, cutu_reader_eq> + m_reader_hash; + + /* The index shard that is being constructed. */ + cooked_index_shard_up m_shard; + + /* Parent map for each CU that is read. */ + parent_map m_parent_map; + + /* A writeable addrmap being constructed by this scanner. */ + addrmap_mutable m_addrmap; + + /* The issued complaints. Only set after done_reading is + called. */ + complaint_collection m_complaints; + + /* Exceptions that we're storing to emit later. */ + std::vector<gdb_exception> m_exceptions; +}; + +/* The possible states of the index. See the explanatory comment + before cooked_index for more details. */ +enum class cooked_state +{ + /* The default state. This is not a valid argument to 'wait'. */ + INITIAL, + /* The initial scan has completed. The name of "main" is now + available (if known). The addrmaps are usable now. + Finalization has started but is not complete. */ + MAIN_AVAILABLE, + /* Finalization has completed. This means the index is fully + available for queries. */ + FINALIZED, + /* Writing to the index cache has finished. */ + CACHE_DONE, +}; + +/* An object of this type controls the scanning of the DWARF. It + schedules the worker tasks and tracks the current state. Once + scanning is done, this object is discarded. + + This is an abstract base class that defines the basic behavior of + scanners. Separate concrete implementations exist for scanning + .debug_names and .debug_info. */ + +class cooked_index_worker +{ +public: + + explicit cooked_index_worker (dwarf2_per_objfile *per_objfile) + : m_per_objfile (per_objfile), + m_cache_store (global_index_cache, per_objfile->per_bfd) + { } + virtual ~cooked_index_worker () + { } + DISABLE_COPY_AND_ASSIGN (cooked_index_worker); + + /* Start reading. */ + void start (); + + /* Wait for a particular state to be achieved. If ALLOW_QUIT is + true, then the loop will check the QUIT flag. Normally this + method may only be called from the main thread; however, it can + be called from a worker thread provided that the desired state + has already been attained. (This oddity is used by the index + cache writer.) */ + bool wait (cooked_state desired_state, bool allow_quit); + + /* Release all shards from the results. */ + std::vector<cooked_index_shard_up> release_shards () + { + std::vector<cooked_index_shard_up> result; + for (auto &one_result : m_results) + result.push_back (one_result.release_shard ()); + result.shrink_to_fit (); + return result; + } + + /* Return the object holding all the parent maps. */ + const parent_map_map *get_parent_map_map () const + { + return &m_all_parents_map; + } + +protected: + + /* Let cooked_index call the 'set' and 'write_to_cache' methods. */ + friend class cooked_index; + + /* Set the current state. */ + void set (cooked_state desired_state); + + /* Write to the index cache. */ + void write_to_cache (const cooked_index *idx); + + /* Helper function that does the work of reading. This must be able + to be run in a worker thread without problems. */ + virtual void do_reading () = 0; + + /* Helper function that should be called when done reading. This + assumes that m_results is filled in, and will initialize + m_all_parents_map and end by calling + cooked_index::set_contents. */ + virtual void done_reading (); + + /* A callback that can print stats, if needed. This is called when + transitioning to the 'MAIN_AVAILABLE' state. */ + virtual void print_stats () + { } + + /* The per-objfile object. */ + dwarf2_per_objfile *m_per_objfile; + /* Result of each worker task. */ + std::vector<cooked_index_worker_result> m_results; + /* Any warnings emitted. For the time being at least, this only + needed in do_reading, not in every worker. Note that + deferred_warnings uses gdb_stderr in its constructor, and this + should only be done from the main thread. This is enforced in + the cooked_index_worker constructor. */ + deferred_warnings m_warnings; + + /* A map of all parent maps. Used during finalization to fix up + parent relationships. */ + parent_map_map m_all_parents_map; + +#if CXX_STD_THREAD + /* Current state of this object. */ + cooked_state m_state = cooked_state::INITIAL; + /* Mutex and condition variable used to synchronize. */ + std::mutex m_mutex; + std::condition_variable m_cond; +#endif /* CXX_STD_THREAD */ + /* This flag indicates whether any complaints or exceptions that + arose during scanning have been reported by 'wait'. This may + only be modified on the main thread. */ + bool m_reported = false; + /* If set, an exception occurred during reading; in this case the + scanning is stopped and this exception will later be reported by + the 'wait' method. */ + std::optional<gdb_exception> m_failed; + /* An object used to write to the index cache. */ + index_cache_store_context m_cache_store; +}; + +using cooked_index_worker_up = std::unique_ptr<cooked_index_worker>; + +#endif /* GDB_DWARF2_COOKED_INDEX_WORKER_H */ diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c index feaf9b5..0f20b07 100644 --- a/gdb/dwarf2/cooked-index.c +++ b/gdb/dwarf2/cooked-index.c @@ -18,25 +18,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "dwarf2/cooked-index.h" -#include "dwarf2/index-common.h" #include "dwarf2/read.h" #include "dwarf2/stringify.h" -#include "dwarf2/index-cache.h" -#include "cp-support.h" -#include "c-lang.h" -#include "ada-lang.h" -#include "dwarf2/tag.h" #include "event-top.h" -#include "exceptions.h" -#include "split-name.h" #include "observable.h" #include "run-on-main-thread.h" -#include <algorithm> -#include "gdbsupport/gdb-safe-ctype.h" -#include "gdbsupport/selftest.h" #include "gdbsupport/task-group.h" -#include "gdbsupport/thread-pool.h" -#include <chrono> #include "cli/cli-cmds.h" /* We don't want gdb to exit while it is in the process of writing to @@ -44,25 +31,12 @@ here, and then these are all waited for before exit proceeds. */ static gdb::unordered_set<cooked_index *> active_vectors; -/* See cooked-index.h. */ - -std::string -to_string (cooked_index_flag flags) -{ - static constexpr cooked_index_flag::string_mapping mapping[] = { - MAP_ENUM_FLAG (IS_MAIN), - MAP_ENUM_FLAG (IS_STATIC), - MAP_ENUM_FLAG (IS_LINKAGE), - MAP_ENUM_FLAG (IS_TYPE_DECLARATION), - MAP_ENUM_FLAG (IS_PARENT_DEFERRED), - }; - - return flags.to_string (mapping); -} - -/* See cooked-index.h. */ +/* Return true if LANG requires canonicalization. This is used + primarily to work around an issue computing the name of "main". + This function must be kept in sync with + cooked_index_shard::finalize. */ -bool +static bool language_requires_canonicalization (enum language lang) { return (lang == language_ada @@ -70,648 +44,6 @@ language_requires_canonicalization (enum language lang) || lang == language_cplus); } -/* Return true if a plain "main" could be the main program for this - language. Languages that are known to use some other mechanism are - excluded here. */ - -static bool -language_may_use_plain_main (enum language lang) -{ - /* No need to handle "unknown" here. */ - return (lang == language_c - || lang == language_objc - || lang == language_cplus - || lang == language_m2 - || lang == language_asm - || lang == language_opencl - || lang == language_minimal); -} - -/* See cooked-index.h. */ - -int -cooked_index_entry::compare (const char *stra, const char *strb, - comparison_mode mode) -{ -#if defined (__GNUC__) && !defined (__clang__) && __GNUC__ <= 7 - /* Work around error with gcc 7.5.0. */ - auto munge = [] (char c) -> unsigned char -#else - auto munge = [] (char c) constexpr -> unsigned char -#endif - { - /* Treat '<' as if it ended the string. This lets something - like "func<t>" match "func<t<int>>". See the "Breakpoints in - template functions" section in the manual. */ - if (c == '<') - return '\0'; - return TOLOWER ((unsigned char) c); - }; - - unsigned char a = munge (*stra); - unsigned char b = munge (*strb); - - while (a != '\0' && b != '\0' && a == b) - { - a = munge (*++stra); - b = munge (*++strb); - } - - if (a == b) - return 0; - - /* When completing, if STRB ends earlier than STRA, consider them as - equal. */ - if (mode == COMPLETE && b == '\0') - return 0; - - return a < b ? -1 : 1; -} - -#if GDB_SELF_TEST - -namespace { - -void -test_compare () -{ - /* Convenience aliases. */ - const auto mode_compare = cooked_index_entry::MATCH; - const auto mode_sort = cooked_index_entry::SORT; - const auto mode_complete = cooked_index_entry::COMPLETE; - - SELF_CHECK (cooked_index_entry::compare ("abcd", "abcd", - mode_compare) == 0); - SELF_CHECK (cooked_index_entry::compare ("abcd", "abcd", - mode_complete) == 0); - - SELF_CHECK (cooked_index_entry::compare ("abcd", "ABCDE", - mode_compare) < 0); - SELF_CHECK (cooked_index_entry::compare ("ABCDE", "abcd", - mode_compare) > 0); - SELF_CHECK (cooked_index_entry::compare ("abcd", "ABCDE", - mode_complete) < 0); - SELF_CHECK (cooked_index_entry::compare ("ABCDE", "abcd", - mode_complete) == 0); - - SELF_CHECK (cooked_index_entry::compare ("name", "name<>", - mode_compare) == 0); - SELF_CHECK (cooked_index_entry::compare ("name<>", "name", - mode_compare) == 0); - SELF_CHECK (cooked_index_entry::compare ("name", "name<>", - mode_complete) == 0); - SELF_CHECK (cooked_index_entry::compare ("name<>", "name", - mode_complete) == 0); - - SELF_CHECK (cooked_index_entry::compare ("name<arg>", "name<arg>", - mode_compare) == 0); - SELF_CHECK (cooked_index_entry::compare ("name<arg>", "name<ag>", - mode_compare) == 0); - SELF_CHECK (cooked_index_entry::compare ("name<arg>", "name<arg>", - mode_complete) == 0); - SELF_CHECK (cooked_index_entry::compare ("name<arg>", "name<ag>", - mode_complete) == 0); - - SELF_CHECK (cooked_index_entry::compare ("name<arg<more>>", - "name<arg<more>>", - mode_compare) == 0); - SELF_CHECK (cooked_index_entry::compare ("name<arg>", - "name<arg<more>>", - mode_compare) == 0); - - SELF_CHECK (cooked_index_entry::compare ("name", "name<arg<more>>", - mode_compare) == 0); - SELF_CHECK (cooked_index_entry::compare ("name<arg<more>>", "name", - mode_compare) == 0); - SELF_CHECK (cooked_index_entry::compare ("name<arg<more>>", "name<arg<", - mode_compare) == 0); - SELF_CHECK (cooked_index_entry::compare ("name<arg<more>>", "name<arg<", - mode_complete) == 0); - - SELF_CHECK (cooked_index_entry::compare ("", "abcd", mode_compare) < 0); - SELF_CHECK (cooked_index_entry::compare ("", "abcd", mode_complete) < 0); - SELF_CHECK (cooked_index_entry::compare ("abcd", "", mode_compare) > 0); - SELF_CHECK (cooked_index_entry::compare ("abcd", "", mode_complete) == 0); - - SELF_CHECK (cooked_index_entry::compare ("func", "func<type>", - mode_sort) == 0); - SELF_CHECK (cooked_index_entry::compare ("func<type>", "func1", - mode_sort) < 0); -} - -} /* anonymous namespace */ - -#endif /* GDB_SELF_TEST */ - -/* See cooked-index.h. */ - -bool -cooked_index_entry::matches (domain_search_flags kind) const -{ - /* Just reject type declarations. */ - if ((flags & IS_TYPE_DECLARATION) != 0) - return false; - - return tag_matches_domain (tag, kind, lang); -} - -/* See cooked-index.h. */ - -const char * -cooked_index_entry::full_name (struct obstack *storage, - cooked_index_full_name_flag name_flags, - const char *default_sep) const -{ - const char *local_name = ((name_flags & FOR_MAIN) != 0) ? name : canonical; - - if ((flags & IS_LINKAGE) != 0 || get_parent () == nullptr) - return local_name; - - const char *sep = default_sep; - switch (lang) - { - case language_cplus: - case language_rust: - case language_fortran: - sep = "::"; - break; - - case language_ada: - if ((name_flags & FOR_ADA_LINKAGE_NAME) != 0) - { - sep = "__"; - break; - } - [[fallthrough]]; - case language_go: - case language_d: - sep = "."; - break; - - default: - if (sep == nullptr) - return local_name; - break; - } - - /* The FOR_ADA_LINKAGE_NAME flag should only affect Ada entries, so - disable it here if we don't need it. */ - if (lang != language_ada) - name_flags &= ~FOR_ADA_LINKAGE_NAME; - - get_parent ()->write_scope (storage, sep, name_flags); - obstack_grow0 (storage, local_name, strlen (local_name)); - return (const char *) obstack_finish (storage); -} - -/* See cooked-index.h. */ - -void -cooked_index_entry::write_scope (struct obstack *storage, - const char *sep, - cooked_index_full_name_flag flags) const -{ - if (get_parent () != nullptr) - get_parent ()->write_scope (storage, sep, flags); - /* When computing the Ada linkage name, the entry might not have - been canonicalized yet, so use the 'name'. */ - const char *local_name = ((flags & (FOR_MAIN | FOR_ADA_LINKAGE_NAME)) != 0 - ? name - : canonical); - obstack_grow (storage, local_name, strlen (local_name)); - obstack_grow (storage, sep, strlen (sep)); -} - -/* See cooked-index.h. */ - -cooked_index_entry * -cooked_index_shard::create (sect_offset die_offset, - enum dwarf_tag tag, - cooked_index_flag flags, - enum language lang, - const char *name, - cooked_index_entry_ref parent_entry, - dwarf2_per_cu *per_cu) -{ - if (tag == DW_TAG_module || tag == DW_TAG_namespace) - flags &= ~IS_STATIC; - else if (lang == language_cplus - && (tag == DW_TAG_class_type - || tag == DW_TAG_interface_type - || tag == DW_TAG_structure_type - || tag == DW_TAG_union_type - || tag == DW_TAG_enumeration_type - || tag == DW_TAG_enumerator)) - flags &= ~IS_STATIC; - else if (tag_is_type (tag)) - flags |= IS_STATIC; - - return new (&m_storage) cooked_index_entry (die_offset, tag, flags, - lang, name, parent_entry, - per_cu); -} - -/* See cooked-index.h. */ - -cooked_index_entry * -cooked_index_shard::add (sect_offset die_offset, enum dwarf_tag tag, - cooked_index_flag flags, enum language lang, - const char *name, cooked_index_entry_ref parent_entry, - dwarf2_per_cu *per_cu) -{ - cooked_index_entry *result = create (die_offset, tag, flags, lang, name, - parent_entry, per_cu); - m_entries.push_back (result); - - /* An explicitly-tagged main program should always override the - implicit "main" discovery. */ - if ((flags & IS_MAIN) != 0) - m_main = result; - else if ((flags & IS_PARENT_DEFERRED) == 0 - && parent_entry.resolved == nullptr - && m_main == nullptr - && language_may_use_plain_main (lang) - && strcmp (name, "main") == 0) - m_main = result; - - return result; -} - -/* See cooked-index.h. */ - -void -cooked_index_shard::handle_gnat_encoded_entry - (cooked_index_entry *entry, - htab_t gnat_entries, - std::vector<cooked_index_entry *> &new_entries) -{ - /* We decode Ada names in a particular way: operators and wide - characters are left as-is. This is done to make name matching a - bit simpler; and for wide characters, it means the choice of Ada - source charset does not affect the indexer directly. */ - std::string canonical = ada_decode (entry->name, false, false, false); - if (canonical.empty ()) - { - entry->canonical = entry->name; - return; - } - std::vector<std::string_view> names = split_name (canonical.c_str (), - split_style::DOT_STYLE); - std::string_view tail = names.back (); - names.pop_back (); - - const cooked_index_entry *parent = nullptr; - for (const auto &name : names) - { - uint32_t hashval = dwarf5_djb_hash (name); - void **slot = htab_find_slot_with_hash (gnat_entries, &name, - hashval, INSERT); - /* CUs are processed in order, so we only need to check the most - recent entry. */ - cooked_index_entry *last = (cooked_index_entry *) *slot; - if (last == nullptr || last->per_cu != entry->per_cu) - { - const char *new_name = m_names.insert (name); - last = create (entry->die_offset, DW_TAG_module, - IS_SYNTHESIZED, language_ada, new_name, parent, - entry->per_cu); - last->canonical = last->name; - new_entries.push_back (last); - *slot = last; - } - - parent = last; - } - - entry->set_parent (parent); - entry->canonical = m_names.insert (tail); -} - -/* Hash a cooked index entry by name pointer value. - - We can use pointer equality here because names come from .debug_str, which - will normally be unique-ified by the linker. Also, duplicates are relatively - harmless -- they just mean a bit of extra memory is used. */ - -struct cooked_index_entry_name_ptr_hash -{ - using is_avalanching = void; - - std::uint64_t operator () (const cooked_index_entry *entry) const noexcept - { - return ankerl::unordered_dense::hash<const char *> () (entry->name); - } -}; - -/* Compare cooked index entries by name pointer value. */ - -struct cooked_index_entry_name_ptr_eq -{ - bool operator () (const cooked_index_entry *a, - const cooked_index_entry *b) const noexcept - { - return a->name == b->name; - } -}; - -/* See cooked-index.h. */ - -void -cooked_index_shard::finalize (const parent_map_map *parent_maps) -{ - gdb::unordered_set<const cooked_index_entry *, - cooked_index_entry_name_ptr_hash, - cooked_index_entry_name_ptr_eq> seen_names; - - auto hash_entry = [] (const void *e) - { - const cooked_index_entry *entry = (const cooked_index_entry *) e; - return dwarf5_djb_hash (entry->canonical); - }; - - auto eq_entry = [] (const void *a, const void *b) -> int - { - const cooked_index_entry *ae = (const cooked_index_entry *) a; - const std::string_view *sv = (const std::string_view *) b; - return (strlen (ae->canonical) == sv->length () - && strncasecmp (ae->canonical, sv->data (), sv->length ()) == 0); - }; - - htab_up gnat_entries (htab_create_alloc (10, hash_entry, eq_entry, - nullptr, xcalloc, xfree)); - std::vector<cooked_index_entry *> new_gnat_entries; - - for (cooked_index_entry *entry : m_entries) - { - if ((entry->flags & IS_PARENT_DEFERRED) != 0) - { - const cooked_index_entry *new_parent - = parent_maps->find (entry->get_deferred_parent ()); - entry->resolve_parent (new_parent); - } - - /* Note that this code must be kept in sync with - language_requires_canonicalization. */ - gdb_assert (entry->canonical == nullptr); - if ((entry->flags & IS_LINKAGE) != 0) - entry->canonical = entry->name; - else if (entry->lang == language_ada) - { - /* Newer versions of GNAT emit DW_TAG_module and use a - hierarchical structure. In this case, we don't need to - do any extra work. This can be detected by looking for a - GNAT-encoded name. */ - if (strstr (entry->name, "__") == nullptr) - { - entry->canonical = entry->name; - - /* If the entry does not have a parent, then there's - nothing extra to do here -- the entry itself is - sufficient. - - However, if it does have a parent, we have to - synthesize an entry with the full name. This is - unfortunate, but it's necessary due to how some of - the Ada name-lookup code currently works. For - example, without this, ada_get_tsd_type will - fail. - - Eventually it would be good to change the Ada lookup - code, and then remove these entries (and supporting - code in cooked_index_entry::full_name). */ - if (entry->get_parent () != nullptr) - { - const char *fullname - = entry->full_name (&m_storage, FOR_ADA_LINKAGE_NAME); - cooked_index_entry *linkage = create (entry->die_offset, - entry->tag, - (entry->flags - | IS_LINKAGE - | IS_SYNTHESIZED), - language_ada, - fullname, - nullptr, - entry->per_cu); - linkage->canonical = fullname; - new_gnat_entries.push_back (linkage); - } - } - else - handle_gnat_encoded_entry (entry, gnat_entries.get (), - new_gnat_entries); - } - else if (entry->lang == language_cplus || entry->lang == language_c) - { - auto [it, inserted] = seen_names.insert (entry); - - if (inserted) - { - /* No entry with that name was present, compute the canonical - name. */ - gdb::unique_xmalloc_ptr<char> canon_name - = (entry->lang == language_cplus - ? cp_canonicalize_string (entry->name) - : c_canonicalize_name (entry->name)); - if (canon_name == nullptr) - entry->canonical = entry->name; - else - entry->canonical = m_names.insert (std::move (canon_name)); - } - else - { - /* An entry with that name was present, re-use its canonical - name. */ - entry->canonical = (*it)->canonical; - } - } - else - entry->canonical = entry->name; - } - - /* Make sure any new Ada entries end up in the results. This isn't - done when creating these new entries to avoid invalidating the - m_entries iterator used in the foreach above. */ - m_entries.insert (m_entries.end (), new_gnat_entries.begin (), - new_gnat_entries.end ()); - - m_entries.shrink_to_fit (); - std::sort (m_entries.begin (), m_entries.end (), - [] (const cooked_index_entry *a, const cooked_index_entry *b) - { - return *a < *b; - }); -} - -/* See cooked-index.h. */ - -cooked_index_shard::range -cooked_index_shard::find (const std::string &name, bool completing) const -{ - struct comparator - { - cooked_index_entry::comparison_mode mode; - - bool operator() (const cooked_index_entry *entry, - const char *name) const noexcept - { - return cooked_index_entry::compare (entry->canonical, name, mode) < 0; - } - - bool operator() (const char *name, - const cooked_index_entry *entry) const noexcept - { - return cooked_index_entry::compare (entry->canonical, name, mode) > 0; - } - }; - - return std::make_from_tuple<range> - (std::equal_range (m_entries.cbegin (), m_entries.cend (), name.c_str (), - comparator { (completing - ? cooked_index_entry::COMPLETE - : cooked_index_entry::MATCH) })); -} - -/* See cooked-index.h. */ - -void -cooked_index_worker::start () -{ - gdb::thread_pool::g_thread_pool->post_task ([this] () - { - try - { - do_reading (); - } - catch (const gdb_exception &exc) - { - m_failed = exc; - set (cooked_state::CACHE_DONE); - } - - bfd_thread_cleanup (); - }); -} - -/* See cooked-index.h. */ - -bool -cooked_index_worker::wait (cooked_state desired_state, bool allow_quit) -{ - bool done; -#if CXX_STD_THREAD - { - std::unique_lock<std::mutex> lock (m_mutex); - - /* This may be called from a non-main thread -- this functionality - is needed for the index cache -- but in this case we require - that the desired state already have been attained. */ - gdb_assert (is_main_thread () || desired_state <= m_state); - - while (desired_state > m_state) - { - if (allow_quit) - { - std::chrono::milliseconds duration { 15 }; - if (m_cond.wait_for (lock, duration) == std::cv_status::timeout) - QUIT; - } - else - m_cond.wait (lock); - } - done = m_state == cooked_state::CACHE_DONE; - } -#else - /* Without threads, all the work is done immediately on the main - thread, and there is never anything to wait for. */ - done = desired_state == cooked_state::CACHE_DONE; -#endif /* CXX_STD_THREAD */ - - /* Only the main thread is allowed to report complaints and the - like. */ - if (!is_main_thread ()) - return false; - - if (m_reported) - return done; - m_reported = true; - - /* Emit warnings first, maybe they were emitted before an exception - (if any) was thrown. */ - m_warnings.emit (); - - if (m_failed.has_value ()) - { - /* do_reading failed -- report it. */ - exception_print (gdb_stderr, *m_failed); - m_failed.reset (); - return done; - } - - /* Only show a given exception a single time. */ - gdb::unordered_set<gdb_exception> seen_exceptions; - for (auto &one_result : m_results) - { - re_emit_complaints (std::get<1> (one_result)); - for (auto &one_exc : std::get<2> (one_result)) - if (seen_exceptions.insert (one_exc).second) - exception_print (gdb_stderr, one_exc); - } - - print_stats (); - - struct objfile *objfile = m_per_objfile->objfile; - dwarf2_per_bfd *per_bfd = m_per_objfile->per_bfd; - cooked_index *table - = (gdb::checked_static_cast<cooked_index *> - (per_bfd->index_table.get ())); - - auto_obstack temp_storage; - enum language lang = language_unknown; - const char *main_name = table->get_main_name (&temp_storage, &lang); - if (main_name != nullptr) - set_objfile_main_name (objfile, main_name, lang); - - /* dwarf_read_debug_printf ("Done building psymtabs of %s", */ - /* objfile_name (objfile)); */ - - return done; -} - -/* See cooked-index.h. */ - -void -cooked_index_worker::set (cooked_state desired_state) -{ - gdb_assert (desired_state != cooked_state::INITIAL); - -#if CXX_STD_THREAD - std::lock_guard<std::mutex> guard (m_mutex); - gdb_assert (desired_state > m_state); - m_state = desired_state; - m_cond.notify_one (); -#else - /* Without threads, all the work is done immediately on the main - thread, and there is never anything to do. */ -#endif /* CXX_STD_THREAD */ -} - -/* See cooked-index.h. */ - -void -cooked_index_worker::write_to_cache (const cooked_index *idx, - deferred_warnings *warn) const -{ - if (idx != nullptr) - { - /* Writing to the index cache may cause a warning to be emitted. - See PR symtab/30837. This arranges to capture all such - warnings. This is safe because we know the deferred_warnings - object isn't in use by any other thread at this point. */ - scoped_restore_warning_hook defer (warn); - m_cache_store.store (); - } -} - cooked_index::cooked_index (cooked_index_worker_up &&worker) : m_state (std::move (worker)) { @@ -746,12 +78,10 @@ cooked_index::wait (cooked_state desired_state, bool allow_quit) } void -cooked_index::set_contents (std::vector<cooked_index_shard_up> &&shards, - deferred_warnings *warn, - const parent_map_map *parent_maps) +cooked_index::set_contents () { gdb_assert (m_shards.empty ()); - m_shards = std::move (shards); + m_shards = m_state->release_shards (); m_state->set (cooked_state::MAIN_AVAILABLE); @@ -760,16 +90,17 @@ cooked_index::set_contents (std::vector<cooked_index_shard_up> &&shards, finalization. However, that would take a slot in the global thread pool, and if enough such tasks were submitted at once, it would cause a livelock. */ - gdb::task_group finalizers ([this, warn] () + gdb::task_group finalizers ([this] () { m_state->set (cooked_state::FINALIZED); - m_state->write_to_cache (index_for_writing (), warn); + m_state->write_to_cache (index_for_writing ()); m_state->set (cooked_state::CACHE_DONE); }); for (auto &shard : m_shards) { auto this_shard = shard.get (); + const parent_map_map *parent_maps = m_state->get_parent_map_map (); finalizers.add_task ([=] () { this_shard->finalize (parent_maps); }); } @@ -994,10 +325,6 @@ void _initialize_cooked_index (); void _initialize_cooked_index () { -#if GDB_SELF_TEST - selftests::register_test ("cooked_index_entry::compare", test_compare); -#endif - add_cmd ("wait-for-index-cache", class_maintenance, maintenance_wait_for_index_cache, _("\ Wait until all pending writes to the index cache have completed.\n\ diff --git a/gdb/dwarf2/cooked-index.h b/gdb/dwarf2/cooked-index.h index 56c84bd..384938e 100644 --- a/gdb/dwarf2/cooked-index.h +++ b/gdb/dwarf2/cooked-index.h @@ -20,490 +20,16 @@ #ifndef GDB_DWARF2_COOKED_INDEX_H #define GDB_DWARF2_COOKED_INDEX_H -#include "dwarf2.h" -#include "dwarf2/types.h" +#include "dwarf2/cooked-index-entry.h" #include "symtab.h" -#include "hashtab.h" #include "quick-symbol.h" -#include "gdbsupport/gdb_obstack.h" #include "addrmap.h" -#include "gdbsupport/iterator-range.h" #include "dwarf2/mapped-index.h" #include "dwarf2/read.h" #include "dwarf2/parent-map.h" #include "gdbsupport/range-chain.h" -#include "gdbsupport/string-set.h" -#include "complaints.h" - -#if CXX_STD_THREAD -#include <mutex> -#include <condition_variable> -#endif /* CXX_STD_THREAD */ - -struct dwarf2_per_cu; -struct dwarf2_per_bfd; -struct index_cache_store_context; -struct cooked_index_entry; - -/* Flags that describe an entry in the index. */ -enum cooked_index_flag_enum : unsigned char -{ - /* True if this entry is the program's "main". */ - IS_MAIN = 1, - /* True if this entry represents a "static" object. */ - IS_STATIC = 2, - /* True if this entry uses the linkage name. */ - IS_LINKAGE = 4, - /* True if this entry is just for the declaration of a type, not the - definition. */ - IS_TYPE_DECLARATION = 8, - /* True is parent_entry.deferred has a value rather than parent_entry - .resolved. */ - IS_PARENT_DEFERRED = 16, - /* True if this entry was synthesized by gdb (as opposed to coming - directly from the DWARF). */ - IS_SYNTHESIZED = 32, -}; -DEF_ENUM_FLAGS_TYPE (enum cooked_index_flag_enum, cooked_index_flag); - -/* Flags used when requesting the full name of an entry. */ -enum cooked_index_full_name_enum : unsigned char -{ - /* Set when requesting the name of "main". See the method for the - full description. */ - FOR_MAIN = 1, - /* Set when requesting the linkage name for an Ada entry. */ - FOR_ADA_LINKAGE_NAME = 2, -}; -DEF_ENUM_FLAGS_TYPE (enum cooked_index_full_name_enum, cooked_index_full_name_flag); - -/* Type representing either a resolved or deferred cooked_index_entry. */ - -union cooked_index_entry_ref -{ - cooked_index_entry_ref (parent_map::addr_type deferred_) - { - deferred = deferred_; - } - - cooked_index_entry_ref (const cooked_index_entry *resolved_) - { - resolved = resolved_; - } - - const cooked_index_entry *resolved; - parent_map::addr_type deferred; -}; - -/* Return a string representation of FLAGS. */ - -std::string to_string (cooked_index_flag flags); - -/* Return true if LANG requires canonicalization. This is used - primarily to work around an issue computing the name of "main". - This function must be kept in sync with - cooked_index_shard::finalize. */ - -extern bool language_requires_canonicalization (enum language lang); - -/* A cooked_index_entry represents a single item in the index. Note - that two entries can be created for the same DIE -- one using the - name, and another one using the linkage name, if any. - - This is an "open" class and the members are all directly - accessible. It is read-only after the index has been fully read - and processed. */ -struct cooked_index_entry : public allocate_on_obstack<cooked_index_entry> -{ - cooked_index_entry (sect_offset die_offset_, enum dwarf_tag tag_, - cooked_index_flag flags_, - enum language lang_, const char *name_, - cooked_index_entry_ref parent_entry_, - dwarf2_per_cu *per_cu_) - : name (name_), - tag (tag_), - flags (flags_), - lang (lang_), - die_offset (die_offset_), - per_cu (per_cu_), - m_parent_entry (parent_entry_) - { - } - - /* Return true if this entry matches SEARCH_FLAGS. */ - bool matches (block_search_flags search_flags) const - { - /* Just reject type declarations. */ - if ((flags & IS_TYPE_DECLARATION) != 0) - return false; - - if ((search_flags & SEARCH_STATIC_BLOCK) != 0 - && (flags & IS_STATIC) != 0) - return true; - if ((search_flags & SEARCH_GLOBAL_BLOCK) != 0 - && (flags & IS_STATIC) == 0) - return true; - return false; - } - - /* Return true if this entry matches KIND. */ - bool matches (domain_search_flags kind) const; - - /* Construct the fully-qualified name of this entry and return a - pointer to it. If allocation is needed, it will be done on - STORAGE. - - FLAGS affects the result. If the FOR_MAIN flag is set, we are - computing the name of the "main" entry -- one marked - DW_AT_main_subprogram. This matters for avoiding name - canonicalization and also a related race (if "main" computation - is done during finalization). - - If the FOR_ADA_LINKAGE_NAME flag is set, then Ada-language - symbols will have their "linkage-style" name computed. The - default is source-style. - - If the language doesn't prescribe a separator, one can be - specified using DEFAULT_SEP. */ - const char *full_name (struct obstack *storage, - cooked_index_full_name_flag name_flags = 0, - const char *default_sep = nullptr) const; - - /* Comparison modes for the 'compare' function. See the function - for a description. */ - enum comparison_mode - { - MATCH, - SORT, - COMPLETE, - }; - - /* Compare two strings, case-insensitively. Return -1 if STRA is - less than STRB, 0 if they are equal, and 1 if STRA is greater. - - When comparing, '<' is considered to be less than all other - printable characters. This ensures that "t<x>" sorts before - "t1", which is necessary when looking up "t". This '<' handling - is to ensure that certain C++ lookups work correctly. It is - inexact, and applied regardless of the search language, but this - is ok because callers of this code do more precise filtering - according to their needs. This is also why using a - case-insensitive comparison works even for languages that are - case sensitive. - - MODE controls how the comparison proceeds. - - MODE==SORT is used when sorting and the only special '<' handling - that it does is to ensure that '<' sorts before all other - printable characters. This ensures that the resulting ordering - will be binary-searchable. - - MODE==MATCH is used when searching for a symbol. In this case, - STRB must always be the search name, and STRA must be the name in - the index that is under consideration. In compare mode, early - termination of STRB may match STRA -- for example, "t<int>" and - "t" will be considered to be equal. (However, if A=="t" and - B=="t<int>", then this will not consider them as equal.) - - MODE==COMPLETE is used when searching for a symbol for - completion. In this case, STRB must always be the search name, - and STRA must be the name in the index that is under - consideration. In completion mode, early termination of STRB - always results in a match. */ - static int compare (const char *stra, const char *strb, - comparison_mode mode); - - /* Compare two entries by canonical name. */ - bool operator< (const cooked_index_entry &other) const - { - return compare (canonical, other.canonical, SORT) < 0; - } - - /* Set parent entry to PARENT. */ - void set_parent (const cooked_index_entry *parent) - { - gdb_assert ((flags & IS_PARENT_DEFERRED) == 0); - m_parent_entry.resolved = parent; - } - - /* Resolve deferred parent entry to PARENT. */ - void resolve_parent (const cooked_index_entry *parent) - { - gdb_assert ((flags & IS_PARENT_DEFERRED) != 0); - flags = flags & ~IS_PARENT_DEFERRED; - m_parent_entry.resolved = parent; - } - - /* Return parent entry. */ - const cooked_index_entry *get_parent () const - { - gdb_assert ((flags & IS_PARENT_DEFERRED) == 0); - return m_parent_entry.resolved; - } - - /* Return deferred parent entry. */ - parent_map::addr_type get_deferred_parent () const - { - gdb_assert ((flags & IS_PARENT_DEFERRED) != 0); - return m_parent_entry.deferred; - } - - /* The name as it appears in DWARF. This always points into one of - the mapped DWARF sections. Note that this may be the name or the - linkage name -- two entries are created for DIEs which have both - attributes. */ - const char *name; - /* The canonical name. This may be equal to NAME. */ - const char *canonical = nullptr; - /* The DWARF tag. */ - enum dwarf_tag tag; - /* Any flags attached to this entry. */ - cooked_index_flag flags; - /* The language of this symbol. */ - ENUM_BITFIELD (language) lang : LANGUAGE_BITS; - /* The offset of this DIE. */ - sect_offset die_offset; - /* The CU from which this entry originates. */ - dwarf2_per_cu *per_cu; - -private: - - /* A helper method for full_name. Emits the full scope of this - object, followed by the separator, to STORAGE. If this entry has - a parent, its write_scope method is called first. See full_name - for a description of the FLAGS parameter. */ - void write_scope (struct obstack *storage, const char *sep, - cooked_index_full_name_flag flags) const; - - /* The parent entry. This is NULL for top-level entries. - Otherwise, it points to the parent entry, such as a namespace or - class. */ - cooked_index_entry_ref m_parent_entry; -}; - -class cooked_index; - -/* An index of interesting DIEs. This is "cooked", in contrast to a - mapped .debug_names or .gdb_index, which are "raw". An entry in - the index is of type cooked_index_entry. - - Operations on the index are described below. They are chosen to - make it relatively simple to implement the symtab "quick" - methods. */ -class cooked_index_shard -{ -public: - cooked_index_shard () = default; - DISABLE_COPY_AND_ASSIGN (cooked_index_shard); - - /* Create a new cooked_index_entry and register it with this object. - Entries are owned by this object. The new item is returned. */ - cooked_index_entry *add (sect_offset die_offset, enum dwarf_tag tag, - cooked_index_flag flags, enum language lang, - const char *name, - cooked_index_entry_ref parent_entry, - dwarf2_per_cu *per_cu); - - /* Install a new fixed addrmap from the given mutable addrmap. */ - void install_addrmap (addrmap_mutable *map) - { - gdb_assert (m_addrmap == nullptr); - m_addrmap = new (&m_storage) addrmap_fixed (&m_storage, map); - } - - friend class cooked_index; - - /* A simple range over part of m_entries. */ - typedef iterator_range<std::vector<cooked_index_entry *>::const_iterator> - range; - - /* Return a range of all the entries. */ - range all_entries () const - { - return { m_entries.cbegin (), m_entries.cend () }; - } - - /* Look up an entry by name. Returns a range of all matching - results. If COMPLETING is true, then a larger range, suitable - for completion, will be returned. */ - range find (const std::string &name, bool completing) const; - -private: - - /* Return the entry that is believed to represent the program's - "main". This will return NULL if no such entry is available. */ - const cooked_index_entry *get_main () const - { - return m_main; - } - - /* Look up ADDR in the address map, and return either the - corresponding CU, or nullptr if the address could not be - found. */ - dwarf2_per_cu *lookup (unrelocated_addr addr) - { - if (m_addrmap == nullptr) - return nullptr; - - return (static_cast<dwarf2_per_cu *> (m_addrmap->find ((CORE_ADDR) addr))); - } - - /* Create a new cooked_index_entry and register it with this object. - Entries are owned by this object. The new item is returned. */ - cooked_index_entry *create (sect_offset die_offset, - enum dwarf_tag tag, - cooked_index_flag flags, - enum language lang, - const char *name, - cooked_index_entry_ref parent_entry, - dwarf2_per_cu *per_cu); - - /* When GNAT emits mangled ("encoded") names in the DWARF, and does - not emit the module structure, we still need this structuring to - do lookups. This function recreates that information for an - existing entry, modifying ENTRY as appropriate. Any new entries - are added to NEW_ENTRIES. */ - void handle_gnat_encoded_entry - (cooked_index_entry *entry, htab_t gnat_entries, - std::vector<cooked_index_entry *> &new_entries); - - /* Finalize the index. This should be called a single time, when - the index has been fully populated. It enters all the entries - into the internal table and fixes up all missing parent links. - This may be invoked in a worker thread. */ - void finalize (const parent_map_map *parent_maps); - - /* Storage for the entries. */ - auto_obstack m_storage; - /* List of all entries. */ - std::vector<cooked_index_entry *> m_entries; - /* If we found an entry with 'is_main' set, store it here. */ - cooked_index_entry *m_main = nullptr; - /* The addrmap. This maps address ranges to dwarf2_per_cu objects. */ - addrmap_fixed *m_addrmap = nullptr; - /* Storage for canonical names. */ - gdb::string_set m_names; -}; - -using cooked_index_shard_up = std::unique_ptr<cooked_index_shard>; - -/* The possible states of the index. See the explanatory comment - before cooked_index for more details. */ -enum class cooked_state -{ - /* The default state. This is not a valid argument to 'wait'. */ - INITIAL, - /* The initial scan has completed. The name of "main" is now - available (if known). The addrmaps are usable now. - Finalization has started but is not complete. */ - MAIN_AVAILABLE, - /* Finalization has completed. This means the index is fully - available for queries. */ - FINALIZED, - /* Writing to the index cache has finished. */ - CACHE_DONE, -}; - -/* An object of this type controls the scanning of the DWARF. It - schedules the worker tasks and tracks the current state. Once - scanning is done, this object is discarded. - - This is an abstract base class that defines the basic behavior of - scanners. Separate concrete implementations exist for scanning - .debug_names and .debug_info. */ - -class cooked_index_worker -{ -public: - - explicit cooked_index_worker (dwarf2_per_objfile *per_objfile) - : m_per_objfile (per_objfile), - m_cache_store (global_index_cache, per_objfile->per_bfd) - { } - virtual ~cooked_index_worker () - { } - DISABLE_COPY_AND_ASSIGN (cooked_index_worker); - - /* Start reading. */ - void start (); - - /* Wait for a particular state to be achieved. If ALLOW_QUIT is - true, then the loop will check the QUIT flag. Normally this - method may only be called from the main thread; however, it can - be called from a worker thread provided that the desired state - has already been attained. (This oddity is used by the index - cache writer.) */ - bool wait (cooked_state desired_state, bool allow_quit); - -protected: - - /* Let cooked_index call the 'set' and 'write_to_cache' methods. */ - friend class cooked_index; - - /* Set the current state. */ - void set (cooked_state desired_state); - - /* Write to the index cache. */ - void write_to_cache (const cooked_index *idx, - deferred_warnings *warn) const; - - /* Helper function that does the work of reading. This must be able - to be run in a worker thread without problems. */ - virtual void do_reading () = 0; - - /* A callback that can print stats, if needed. This is called when - transitioning to the 'MAIN_AVAILABLE' state. */ - virtual void print_stats () - { } - - /* Each thread returns a tuple holding a cooked index, any collected - complaints, a vector of errors that should be printed, and a - parent map. - - The errors are retained because GDB's I/O system is not - thread-safe. run_on_main_thread could be used, but that would - mean the messages are printed after the prompt, which looks - weird. */ - using result_type = std::tuple<cooked_index_shard_up, - complaint_collection, - std::vector<gdb_exception>, - parent_map>; - - /* The per-objfile object. */ - dwarf2_per_objfile *m_per_objfile; - /* Result of each worker task. */ - std::vector<result_type> m_results; - /* Any warnings emitted. This is not in 'result_type' because (for - the time being at least), it's only needed in do_reading, not in - every worker. Note that deferred_warnings uses gdb_stderr in its - constructor, and this should only be done from the main thread. - This is enforced in the cooked_index_worker constructor. */ - deferred_warnings m_warnings; - - /* A map of all parent maps. Used during finalization to fix up - parent relationships. */ - parent_map_map m_all_parents_map; - -#if CXX_STD_THREAD - /* Current state of this object. */ - cooked_state m_state = cooked_state::INITIAL; - /* Mutex and condition variable used to synchronize. */ - std::mutex m_mutex; - std::condition_variable m_cond; -#endif /* CXX_STD_THREAD */ - /* This flag indicates whether any complaints or exceptions that - arose during scanning have been reported by 'wait'. This may - only be modified on the main thread. */ - bool m_reported = false; - /* If set, an exception occurred during reading; in this case the - scanning is stopped and this exception will later be reported by - the 'wait' method. */ - std::optional<gdb_exception> m_failed; - /* An object used to write to the index cache. */ - index_cache_store_context m_cache_store; -}; - -using cooked_index_worker_up = std::unique_ptr<cooked_index_worker>; +#include "dwarf2/cooked-index-shard.h" +#include "dwarf2/cooked-index-worker.h" /* The main index of DIEs. @@ -515,6 +41,14 @@ using cooked_index_worker_up = std::unique_ptr<cooked_index_worker>; possible. This combination should help hide the effort from the user to the maximum possible degree. + There are a number of different objects involved in this process. + Most of them are temporary -- they are created to handle different + phases of scanning, then discarded when possible. The "steady + state" objects are index itself (cooked_index, below), which holds + the entries (cooked_index_entry), and the implementation of the + "quick" API (e.g., cooked_index_functions, though there are + other variants). + . Main Thread | Worker Threads ============================================================ . dwarf2_initialize_objfile @@ -546,6 +80,7 @@ using cooked_index_worker_up = std::unique_ptr<cooked_index_worker>; . v . maybe write to index cache . state = CACHE_DONE + . ~cooked_index_worker . . . if main thread calls... @@ -570,14 +105,8 @@ public: void start_reading () override; /* Called by cooked_index_worker to set the contents of this index - and transition to the MAIN_AVAILABLE state. WARN is used to - collect any warnings that may arise when writing to the cache. - PARENT_MAPS is used when resolving pending parent links. - PARENT_MAPS may be NULL if there are no IS_PARENT_DEFERRED - entries in VEC. */ - void set_contents (std::vector<cooked_index_shard_up> &&vec, - deferred_warnings *warn, - const parent_map_map *parent_maps); + and transition to the MAIN_AVAILABLE state. */ + void set_contents (); /* A range over a vector of subranges. */ using range = range_chain<cooked_index_shard::range>; diff --git a/gdb/dwarf2/cooked-indexer.c b/gdb/dwarf2/cooked-indexer.c index 789fdb5..1f3a235 100644 --- a/gdb/dwarf2/cooked-indexer.c +++ b/gdb/dwarf2/cooked-indexer.c @@ -18,12 +18,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "dwarf2/cooked-indexer.h" -#include "dwarf2/cooked-index-storage.h" +#include "dwarf2/cooked-index-worker.h" #include "dwarf2/error.h" /* See cooked-indexer.h. */ -cooked_indexer::cooked_indexer (cooked_index_storage *storage, +cooked_indexer::cooked_indexer (cooked_index_worker_result *storage, dwarf2_per_cu *per_cu, enum language language) : m_index_storage (storage), m_per_cu (per_cu), diff --git a/gdb/dwarf2/cooked-indexer.h b/gdb/dwarf2/cooked-indexer.h index 93626a9..904c55f 100644 --- a/gdb/dwarf2/cooked-indexer.h +++ b/gdb/dwarf2/cooked-indexer.h @@ -20,13 +20,13 @@ #ifndef GDB_DWARF2_COOKED_INDEXER_H #define GDB_DWARF2_COOKED_INDEXER_H -#include "dwarf2/cooked-index.h" +#include "dwarf2/cooked-index-entry.h" #include "dwarf2/parent-map.h" #include "dwarf2/types.h" #include <variant> struct abbrev_info; -struct cooked_index_storage; +struct cooked_index_worker_result; struct cutu_reader; struct dwarf2_per_cu; struct dwarf2_per_objfile; @@ -36,7 +36,7 @@ struct dwarf2_per_objfile; class cooked_indexer { public: - cooked_indexer (cooked_index_storage *storage, dwarf2_per_cu *per_cu, + cooked_indexer (cooked_index_worker_result *storage, dwarf2_per_cu *per_cu, enum language language); DISABLE_COPY_AND_ASSIGN (cooked_indexer); @@ -103,7 +103,7 @@ private: bool fully); /* The storage object, where the results are kept. */ - cooked_index_storage *m_index_storage; + cooked_index_worker_result *m_index_storage; /* The CU that we are reading on behalf of. This object might be asked to index one CU but to treat the results as if they come from some including CU; in this case the including CU would be diff --git a/gdb/dwarf2/parent-map.c b/gdb/dwarf2/parent-map.c index d029a76..6f290c1 100644 --- a/gdb/dwarf2/parent-map.c +++ b/gdb/dwarf2/parent-map.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "dwarf2/cooked-index.h" +#include "dwarf2/cooked-index-entry.h" #include "dwarf2/read.h" #include "dwarf2/parent-map.h" diff --git a/gdb/dwarf2/read-debug-names.c b/gdb/dwarf2/read-debug-names.c index edac713..96a8ad3 100644 --- a/gdb/dwarf2/read-debug-names.c +++ b/gdb/dwarf2/read-debug-names.c @@ -114,11 +114,12 @@ struct mapped_debug_names_reader gdb::unordered_map<ULONGEST, index_val> abbrev_map; - /* Even though the scanning of .debug_names and creation of the cooked index - entries is done serially, we create multiple shards so that the - finalization step can be parallelized. The shards are filled in a round - robin fashion. */ - std::vector<cooked_index_shard_up> shards; + /* Even though the scanning of .debug_names and creation of the + cooked index entries is done serially, we create multiple shards + so that the finalization step can be parallelized. The shards + are filled in a round robin fashion. It's convenient to use a + result object rather than an actual shard. */ + std::vector<cooked_index_worker_result> indices; /* Next shard to insert an entry in. */ int next_shard = 0; @@ -290,11 +291,11 @@ mapped_debug_names_reader::scan_one_entry (const char *name, if (per_cu != nullptr) { *result - = shards[next_shard]->add (die_offset, (dwarf_tag) indexval.dwarf_tag, + = indices[next_shard].add (die_offset, (dwarf_tag) indexval.dwarf_tag, flags, lang, name, nullptr, per_cu); ++next_shard; - if (next_shard == shards.size ()) + if (next_shard == indices.size ()) next_shard = 0; entry_pool_offsets_to_entries.emplace (offset_in_entry_pool, *result); @@ -414,29 +415,31 @@ void cooked_index_worker_debug_names::do_reading () { complaint_interceptor complaint_handler; - std::vector<gdb_exception> exceptions; + try { m_map.scan_all_names (); } - catch (const gdb_exception &exc) + catch (gdb_exception &exc) { - exceptions.push_back (std::move (exc)); + /* Arbitrarily put all exceptions into the first result. */ + m_map.indices[0].note_error (std::move (exc)); } - m_results.emplace_back (nullptr, - complaint_handler.release (), - std::move (exceptions), - parent_map ()); - - dwarf2_per_bfd *per_bfd = m_per_objfile->per_bfd; - cooked_index *table - = (gdb::checked_static_cast<cooked_index *> - (per_bfd->index_table.get ())); + bool first = true; + for (auto &iter : m_map.indices) + { + if (first) + { + iter.done_reading (complaint_handler.release ()); + first = false; + } + else + iter.done_reading ({}); + } - /* Note that this code never uses IS_PARENT_DEFERRED, so it is safe - to pass nullptr here. */ - table->set_contents (std::move (m_map.shards), &m_warnings, nullptr); + m_results = std::move (m_map.indices); + done_reading (); bfd_thread_cleanup (); } @@ -838,24 +841,26 @@ do_dwarf2_read_debug_names (dwarf2_per_objfile *per_objfile) } per_bfd->debug_aranges.read (per_objfile->objfile); - addrmap_mutable addrmap; + + /* There is a single address map for the whole index (coming from + .debug_aranges). We only need to install it into a single shard + for it to get searched by cooked_index. So, we make the first + result object here, so we can store the addrmap, then move it + into place later. */ + cooked_index_worker_result first; deferred_warnings warnings; read_addrmap_from_aranges (per_objfile, &per_bfd->debug_aranges, - &addrmap, &warnings); + first.get_addrmap (), &warnings); warnings.emit (); const auto n_workers = std::max<std::size_t> (gdb::thread_pool::g_thread_pool->thread_count (), 1); - /* Create as many index shard as there are worker threads. */ - for (int i = 0; i < n_workers; ++i) - map.shards.emplace_back (std::make_unique<cooked_index_shard> ()); - - /* There is a single address map for the whole index (coming from - .debug_aranges). We only need to install it into a single shard for it to - get searched by cooked_index. */ - map.shards[0]->install_addrmap (&addrmap); + /* Create as many index shard as there are worker threads, + preserving the first one. */ + map.indices.push_back (std::move (first)); + map.indices.resize (n_workers); auto cidn = (std::make_unique<cooked_index_worker_debug_names> (per_objfile, std::move (map))); diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 3d7b6dd..17f06ff 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -32,7 +32,7 @@ #include "dwarf2/aranges.h" #include "dwarf2/attribute.h" #include "dwarf2/comp-unit-head.h" -#include "dwarf2/cooked-index-storage.h" +#include "dwarf2/cooked-index-worker.h" #include "dwarf2/cooked-indexer.h" #include "dwarf2/cu.h" #include "dwarf2/index-cache.h" @@ -728,7 +728,7 @@ show_dwarf_synchronous (struct ui_file *file, int from_tty, /* local function prototypes */ static void build_type_psymtabs_reader (cutu_reader *reader, - cooked_index_storage *storage); + cooked_index_worker_result *storage); static void var_decode_location (struct attribute *attr, struct symbol *sym, @@ -3289,7 +3289,7 @@ get_type_unit_group_key (struct dwarf2_cu *cu, const struct attribute *stmt_list static void process_psymtab_comp_unit (dwarf2_per_cu *this_cu, dwarf2_per_objfile *per_objfile, - cooked_index_storage *storage) + cooked_index_worker_result *storage) { cutu_reader *reader = storage->get_reader (this_cu); if (reader == nullptr) @@ -3326,7 +3326,7 @@ process_psymtab_comp_unit (dwarf2_per_cu *this_cu, static void build_type_psymtabs_reader (cutu_reader *reader, - cooked_index_storage *storage) + cooked_index_worker_result *storage) { struct dwarf2_cu *cu = reader->cu (); dwarf2_per_cu *per_cu = cu->per_cu; @@ -3379,7 +3379,7 @@ struct tu_abbrev_offset static void build_type_psymtabs (dwarf2_per_objfile *per_objfile, - cooked_index_storage *storage) + cooked_index_worker_result *storage) { struct tu_stats *tu_stats = &per_objfile->per_bfd->tu_stats; abbrev_table_up abbrev_table; @@ -3476,7 +3476,7 @@ print_tu_stats (dwarf2_per_objfile *per_objfile) static void process_skeletonless_type_unit (dwo_unit *dwo_unit, dwarf2_per_objfile *per_objfile, - cooked_index_storage *storage) + cooked_index_worker_result *storage) { dwarf2_per_bfd *per_bfd = per_objfile->per_bfd; @@ -3507,7 +3507,7 @@ process_skeletonless_type_unit (dwo_unit *dwo_unit, static void process_skeletonless_type_units (dwarf2_per_objfile *per_objfile, - cooked_index_storage *storage) + cooked_index_worker_result *storage) { /* Skeletonless TUs in DWP files without .gdb_index is not supported yet. */ if (get_dwp_file (per_objfile) == nullptr) @@ -3553,7 +3553,7 @@ private: /* After the last DWARF-reading task has finished, this function does the remaining work to finish the scan. */ - void done_reading (); + void done_reading () override; /* An iterator for the comp units. */ using unit_iterator = std::vector<dwarf2_per_cu_up>::iterator; @@ -3567,12 +3567,13 @@ private: /* A storage object for "leftovers" -- see the 'start' method, but essentially things not parsed during the normal CU parsing passes. */ - cooked_index_storage m_index_storage; + cooked_index_worker_result m_index_storage; }; void -cooked_index_worker_debug_info::process_cus (size_t task_number, unit_iterator first, - unit_iterator end) +cooked_index_worker_debug_info::process_cus (size_t task_number, + unit_iterator first, + unit_iterator end) { SCOPE_EXIT { bfd_thread_cleanup (); }; @@ -3580,7 +3581,7 @@ cooked_index_worker_debug_info::process_cus (size_t task_number, unit_iterator f complaint_interceptor complaint_handler; std::vector<gdb_exception> errors; - cooked_index_storage thread_storage; + cooked_index_worker_result thread_storage; for (auto inner = first; inner != end; ++inner) { dwarf2_per_cu *per_cu = inner->get (); @@ -3591,43 +3592,24 @@ cooked_index_worker_debug_info::process_cus (size_t task_number, unit_iterator f } catch (gdb_exception &except) { - errors.push_back (std::move (except)); + thread_storage.note_error (std::move (except)); } } - m_results[task_number] = result_type (thread_storage.release (), - complaint_handler.release (), - std::move (errors), - thread_storage.release_parent_map ()); + thread_storage.done_reading (complaint_handler.release ()); + m_results[task_number] = std::move (thread_storage); } void cooked_index_worker_debug_info::done_reading () { - /* Only handle the scanning results here. Complaints and exceptions - can only be dealt with on the main thread. */ - std::vector<cooked_index_shard_up> shards; - - for (auto &one_result : m_results) - { - shards.push_back (std::move (std::get<0> (one_result))); - m_all_parents_map.add_map (std::get<3> (one_result)); - } - /* This has to wait until we read the CUs, we need the list of DWOs. */ process_skeletonless_type_units (m_per_objfile, &m_index_storage); - shards.push_back (m_index_storage.release ()); - shards.shrink_to_fit (); - - m_all_parents_map.add_map (m_index_storage.release_parent_map ()); + m_results.push_back (std::move (m_index_storage)); - dwarf2_per_bfd *per_bfd = m_per_objfile->per_bfd; - cooked_index *table - = (gdb::checked_static_cast<cooked_index *> - (per_bfd->index_table.get ())); - table->set_contents (std::move (shards), &m_warnings, - &m_all_parents_map); + /* Call into the base class. */ + cooked_index_worker::done_reading (); } void diff --git a/gdb/gdbarch-selftests.c b/gdb/gdbarch-selftests.c index 27b17d17..8f42557 100644 --- a/gdb/gdbarch-selftests.c +++ b/gdb/gdbarch-selftests.c @@ -127,6 +127,9 @@ register_to_value_test (struct gdbarch *gdbarch) static void register_name_test (struct gdbarch *gdbarch) { + if (selftest_skip_warning_arch (gdbarch)) + return; + scoped_mock_context<test_target_ops> mockctx (gdbarch); /* Track the number of times each register name appears. */ diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c index 8453366..7852f56 100644 --- a/gdb/go32-nat.c +++ b/gdb/go32-nat.c @@ -697,7 +697,7 @@ go32_nat_target::create_inferior (const char *exec_file, "not enough memory.\n")); /* Parse the command line and create redirections. */ - if (strpbrk (args, "<>")) + if (strpbrk (args, "<>") != nullptr) { if (redir_cmdline_parse (args, &child_cmd) == 0) args = child_cmd.command; diff --git a/gdb/gstack-1.in b/gdb/gstack-1.in index 5e41329..25339d9 100755 --- a/gdb/gstack-1.in +++ b/gdb/gstack-1.in @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (C) 2024 Free Software Foundation, Inc. +# Copyright (C) 2024-2025 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,8 +22,8 @@ GDB=${GDB:-$(command -v gdb)} GDBARGS=${GDBARGS:-} AWK=${AWK:-} -PKGVERSION=@PKGVERSION@ -VERSION=@VERSION@ +PKGVERSION="@PKGVERSION@" +VERSION="@VERSION@" # Find an appropriate awk interpreter if one was not specified # via the environment. @@ -132,7 +132,7 @@ EOF ) # Run GDB and remove some unwanted noise. -"$GDB" --quiet -nx --readnever $GDBARGS <<EOF | +"$GDB" --quiet -nx $GDBARGS <<EOF | set width 0 set height 0 set pagination no diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index 3fb1c17..2b7bd2b 100644 --- a/gdb/i386-linux-tdep.c +++ b/gdb/i386-linux-tdep.c @@ -484,15 +484,15 @@ i386_canonicalize_syscall (int syscall) SYSCALL_MAP (settimeofday); SYSCALL_MAP_RENAME (getgroups, gdb_sys_getgroups16); SYSCALL_MAP_RENAME (setgroups, gdb_sys_setgroups16); - SYSCALL_MAP_RENAME (select, gdb_old_select); + SYSCALL_MAP_RENAME (select, gdb_sys_old_select); SYSCALL_MAP (symlink); SYSCALL_MAP_RENAME (oldlstat, gdb_sys_lstat); SYSCALL_MAP (readlink); SYSCALL_MAP (uselib); SYSCALL_MAP (swapon); SYSCALL_MAP (reboot); - SYSCALL_MAP_RENAME (readdir, gdb_old_readdir); - SYSCALL_MAP_RENAME (mmap, gdb_old_mmap); + SYSCALL_MAP_RENAME (readdir, gdb_sys_old_readdir); + SYSCALL_MAP_RENAME (mmap, gdb_sys_old_mmap); SYSCALL_MAP (munmap); SYSCALL_MAP (truncate); SYSCALL_MAP (ftruncate); diff --git a/gdb/linux-record.c b/gdb/linux-record.c index 0b2709b..2f66337 100644 --- a/gdb/linux-record.c +++ b/gdb/linux-record.c @@ -609,7 +609,7 @@ record_linux_system_call (enum gdb_syscall syscall, case gdb_sys_setgroups16: break; - case gdb_old_select: + case gdb_sys_old_select: { unsigned long sz_sel_arg = tdep->size_long + tdep->size_pointer * 4; gdb_byte *a = (gdb_byte *) alloca (sz_sel_arg); @@ -668,12 +668,12 @@ record_linux_system_call (enum gdb_syscall syscall, return 1; break; - case gdb_old_readdir: + case gdb_sys_old_readdir: if (record_mem_at_reg (regcache, tdep->arg2, tdep->size_old_dirent)) return -1; break; - case gdb_old_mmap: + case gdb_sys_old_mmap: break; case gdb_sys_munmap: diff --git a/gdb/linux-record.h b/gdb/linux-record.h index 6d6ba07..6656106 100644 --- a/gdb/linux-record.h +++ b/gdb/linux-record.h @@ -266,15 +266,15 @@ enum gdb_syscall { gdb_sys_settimeofday = 79, gdb_sys_getgroups16 = 80, gdb_sys_setgroups16 = 81, - gdb_old_select = 82, + gdb_sys_old_select = 82, gdb_sys_symlink = 83, gdb_sys_lstat = 84, gdb_sys_readlink = 85, gdb_sys_uselib = 86, gdb_sys_swapon = 87, gdb_sys_reboot = 88, - gdb_old_readdir = 89, - gdb_old_mmap = 90, + gdb_sys_old_readdir = 89, + gdb_sys_old_mmap = 90, gdb_sys_munmap = 91, gdb_sys_truncate = 92, gdb_sys_ftruncate = 93, diff --git a/gdb/loongarch-linux-tdep.c b/gdb/loongarch-linux-tdep.c index bd42d09..031031b 100644 --- a/gdb/loongarch-linux-tdep.c +++ b/gdb/loongarch-linux-tdep.c @@ -812,7 +812,7 @@ loongarch_canonicalize_syscall (enum loongarch_syscall syscall_number) SYSCALL_MAP (clone); SYSCALL_MAP (execve); - SYSCALL_MAP_RENAME (mmap, gdb_sys_mmap2); + SYSCALL_MAP_RENAME (mmap, gdb_sys_old_mmap); SYSCALL_MAP (fadvise64); SYSCALL_MAP (swapon); diff --git a/gdb/observable.h b/gdb/observable.h index deea1ff..c50891e 100644 --- a/gdb/observable.h +++ b/gdb/observable.h @@ -102,10 +102,14 @@ extern observable<inferior */* parent_inf */, inferior */* child_inf */, extern observable<solib &/* solib */> solib_loaded; /* The shared library SOLIB has been unloaded from program space PSPACE. + The SILENT argument indicates that GDB doesn't wish to notify the CLI + about any non-error consequences of unloading the solib, e.g. when + breakpoints are disabled. + Note when gdb calls this observer, the library's symbols have not been unloaded yet, and thus are still available. */ extern observable<program_space *, const solib &/* solib */, - bool /* still_in_use */> solib_unloaded; + bool /* still_in_use */, bool /* silent */> solib_unloaded; /* The symbol file specified by OBJFILE has been loaded. */ extern observable<struct objfile */* objfile */> new_objfile; diff --git a/gdb/regcache.c b/gdb/regcache.c index 5508778..ad72429 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -1911,32 +1911,13 @@ public: {} }; -/* Return true if regcache::cooked_{read,write}_test should be skipped for - GDBARCH. */ - -static bool -selftest_skiparch (struct gdbarch *gdbarch) -{ - const char *name = gdbarch_bfd_arch_info (gdbarch)->printable_name; - - /* Avoid warning: - Running selftest regcache::cooked_{read,write}_test::m68hc11. - warning: No frame soft register found in the symbol table. - Stack backtrace will not work. - We could instead capture the output and then filter out the warning, but - that seems more trouble than it's worth. */ - return (strcmp (name, "m68hc11") == 0 - || strcmp (name, "m68hc12") == 0 - || strcmp (name, "m68hc12:HCS12") == 0); -} - /* Test regcache::cooked_read gets registers from raw registers and memory instead of target to_{fetch,store}_registers. */ static void cooked_read_test (struct gdbarch *gdbarch) { - if (selftest_skiparch (gdbarch)) + if (selftest_skip_warning_arch (gdbarch)) return; scoped_mock_context<target_ops_no_register> mockctx (gdbarch); @@ -2074,7 +2055,7 @@ cooked_read_test (struct gdbarch *gdbarch) static void cooked_write_test (struct gdbarch *gdbarch) { - if (selftest_skiparch (gdbarch)) + if (selftest_skip_warning_arch (gdbarch)) return; /* Create a mock environment. A process_stratum target pushed. */ diff --git a/gdb/selftest-arch.c b/gdb/selftest-arch.c index 17eeba8..79889c0 100644 --- a/gdb/selftest-arch.c +++ b/gdb/selftest-arch.c @@ -108,5 +108,24 @@ reset () registers_changed (); reinit_frame_cache (); } + +/* See selftest-arch.h. */ + +bool +selftest_skip_warning_arch (struct gdbarch *gdbarch) +{ + const char *name = gdbarch_bfd_arch_info (gdbarch)->printable_name; + + /* Avoid warning: + Running selftest <test>::m68hc11. + warning: No frame soft register found in the symbol table. + Stack backtrace will not work. + We could instead capture the output and then filter out the warning, but + that seems more trouble than it's worth. */ + return (strcmp (name, "m68hc11") == 0 + || strcmp (name, "m68hc12") == 0 + || strcmp (name, "m68hc12:HCS12") == 0); +} + } /* namespace selftests */ #endif /* GDB_SELF_TEST */ diff --git a/gdb/selftest-arch.h b/gdb/selftest-arch.h index db11723..c6a85fa 100644 --- a/gdb/selftest-arch.h +++ b/gdb/selftest-arch.h @@ -29,6 +29,11 @@ namespace selftests extern void register_test_foreach_arch (const std::string &name, self_test_foreach_arch_function *function); + +/* Return true if GDBARCH should be skipped in some selftests to avoid + warnings. */ + +extern bool selftest_skip_warning_arch (struct gdbarch *gdbarch); } #endif /* GDB_SELFTEST_ARCH_H */ diff --git a/gdb/solib.c b/gdb/solib.c index b1fdea9..0bbcb02 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -694,14 +694,17 @@ notify_solib_loaded (solib &so) /* Notify interpreters and observers that solib SO has been unloaded. When STILL_IN_USE is true, the objfile backing SO is still in use, this indicates that SO was loaded multiple times, but only mapped - in once (the mapping was reused). */ + in once (the mapping was reused). + + When SILENT is true, don't announce to the user if any breakpoints are + disabled as a result of unloading SO. */ static void notify_solib_unloaded (program_space *pspace, const solib &so, - bool still_in_use) + bool still_in_use, bool silent) { interps_notify_solib_unloaded (so, still_in_use); - gdb::observers::solib_unloaded.notify (pspace, so, still_in_use); + gdb::observers::solib_unloaded.notify (pspace, so, still_in_use, silent); } /* See solib.h. */ @@ -803,7 +806,7 @@ update_solib_list (int from_tty) /* Notify any observer that the shared object has been unloaded before we remove it from GDB's tables. */ notify_solib_unloaded (current_program_space, *gdb_iter, - still_in_use); + still_in_use, false); /* Unless the user loaded it explicitly, free SO's objfile. */ if (gdb_iter->objfile != nullptr @@ -1163,14 +1166,12 @@ clear_solib (program_space *pspace) { const solib_ops *ops = gdbarch_so_ops (current_inferior ()->arch ()); - disable_breakpoints_in_shlibs (pspace); - for (solib &so : pspace->so_list) { bool still_in_use = (so.objfile != nullptr && solib_used (pspace, so)); - notify_solib_unloaded (pspace, so, still_in_use); + notify_solib_unloaded (pspace, so, still_in_use, true); pspace->remove_target_sections (&so); }; diff --git a/gdb/testsuite/gdb.base/gstack.exp b/gdb/testsuite/gdb.base/gstack.exp index 8df36b1..89be676 100644 --- a/gdb/testsuite/gdb.base/gstack.exp +++ b/gdb/testsuite/gdb.base/gstack.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2024 Free Software Foundation, Inc. +# Copyright (C) 2024-2025 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -62,8 +62,10 @@ if { ![gdb_assert { ![expr {$res < 0 || $res == ""}] } $test] } { set test "got backtrace" set saw_backtrace false set no_awk false +set location_re ${srcfile}:${decimal} + gdb_expect { - -i "$res" -re "#0 +(0x\[0-9a-f\]+ in )?main \(\).*\r\nGSTACK-END\r\n\$" { + -i "$res" -re "#0 +(0x\[0-9a-f\]+ in )?main \(\).*$location_re.*\r\nGSTACK-END\r\n\$" { set saw_backtrace true pass $test exp_continue diff --git a/gdb/testsuite/gdb.base/set-solib-absolute-prefix.c b/gdb/testsuite/gdb.base/set-solib-absolute-prefix.c new file mode 100644 index 0000000..685a22e --- /dev/null +++ b/gdb/testsuite/gdb.base/set-solib-absolute-prefix.c @@ -0,0 +1,32 @@ +/* Copyright (C) 2012-2025 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <stdlib.h> + +/* Global var used to generate filler code. */ +volatile int global_var = 0; + +int +main () +{ + global_var++; + global_var++; + + abort (); + + return 0; +} diff --git a/gdb/testsuite/gdb.base/set-solib-absolute-prefix.exp b/gdb/testsuite/gdb.base/set-solib-absolute-prefix.exp new file mode 100644 index 0000000..cf74789 --- /dev/null +++ b/gdb/testsuite/gdb.base/set-solib-absolute-prefix.exp @@ -0,0 +1,51 @@ +# Copyright 2012-2025 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# Compile a 32-bit x86 executable and then stop within a system call. +# Change the sysroot to a non-existent directory, GDB should try (and +# fail) to reload the currently loaded shared libraries. However, GDB +# should retain the symbols for the vDSO library as that is not loaded +# from the file system. +# +# Check the backtrace to ensure that the __kernel_vsyscall symbol is +# still in the backtrace, this indicates GDB still has the vDSO +# symbols available. + +require {is_any_target "i?86-*-linux*" "x86_64-*-linux*"} +standard_testfile + +# The binary must be compiled as 32-bit so that the system call +# `__kernel_vsyscall' originates from vDSO. +set flags { debug } +if { ![is_ilp32_target] } { + lappend flags "additional_flags=-m32" +} + +if { [prepare_for_testing $testfile.exp $testfile $srcfile $flags] } { + return +} + +if { ![runto_main] } { + return +} + +set non_existing_directory [standard_output_file "BOGUS"] + +gdb_test "continue" "Program received signal SIGABRT, Aborted.*" \ + "continue until abort" +gdb_test "set sysroot $non_existing_directory" \ + ".*warning: Unable to find dynamic linker breakpoint function.*" \ + "set sysroot" +gdb_test "bt" "__kernel_vsyscall.*" "backtrace with __kernel_vsyscall" diff --git a/gdb/testsuite/gdb.base/shlib-unload.exp b/gdb/testsuite/gdb.base/shlib-unload.exp index f3e8cce..9d47416 100644 --- a/gdb/testsuite/gdb.base/shlib-unload.exp +++ b/gdb/testsuite/gdb.base/shlib-unload.exp @@ -225,6 +225,75 @@ proc_with_prefix test_dprintf_with_rerun {} { "dprintf is non-pending after restart" } +# Check that we see breakpoint modified events (where appropriate) +# when the 'nosharedlibrary' command is used to unload all shared +# libraries. +# +# Also check that the 'nosharedlibrary' doesn't trigger a warning +# about shared library breakpoints being disabled. +proc_with_prefix test_silent_nosharedlib {} { + if { ![allow_python_tests] } { + unsupported "python support needed" + return + } + + foreach_with_prefix type { breakpoint dprintf } { + clean_restart $::binfile + + if {![runto_main]} { + return + } + + gdb_breakpoint $::srcfile:$::bp_line + gdb_continue_to_breakpoint "stop before dlclose" + + # Setup a dprintf or breakpoint in the shared library. + if { $type eq "breakpoint" } { + gdb_test "break foo" + } else { + gdb_test "dprintf foo,\"In foo\"" + } + + # Record the number of the b/p (or dprintf) we just inserted. + set bp_num [get_integer_valueof "\$bpnum" "*UNKNOWN*" \ + "get b/p number"] + + # Load Python library to track b/p modifications. + gdb_test_no_output "source $::pyfile" "import python scripts" + + # Initialise the b/p modified hash. Currently dprintf style + # breakpoints are not visible from Python, so the modification + # count will remain unchanged in that case. + gdb_test_no_output "python bp_modified_counts\[$bp_num\] = 0" + + # Discard symbols from all loaded shared libraries. + gdb_test_no_output "nosharedlibrary" + + # Check that our b/p is now showing as disabled. + if { $type eq "breakpoint" } { + set re \ + [list "$bp_num\\s+breakpoint\\s+keep\\s+y\\s+<PENDING>\\s+foo"] + set count 1 + } else { + set re \ + [list \ + "$bp_num\\s+dprintf\\s+keep\\s+y\\s+<PENDING>\\s+foo" \ + "\\s+printf \"In foo\""] + set count 0 + } + + gdb_test "info breakpoints $bp_num" \ + [multi_line "^Num\\s+Type\\s+Disp\\s+Enb\\s+Address\\s+What" \ + {*}$re] + + # Check we've seen the expected number of breakpoint modified + # events. Currently dprintf breakpoints are not visible from + # Python, so we will not see an event in that case. + gdb_test "python print(bp_modified_counts\[$bp_num\])" "^$count" + } +} + test_bp_modified_events test_dprintf_after_unload test_dprintf_with_rerun +test_silent_nosharedlib diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-modified-lib.c b/gdb/testsuite/gdb.mi/mi-dprintf-modified-lib.c new file mode 100644 index 0000000..70fc328 --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-dprintf-modified-lib.c @@ -0,0 +1,22 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2025 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +int +foo (void) +{ + return 0; +} diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-modified.c b/gdb/testsuite/gdb.mi/mi-dprintf-modified.c new file mode 100644 index 0000000..7a41adbac --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-dprintf-modified.c @@ -0,0 +1,55 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2025 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <stdlib.h> + +#ifdef __WIN32__ +#include <windows.h> +#define dlopen(name, mode) LoadLibrary (TEXT (name)) +#ifdef _WIN32_WCE +# define dlsym(handle, func) GetProcAddress (handle, TEXT (func)) +#else +# define dlsym(handle, func) GetProcAddress (handle, func) +#endif +#define dlclose(handle) FreeLibrary (handle) +#else +#include <dlfcn.h> +#endif + +#include <assert.h> + +int +main (void) +{ + int res; + void *handle; + int (*func) (void); + int val = 0; + + handle = dlopen (SHLIB_NAME, RTLD_LAZY); /* Break here. */ + assert (handle != NULL); + + func = (int (*)(void)) dlsym (handle, "foo"); + assert (func != NULL); + + val += func (); + + res = dlclose (handle); + assert (res == 0); + + return val; +} diff --git a/gdb/testsuite/gdb.mi/mi-dprintf-modified.exp b/gdb/testsuite/gdb.mi/mi-dprintf-modified.exp new file mode 100644 index 0000000..c3e1bdf --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-dprintf-modified.exp @@ -0,0 +1,119 @@ +# Copyright 2025 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Check that GDB doesn't emit a 'breakpoint-modified' notification for +# dprintf breakpoints when the dprintf commands haven't changed. +# +# GDB use to emit a 'breakpoint-modified' dprintf breakpoints each +# time the dprintf_breakpoint::re_set function was called as this +# would re-cacluate the dprintf command string, even though in most +# cases the calculated string was no different from the previous +# value. +# +# Then GDB got smarter and could recognise that the string had not +# changed, and so would skip the 'breakpoint-modified' notification. +# +# This test stops at a dlopen() call in the inferior and creates a +# dprintf breakpoint. Then we 'next' over the dlopen() which triggers +# a call to the ::re_set() functions. We check that there is no +# 'breakpoint-modified' event emitted for the dprintf breakpoint. + +load_lib mi-support.exp +set MIFLAGS "-i=mi" + +standard_testfile .c -lib.c + +# Build the library. +set libname ${testfile}-lib +set libfile [standard_output_file $libname] +if { [build_executable "build shlib" $libfile $srcfile2 {debug shlib}] == -1} { + return +} + +# Build the executable. +set opts [list debug shlib_load additional_flags=-DSHLIB_NAME=\"${libname}\"] +if { [build_executable "build exec" $binfile $srcfile $opts] == -1} { + return +} + +# The line number of the dlopen() call. +set bp_line [gdb_get_line_number "Break here" $srcfile] + +# Start the inferior. +mi_clean_restart $binfile +mi_runto_main + +# Place a breakpoint at the dlopen() line. +mi_create_breakpoint $srcfile:$bp_line "set breakpoint at dlopen call" \ + -disp keep -func main -file "\[^\r\n\]+/$srcfile" -line $bp_line + +# And run to the breakpoint. +mi_execute_to "exec-continue" "breakpoint-hit" main "" ".*/$srcfile" \ + $bp_line { "" "disp=\"keep\"" } "run to breakpoint" + +# Cleanup breakpoints. +mi_delete_breakpoints + +# Setup a dprintf breakpoint. +mi_gdb_test "-dprintf-insert --function main \"in main\"" \ + "\\^done,bkpt={.*}" "dprintf at main" + +set bpnum [mi_get_valueof "/d" "\$bpnum" "INVALID" \ + "get number for dprintf breakpoint"] + +# Use 'next' to step over loading the shared library. +mi_gdb_test "220-exec-next" ".*" "next over dlopen" + +# Now wait for the 'stopped' notification. While we wait we should +# see a 'library-loaded' notification for the loading of the shared +# library. +# +# In older versions of GDB we would also see a 'breakpoint-modified' +# notification for the dprintf breakpoint, but newer versions of GDB +# are smart enough to not emit this unnecessary notification. +set bp_re [mi_make_breakpoint -number $bpnum \ + -type dprintf -disp keep -enabled y -func main] +set saw_bp_modified false +set saw_lib_load false +set saw_stopped false +gdb_test_multiple "" "wait for 'next' to complete" { + -re "^=library-loaded,id=\[^\r\n\]+\r\n" { + set saw_lib_load true + exp_continue + } + + -re "^=breakpoint-modified,$bp_re\r\n" { + set saw_bp_modified true + exp_continue + } + + -re "^\\*stopped,reason=\"end-stepping-range\",\[^\r\n\]+\r\n" { + set saw_stopped true + exp_continue + } + + -re "^$mi_gdb_prompt$" { + gdb_assert { $saw_lib_load } \ + "$gdb_test_name, library was loaded" + gdb_assert { $saw_stopped } \ + "$gdb_test_name, saw stopped message" + gdb_assert { !$saw_bp_modified } \ + "$gdb_test_name, no breakpoint-modified" + } + + -re "^\[^\r\n\]+\r\n" { + exp_continue + } +} diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp index 0a1231b..e1a3a23 100644 --- a/gdb/testsuite/lib/ada.exp +++ b/gdb/testsuite/lib/ada.exp @@ -181,12 +181,16 @@ proc find_ada_tool {tool} { # compiler does not appear to be GCC, this will always return false. proc gnat_version_compare {op l2} { - set gccvers [gcc_major_version] - if {$gccvers == -1} { + set gnatmake [find_gnatmake] + set gnatmake [lindex [split $gnatmake] 0] + if {[catch {exec $gnatmake --version} output]} { + return 0 + } + if {![regexp {GNATMAKE ([0-9]+(\.[0-9]+)*)} $output match version]} { return 0 } - return [version_compare [split $gccvers .] $op $l2] + return [version_compare [split $version .] $op $l2] } # Return 1 if the GNAT runtime appears to have debug info. diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 761a4f1..59967c7 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3937,13 +3937,16 @@ gdb_caching_proc is_aarch32_target {} { return 0 } - set list {} - foreach reg \ - {r0 r1 r2 r3} { - lappend list "\tmov $reg, $reg" - } + return [gdb_can_simple_compile aarch32 { + int main (void) { + asm ("\tmov r0, r0"); + asm ("\tmov r1, r1"); + asm ("\tmov r2, r2"); + asm ("\tmov r3, r3"); - return [gdb_can_simple_compile aarch32 [join $list \n]] + return 0; + } + }] } # Return 1 if this target is an aarch64, either lp64 or ilp32. diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index 491882e..d222028 100644 --- a/gdbserver/Makefile.in +++ b/gdbserver/Makefile.in @@ -194,6 +194,7 @@ SFILES = \ $(srcdir)/linux-loongarch-low.cc \ $(srcdir)/linux-low.cc \ $(srcdir)/linux-m68k-low.cc \ + $(srcdir)/linux-microblaze-low.cc \ $(srcdir)/linux-mips-low.cc \ $(srcdir)/linux-or1k-low.cc \ $(srcdir)/linux-ppc-low.cc \ diff --git a/gdbserver/configure.srv b/gdbserver/configure.srv index e8dc8ef..6281cda 100644 --- a/gdbserver/configure.srv +++ b/gdbserver/configure.srv @@ -169,6 +169,13 @@ case "${gdbserver_host}" in srv_linux_regsets=yes srv_linux_thread_db=yes ;; + microblaze*-*-linux*) srv_regobj="microblaze-linux.o" + srv_tgtobj="$srv_linux_obj linux-microblaze-low.o" + srv_xmlfiles="microblaze-linux.xml" + srv_xmlfiles="${srv_xmlfiles} microblaze-core.xml" + srv_linux_usrregs=yes + srv_linux_thread_db=yes + ;; mips*-*-linux*) srv_regobj="mips-linux.o" srv_regobj="${srv_regobj} mips-dsp-linux.o" srv_regobj="${srv_regobj} mips64-linux.o" diff --git a/gdbserver/linux-microblaze-low.cc b/gdbserver/linux-microblaze-low.cc new file mode 100644 index 0000000..2d97eef --- /dev/null +++ b/gdbserver/linux-microblaze-low.cc @@ -0,0 +1,245 @@ +/* GNU/Linux/Microblaze specific low level interface, for the remote server for + GDB. + Copyright (C) 1995-2025 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include "server.h" +#include "linux-low.h" + +#include "elf/common.h" +#include "nat/gdb_ptrace.h" +#include <endian.h> + +#include <asm/ptrace.h> +#include <sys/procfs.h> +#include <sys/ptrace.h> + +#include "gdb_proc_service.h" + + +static int microblaze_regmap[] = + {PT_GPR(0), PT_GPR(1), PT_GPR(2), PT_GPR(3), + PT_GPR(4), PT_GPR(5), PT_GPR(6), PT_GPR(7), + PT_GPR(8), PT_GPR(9), PT_GPR(10), PT_GPR(11), + PT_GPR(12), PT_GPR(13), PT_GPR(14), PT_GPR(15), + PT_GPR(16), PT_GPR(17), PT_GPR(18), PT_GPR(19), + PT_GPR(20), PT_GPR(21), PT_GPR(22), PT_GPR(23), + PT_GPR(24), PT_GPR(25), PT_GPR(26), PT_GPR(27), + PT_GPR(28), PT_GPR(29), PT_GPR(30), PT_GPR(31), + PT_PC, PT_MSR, PT_EAR, PT_ESR, + PT_FSR + }; + + + +class microblaze_target : public linux_process_target +{ +public: + + const regs_info *get_regs_info () override; + + const gdb_byte *sw_breakpoint_from_kind (int kind, int *size) override; + +protected: + + void low_arch_setup () override; + + bool low_cannot_fetch_register (int regno) override; + + bool low_cannot_store_register (int regno) override; + + bool low_supports_breakpoints () override; + + CORE_ADDR low_get_pc (regcache *regcache) override; + + void low_set_pc (regcache *regcache, CORE_ADDR newpc) override; + + bool low_breakpoint_at (CORE_ADDR pc) override; +}; + +/* The singleton target ops object. */ + +static microblaze_target the_microblaze_target; + +constexpr auto microblaze_num_regs + = sizeof (microblaze_regmap) / sizeof (microblaze_regmap[0]); + +/* Defined in auto-generated file microblaze-linux-generated.c. */ +void init_registers_microblaze_linux (); +extern const target_desc *tdesc_microblaze_linux; + +bool +microblaze_target::low_supports_breakpoints () +{ + return true; +} + +bool +microblaze_target::low_cannot_store_register (int regno) +{ + if (microblaze_regmap[regno] == -1 || regno == 0) + return 1; + + return 0; +} + +bool +microblaze_target::low_cannot_fetch_register (int regno) +{ + return 0; +} + +CORE_ADDR +microblaze_target::low_get_pc (regcache *regcache) +{ + unsigned long pc; + + collect_register_by_name (regcache, "rpc", &pc); + return pc; +} + +void +microblaze_target::low_set_pc (regcache *regcache, CORE_ADDR pc) +{ + unsigned long newpc = pc; + + supply_register_by_name (regcache, "rpc", &newpc); +} + +/* dbtrap insn */ +/* brki r16, 0x18; */ +static const uint32_t microblaze_breakpoint = 0xba0c0018; +#define microblaze_breakpoint_len 4 + +const gdb_byte * +microblaze_target::sw_breakpoint_from_kind (int kind, int *size) +{ + *size = microblaze_breakpoint_len; + return reinterpret_cast<const gdb_byte *> (µblaze_breakpoint); +} + +bool +microblaze_target::low_breakpoint_at (CORE_ADDR where) +{ + uint32_t insn; + + read_memory (where, (unsigned char *) &insn, 4); + /* If necessary, recognize more trap instructions here. GDB only uses the + one. */ + return insn == microblaze_breakpoint; +} + +#ifdef HAVE_PTRACE_GETREGS + +static void +microblaze_collect_ptrace_register (struct regcache *regcache, int regno, + char *buf) +{ + memset (buf, 0, sizeof (long)); + + if (__BYTE_ORDER == __LITTLE_ENDIAN) + { + collect_register (regcache, regno, buf); + } + else if (__BYTE_ORDER == __BIG_ENDIAN) + { + int size = register_size (regcache->tdesc, regno); + + if (size < sizeof (long)) + collect_register (regcache, regno, buf + sizeof (long) - size); + else + collect_register (regcache, regno, buf); + } +} + +/* Collect GPRs from REGCACHE into BUF. */ + +static void microblaze_fill_gregset (struct regcache *regcache, void *buf) +{ + int i; + + for (i = 0; i < microblaze_num_regs; i++) + microblaze_collect_ptrace_register (regcache, i, + (char *) buf + microblaze_regmap[i]); +} + +/* Supply GPRs from BUF into REGCACHE. */ + +static void +microblaze_store_gregset (struct regcache *regcache, const void *buf) +{ + int i; + + for (i = 0; i < microblaze_num_regs; i++) + supply_register (regcache, i, (char *) buf + microblaze_regmap[i]); +} + +static struct regset_info microblaze_regsets[] = { + { PTRACE_GETREGS, PTRACE_SETREGS, NT_PRSTATUS, + sizeof (elf_gregset_t), GENERAL_REGS, + microblaze_fill_gregset, microblaze_store_gregset + }, + NULL_REGSET +}; +#endif /* HAVE_PTRACE_GETREGS */ + +static struct usrregs_info microblaze_usrregs_info = + { + microblaze_num_regs, + microblaze_regmap, + }; + +#ifdef HAVE_PTRACE_GETREGS +static struct regsets_info microblaze_regsets_info = + { + microblaze_regsets, /* regsets */ + 0, /* num_regsets */ + nullptr /* disabled_regsets */ + }; +#endif /* HAVE_PTRACE_GETREGS */ + +static struct regs_info microblaze_regs_info = + { + nullptr, /* regset_bitmap */ + µblaze_usrregs_info, +#ifdef HAVE_PTRACE_GETREGS + µblaze_regsets_info +#endif /* HAVE_PTRACE_GETREGS */ + }; + +const regs_info * +microblaze_target::get_regs_info () +{ + return µblaze_regs_info; +} + +void +microblaze_target::low_arch_setup () +{ + current_process ()->tdesc = tdesc_microblaze_linux; +} + +linux_process_target *the_linux_target = &the_microblaze_target; + +void +initialize_low_arch () +{ + init_registers_microblaze_linux (); +#ifdef HAVE_PTRACE_GETREGS + initialize_regsets_info (µblaze_regsets_info); +#endif /* HAVE_PTRACE_GETREGS */ +} diff --git a/gdbserver/regcache.cc b/gdbserver/regcache.cc index ee0c1b3..c08c9ae 100644 --- a/gdbserver/regcache.cc +++ b/gdbserver/regcache.cc @@ -503,7 +503,7 @@ regcache::raw_compare (int regnum, const void *buf, int offset) const gdb_assert (buf != NULL); gdb::array_view<const gdb_byte> regbuf = register_data (this, regnum); - gdb_assert (offset < regbuf.size ()); + gdb_assert (offset <= regbuf.size ()); regbuf = regbuf.slice (offset); return memcmp (buf, regbuf.data (), regbuf.size ()) == 0; diff --git a/gdbserver/server.cc b/gdbserver/server.cc index def01c1..3172cd1 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -4071,6 +4071,33 @@ test_memory_tagging_functions (void) && tags.size () == 5); } +/* Exercise the behavior of doing a 0-length comparison for a register in a + register buffer, which should return true. */ + +static void test_registers_raw_compare_zero_length () +{ + /* Start off with a dummy target description. */ + target_desc dummy_tdesc; + + /* Make it 8 bytes long. */ + dummy_tdesc.registers_size = 8; + + /* Add a couple dummy 32-bit registers. */ + dummy_tdesc.reg_defs.emplace_back ("r0", 0, 32); + dummy_tdesc.reg_defs.emplace_back ("r1", 32, 32); + + /* Create our dummy register cache so we can invoke the raw_compare method + we want to validate. */ + regcache dummy_regcache (&dummy_tdesc); + + /* Create a dummy byte buffer we can pass to the raw_compare method. */ + gdb_byte dummy_buffer[8]; + + /* Validate the 0-length comparison (due to the comparison offset being + equal to the length of the register) returns true. */ + SELF_CHECK (dummy_regcache.raw_compare (0, dummy_buffer, 4)); +} + } /* namespace selftests */ #endif /* GDB_SELF_TEST */ @@ -4094,6 +4121,8 @@ captured_main (int argc, char *argv[]) selftests::register_test ("remote_memory_tagging", selftests::test_memory_tagging_functions); + selftests::register_test ("test_registers_raw_compare_zero_length", + selftests::test_registers_raw_compare_zero_length); #endif current_directory = getcwd (NULL, 0); diff --git a/gdbserver/setup.cfg b/gdbserver/setup.cfg deleted file mode 100644 index 08646b8..0000000 --- a/gdbserver/setup.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[codespell] -# Skip ChangeLogs and generated files. -skip = ChangeLog*,configure -ignore-words = gdb/contrib/codespell-ignore-words.txt diff --git a/gdbsupport/common-inferior.cc b/gdbsupport/common-inferior.cc index 4b86829..d2fd348 100644 --- a/gdbsupport/common-inferior.cc +++ b/gdbsupport/common-inferior.cc @@ -59,7 +59,7 @@ escape_characters (const char *arg, const char *special) #ifdef __MINGW32__ bool quoted = false; - if (strpbrk (argv[i], special)) + if (strpbrk (arg, special) != nullptr) { quoted = true; result += quote; diff --git a/gdbsupport/setup.cfg b/gdbsupport/setup.cfg deleted file mode 100644 index e3e9298..0000000 --- a/gdbsupport/setup.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[codespell] -# Skip ChangeLogs and generated files. -skip = ChangeLog*,Makefile.in,configure -ignore-words = gdb/contrib/codespell-ignore-words.txt diff --git a/gprof/testsuite/Makefile.am b/gprof/testsuite/Makefile.am index c4d6c41..0c80b12 100644 --- a/gprof/testsuite/Makefile.am +++ b/gprof/testsuite/Makefile.am @@ -6,12 +6,12 @@ GPROF = ../gprof$(EXEEXT) # NB: -O2 -fno-omit-frame-pointer is needed for expected call graph. See # https://sourceware.org/bugzilla/show_bug.cgi?id=32768 -GPROF_FLAGS = -O2 -fno-omit-frame-pointer -pg +# -g is needed for line number info checked by tst-gmon-gprof-l.sh. See +# https://sourceware.org/bugzilla/show_bug.cgi?id=32779 +GPROF_FLAGS = -O2 -fno-omit-frame-pointer -pg -g -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(GPROF_FLAGS) -LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(OPT_NO_PLUGINS) $(GPROF_FLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(AM_CFLAGS) $(GPROF_FLAGS) +LINK = $(CC) $(AM_CFLAGS) $(GPROF_FLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ # We will add to these later, for each individual test. Note # that we add each test under check_SCRIPTS; diff --git a/gprof/testsuite/Makefile.in b/gprof/testsuite/Makefile.in index 008f6be..2ac5f24 100644 --- a/gprof/testsuite/Makefile.in +++ b/gprof/testsuite/Makefile.in @@ -496,13 +496,11 @@ GPROF = ../gprof$(EXEEXT) # NB: -O2 -fno-omit-frame-pointer is needed for expected call graph. See # https://sourceware.org/bugzilla/show_bug.cgi?id=32768 -GPROF_FLAGS = -O2 -fno-omit-frame-pointer -pg -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(GPROF_FLAGS) - -LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(OPT_NO_PLUGINS) $(GPROF_FLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - +# -g is needed for line number info checked by tst-gmon-gprof-l.sh. See +# https://sourceware.org/bugzilla/show_bug.cgi?id=32779 +GPROF_FLAGS = -O2 -fno-omit-frame-pointer -pg -g +COMPILE = $(CC) $(AM_CFLAGS) $(GPROF_FLAGS) +LINK = $(CC) $(AM_CFLAGS) $(GPROF_FLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ # We will add to these later, for each individual test. Note # that we add each test under check_SCRIPTS; @@ -1,5 +1,14 @@ -*- text -*- +* The linker's --stats option can take an optional argument which if used is + interpreted as a filename into which resource usage information should be + stored. As an alternative mechanism the LD_STATS environment variable can + also be used to achieve the same results. Resource usage information for + various phases of the linking operation is now included in the report. + If a map file is being produced then the information is also included there. + The --no-stats option can be used to disable stat reporting, should it have + been enabled. + * Remove the linker -taso option for Alpha target, as Linux/Alpha kernel support for 32-bit pointers has been removed. diff --git a/ld/config.in b/ld/config.in index 2d7b640..e10c9e7 100644 --- a/ld/config.in +++ b/ld/config.in @@ -122,6 +122,9 @@ /* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE +/* Define to 1 if you have the `getrusage' function. */ +#undef HAVE_GETRUSAGE + /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT diff --git a/ld/configure b/ld/configure index b7af25d..3f745ac 100755 --- a/ld/configure +++ b/ld/configure @@ -18753,7 +18753,7 @@ fi done -for ac_func in close glob lseek mkstemp open realpath waitpid +for ac_func in close getrusage glob lseek mkstemp open realpath waitpid do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/ld/configure.ac b/ld/configure.ac index 228f2ee..1ee0c0c 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -414,7 +414,7 @@ AC_SUBST(NATIVE_LIB_DIRS) AC_CHECK_HEADERS(fcntl.h elf-hints.h limits.h inttypes.h stdint.h \ sys/file.h sys/mman.h sys/param.h sys/stat.h sys/time.h \ sys/types.h unistd.h) -AC_CHECK_FUNCS(close glob lseek mkstemp open realpath waitpid) +AC_CHECK_FUNCS(close getrusage glob lseek mkstemp open realpath waitpid) BFD_BINARY_FOPEN diff --git a/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em index f7a8f1e..857cf54 100644 --- a/ld/emultempl/ppc64elf.em +++ b/ld/emultempl/ppc64elf.em @@ -606,14 +606,15 @@ gld${EMULATION_NAME}_finish (void) einfo (_("%X%P: can not build stubs: %E\n")); fflush (stdout); + FILE * out = config.stats_file ? config.stats_file : stderr; for (line = msg; line != NULL; line = endline) { endline = strchr (line, '\n'); if (endline != NULL) *endline++ = '\0'; - fprintf (stderr, "%s: %s\n", program_name, line); + fprintf (out, "%s: %s\n", program_name, line); } - fflush (stderr); + fflush (out); free (msg); ldelf_finish (); @@ -295,6 +295,10 @@ typedef struct char *map_filename; FILE *map_file; + char *stats_filename; + /* If non-NULL then resource use information should be written to this file. */ + FILE *stats_file; + char *dependency_file; unsigned int split_by_reloc; @@ -330,6 +334,39 @@ typedef struct enum compressed_debug_section_type compress_debug; } ld_config_type; +/* An enumeration of the linker phases for which resource usage information + is recorded. PHASE_ALL is special as it covers the entire link process. + + Instructions for adding a new phase: + 1. Add an entry to this enumeration. + 2. Add an entry for the phase to the phase_data[] structure in ldmain.c. + 3. Add calls to ld_start_phase(PHASE_xxx) and ld_stop_phase(PHASE_xxx) + at the appropriate place(s) in the code. It does not matter if the + new phase overlaps with or is contained by any other phase. + + Instructions for adding a new resource: + 1. If necessary add a new field to the phase_data structure defined in + ldmain.c. + 2. Add code to initialise the field in ld_main.c:ld_start_phase(). + 3. Add code to finalise the field in ld_main.c:ld_stop_phase(). + 4. Add code to report the field in ld_main.c:report_phases(). */ +typedef enum +{ + PHASE_ALL = 0, + PHASE_CTF, + PHASE_MERGE, + PHASE_PARSE, + PHASE_PLUGINS, + PHASE_PROCESS, + PHASE_WRITE, + + NUM_PHASES /* This must be the last entry. */ +} +ld_phase; + +extern void ld_start_phase (ld_phase); +extern void ld_stop_phase (ld_phase); + extern ld_config_type config; extern FILE * saved_script_handle; @@ -2184,6 +2184,9 @@ Memory region Used Size Region Size %age Used RAM: 32 B 2 GB 0.00% @end smallexample +Note: if you want to find out about the memory usage of the linker +itself, then the @option{--stats} option will do this. + @cindex help @cindex usage @kindex --help @@ -2706,10 +2709,76 @@ more than @var{count} relocations one output section will contain that many relocations. @var{count} defaults to a value of 32768. @kindex --stats -@item --stats +@item --stats[=@var{filename}] Compute and display statistics about the operation of the linker, such as execution time and memory usage. +If the optional @var{filename} argument is not supplied then only +basic information is reported, and it is sent to the standard error +output stream. If the @var{filename} argument is supplied then +extended information is written to the named file. If @var{filename} +is set to just the @var{-} symbol, then the extended information is +sent to the standard output stream. If the @var{filename} starts with +@var{+} then the file is opened in append mode rather than overwrite +mode. + +If the @option{-Map} option has been enabled then the information is +also recorded in the map file as well. Note: if both the +@option{--stats} option and the @option{-Map} options have been given +@var{filename} arguments and they match, then the information will +only be written out once not twice. + +If the @code{LD_STATS} environment variable is defined then this +behaves likes the @option{--stats} option. If the variable's value is +a string then this will used as the name of a file into which the +information should be recorded. Otherwise the information +will be sent to the standard output stream. Using the environment +variable allows stats to be recorded without having to alter the +linker's command line. Note: if both the environment variable and the +@option{--stats} option are used then the @option{--stats} option +takes precedence. + +The extended information reported includes the cpu time used and, if +the @var{getrusage()} system library call is available then memory use +is recorded as well. This information is reported for individual +parts of the linking process which are referred to as @emph{phases}. +In addition the information is also reported for a special phase +called @emph{ALL} which covers the entire linking process. Note that +individual phases can contain or overlap with each other so it should +not be assumed that the overall resources used by the linker is the +sum of the resources used by the individual phases. + +In addition when extended information is being reported the linker +version, command line arguments and linker start time are also +included. This makes it easier to handle the situation where multiple +links are being invoked by a build system and to indentify exactly +which arguments were responsible for producing the statistics that are +reported. + +The extended output looks something like this: + +@smallexample +Stats: linker version: (GNU Binutils) 2.44.50.20250401 +Stats: linker started: Wed Apr 2 09:36:41 2025 +Stats: args: ld -z norelro -z nomemory-seal -z no-separate-code -o a.out [...] + +Stats: phase cpu time memory user time system time +Stats: name (microsec) (KiB) (seconds) (seconds) +Stats: ALL 390082 217740 0 0 +Stats: ctf processing 12 0 0 0 +Stats: string merge 1324 0 0 0 +Stats: parsing 349 288 0 0 +Stats: plugins 1 0 0 0 +Stats: processing files 259616 214524 0 0 +Stats: write 116493 0 0 0 +@end smallexample + +@kindex --no-stats +@item --no-stats +Disables the reporting of usage statistics, should it have been +enabled via the @option{--stats} command line option or the +@var{LD_STATS} environment variable. + @kindex --sysroot=@var{directory} @item --sysroot=@var{directory} Use @var{directory} as the location of the sysroot, overriding the @@ -4078,6 +4147,15 @@ If the PE/COFF specific @option{--insert-timestamp} is active and the timestamp value in this variable will be inserted into the COFF header instead of the current time. +@kindex LD_STATS +@cindex LD_STATS +If the @code{LD_STATS} environment variable is defined then linker +resource use information will be recorded, just as if the +@option{--stats} option had been used. If the @code{LD_STATS} +variable has a string value then this will used as the name of a file +into which the information should be stored. Otherwise the information +will be sent to the standard output stream. + @c man end @end ifset diff --git a/ld/ldlang.c b/ld/ldlang.c index 0048dfa..0bb9e17 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -3807,6 +3807,8 @@ ldlang_open_ctf (void) int any_ctf = 0; int err; + ld_start_phase (PHASE_CTF); + LANG_FOR_EACH_INPUT_STATEMENT (file) { asection *sect; @@ -3844,17 +3846,23 @@ ldlang_open_ctf (void) if (!any_ctf) { ctf_output = NULL; + ld_stop_phase (PHASE_CTF); return; } if ((ctf_output = ctf_create (&err)) != NULL) - return; + { + ld_stop_phase (PHASE_CTF); + return; + } einfo (_("%P: warning: CTF output not created: `%s'\n"), ctf_errmsg (err)); LANG_FOR_EACH_INPUT_STATEMENT (errfile) ctf_close (errfile->the_ctf); + + ld_stop_phase (PHASE_CTF); } /* Merge together CTF sections. After this, only the symtab-dependent @@ -3869,6 +3877,8 @@ lang_merge_ctf (void) if (!ctf_output) return; + ld_start_phase (PHASE_CTF); + output_sect = bfd_get_section_by_name (link_info.output_bfd, ".ctf"); /* If the section was discarded, don't waste time merging. */ @@ -3882,6 +3892,8 @@ lang_merge_ctf (void) ctf_close (file->the_ctf); file->the_ctf = NULL; } + + ld_stop_phase (PHASE_CTF); return; } @@ -3924,6 +3936,8 @@ lang_merge_ctf (void) } /* Output any lingering errors that didn't come from ctf_link. */ lang_ctf_errs_warnings (ctf_output); + + ld_stop_phase (PHASE_CTF); } /* Let the emulation acquire strings from the dynamic strtab to help it optimize @@ -3932,7 +3946,9 @@ lang_merge_ctf (void) void ldlang_ctf_acquire_strings (struct elf_strtab_hash *dynstrtab) { + ld_start_phase (PHASE_CTF); ldemul_acquire_strings_for_ctf (ctf_output, dynstrtab); + ld_stop_phase (PHASE_CTF); } /* Inform the emulation about the addition of a new dynamic symbol, in BFD @@ -3954,16 +3970,24 @@ lang_write_ctf (int late) if (!ctf_output) return; + ld_start_phase (PHASE_CTF); + if (late) { /* Emit CTF late if this emulation says it can do so. */ if (ldemul_emit_ctf_early ()) - return; + { + ld_stop_phase (PHASE_CTF); + return; + } } else { if (!ldemul_emit_ctf_early ()) - return; + { + ld_stop_phase (PHASE_CTF); + return; + } } /* Inform the emulation that all the symbols that will be received have @@ -3998,6 +4022,8 @@ lang_write_ctf (int late) LANG_FOR_EACH_INPUT_STATEMENT (file) file->the_ctf = NULL; + + ld_stop_phase (PHASE_CTF); } /* Write out the CTF section late, if the emulation needs that. */ @@ -8547,6 +8573,8 @@ lang_process (void) { asection *found; + ld_start_phase (PHASE_MERGE); + /* Merge SEC_MERGE sections. This has to be done after GC of sections, so that GCed sections are not merged, but before assigning dynamic symbols, since removing whole input sections @@ -8554,6 +8582,8 @@ lang_process (void) if (!bfd_merge_sections (link_info.output_bfd, &link_info)) fatal (_("%P: bfd_merge_sections failed: %E\n")); + ld_stop_phase (PHASE_MERGE); + /* Look for a text section and set the readonly attribute in it. */ found = bfd_get_section_by_name (link_info.output_bfd, ".text"); @@ -46,6 +46,7 @@ enum option_values OPTION_MAP, OPTION_NO_DEMANGLE, OPTION_NO_KEEP_MEMORY, + OPTION_NO_STATS, OPTION_NO_WARN_MISMATCH, OPTION_NO_WARN_SEARCH_MISMATCH, OPTION_NOINHIBIT_EXEC, diff --git a/ld/ldmain.c b/ld/ldmain.c index 54a834e..91237a4 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -21,6 +21,7 @@ #include "sysdep.h" #include "bfd.h" +#include "bfdver.h" #include "safe-ctype.h" #include "libiberty.h" #include "bfdlink.h" @@ -51,6 +52,10 @@ #include <string.h> +#if defined (HAVE_GETRUSAGE) +#include <sys/resource.h> +#endif + #ifndef TARGET_SYSTEM_ROOT #define TARGET_SYSTEM_ROOT "" #endif @@ -224,6 +229,10 @@ ld_cleanup (void) bfd_close_all_done (ibfd); } #if BFD_SUPPORTS_PLUGINS + /* Note - we do not call ld_plugin_start (PHASE_PLUGINS) here as this + function is only called when the linker is exiting - ie after any + stats may have been reported, and potentially in the middle of a + phase where we have already started recording plugin stats. */ plugin_call_cleanup (); #endif if (output_filename && delete_output_file_on_failure) @@ -270,11 +279,305 @@ display_external_script (void) free (buf); } +struct ld_phase_data +{ + const char * name; + + unsigned long start; + unsigned long duration; + + bool started; + bool broken; + +#if defined (HAVE_GETRUSAGE) + struct rusage begin; + struct rusage use; +#endif +}; + +static struct ld_phase_data phase_data [NUM_PHASES] = +{ + [PHASE_ALL] = { .name = "ALL" }, + [PHASE_CTF] = { .name = "ctf processing" }, + [PHASE_MERGE] = { .name = "string merge" }, + [PHASE_PARSE] = { .name = "parsing" }, + [PHASE_PLUGINS] = { .name = "plugins" }, + [PHASE_PROCESS] = { .name = "processing files" }, + [PHASE_WRITE] = { .name = "write" }, +}; + +void +ld_start_phase (ld_phase phase) +{ + struct ld_phase_data * pd = phase_data + phase; + + /* We record data even if config.stats_file is NULL. This allows + us to record data about phases that start before the command line + arguments have been parsed. ie PHASE_ALL and PHASE_PARSE. */ + + /* Do not overwrite the fields if we have already started recording. */ + if (pd->started) + { + /* Since we do not queue phase starts and stops, if a phase is started + multiple times there is a likelyhood that it will be stopped multiple + times as well. This is problematic as we will only record the data + for the first time the phase stops and ignore all of the other stops. + + So let the user know. Ideally real users will never actually see + this message, and instead only developers who are adding new phase + tracking code will ever encounter it. */ + einfo ("%P: --stats: phase %s started twice - data may be unreliable\n", + pd->name); + return; + } + + /* It is OK if other phases are also active at this point. + It just means that the phases overlap or that one phase is a sub-task + of another. Since we record resources on a per-phase basis, this + should not matter. */ + + pd->started = true; + pd->start = get_run_time (); + +#if defined (HAVE_GETRUSAGE) + /* Record the resource usage at the start of the phase. */ + struct rusage usage; + + if (getrusage (RUSAGE_SELF, & usage) != 0) + /* FIXME: Complain ? */ + return; + + memcpy (& pd->begin, & usage, sizeof usage); +#endif +} + +void +ld_stop_phase (ld_phase phase) +{ + struct ld_phase_data * pd = phase_data + phase; + + if (!pd->started) + { + /* We set the broken flag to indicate that the data + recorded for this phase is inconsistent. */ + pd->broken = true; + return; + } + + pd->duration += get_run_time () - pd->start; + pd->started = false; + +#if defined (HAVE_GETRUSAGE) + struct rusage usage; + + if (getrusage (RUSAGE_SELF, & usage) != 0) + /* FIXME: Complain ? */ + return; + + if (phase == PHASE_ALL) + memcpy (& pd->use, & usage, sizeof usage); + else + { + struct timeval t; + + /* For sub-phases we record the increase in specific fields. */ + /* FIXME: Most rusage{} fields appear to be irrelevent to when considering + linker resource usage. Currently we record maxrss and user and system + cpu times. Are there any other fields that might be useful ? */ + +#ifndef timeradd /* Macros copied from <sys/time.h>. */ +#define timeradd(a, b, result) \ + do \ + { \ + (result)->tv_sec = (a)->tv_sec + (b)->tv_sec; \ + (result)->tv_usec = (a)->tv_usec + (b)->tv_usec; \ + if ((result)->tv_usec >= 1000000) \ + { \ + ++(result)->tv_sec; \ + (result)->tv_usec -= 1000000; \ + } \ + } \ + while (0) +#endif + +#ifndef timersub +#define timersub(a, b, result) \ + do \ + { \ + (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ + (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ + if ((result)->tv_usec < 0) \ + { \ + --(result)->tv_sec; \ + (result)->tv_usec += 1000000; \ + } \ + } \ + while (0) +#endif + + timersub (& usage.ru_utime, & pd->begin.ru_utime, & t); + timeradd (& pd->use.ru_utime, &t, & pd->use.ru_utime); + + timersub (& usage.ru_stime, & pd->begin.ru_stime, & t); + timeradd (& pd->use.ru_stime, &t, & pd->use.ru_stime); + + if (pd->begin.ru_maxrss < usage.ru_maxrss) + pd->use.ru_maxrss += usage.ru_maxrss - pd->begin.ru_maxrss; +#endif + } +} + +static void +report_phases (FILE * file, time_t * start, char ** argv) +{ + unsigned long i; + + if (file == NULL) + return; + + /* We might be writing to stdout, so make sure + that we do not have any pending error output. */ + fflush (stderr); + + /* We do not translate "Stats" as we provide this as a key + word that can be searched for by grep and the like. */ +#define STATS_PREFIX "Stats: " + + fprintf (file, STATS_PREFIX "linker version: %s\n", BFD_VERSION_STRING); + + /* No \n at the end of the string as ctime() provides its own. */ + fprintf (file, STATS_PREFIX "linker started: %s", ctime (start)); + + /* We include the linker command line arguments since + they can be hard to track down by other means. */ + if (argv != NULL) + { + fprintf (file, STATS_PREFIX "args: "); + for (i = 0; argv[i] != NULL; i++) + fprintf (file, "%s ", argv[i]); + fprintf (file, "\n\n"); /* Blank line to separate the args from the stats. */ + } + + /* All of this song and dance with the column_info struct and printf + formatting is so that we can have a nicely formated table with regular + column spacing, whilst allowing for the column headers to be translated, + and coping nicely with extra long strings or numbers. */ + struct column_info + { + const char * header; + const char * sub_header; + int width; + int pad; + } columns[] = +#define COLUMNS_FIELD(HEADER,SUBHEADER) \ + { .header = N_( HEADER ), .sub_header = N_( SUBHEADER ) }, + { + COLUMNS_FIELD ("phase", "name") + COLUMNS_FIELD ("cpu time", "(microsec)") +#if defined (HAVE_GETRUSAGE) + /* Note: keep these columns in sync with the + information recorded in ld_stop_phase(). */ + COLUMNS_FIELD ("memory", "(KiB)") + COLUMNS_FIELD ("user time", "(seconds)") + COLUMNS_FIELD ("system time", "(seconds)") +#endif + }; + +#ifndef max +#define max(A,B) ((A) < (B) ? (B) : (A)) +#endif + + size_t maxwidth = 1; + for (i = 0; i < NUM_PHASES; i++) + maxwidth = max (maxwidth, strlen (phase_data[i].name)); + + fprintf (file, "%s", STATS_PREFIX); + + for (i = 0; i < ARRAY_SIZE (columns); i++) + { + int padding; + + if (i == 0) + columns[i].width = fprintf (file, "%-*s", (int) maxwidth, columns[i].header); + else + columns[i].width = fprintf (file, "%s", columns[i].header); + padding = columns[i].width % 8; + if (padding < 4) + padding = 4; + columns[i].pad = fprintf (file, "%*c", padding, ' '); + } + + fprintf (file, "\n"); + + int bias = 0; +#define COLUMN_ENTRY(VAL, FORMAT, N) \ + do \ + { \ + int l; \ + \ + if (N == 0) \ + l = fprintf (file, "%-*" FORMAT, columns[N].width, VAL); \ + else \ + l = fprintf (file, "%*" FORMAT, columns[N].width - bias, VAL); \ + bias = 0; \ + if (l < columns[N].width) \ + l = columns[N].pad; \ + else if (l < columns[N].width + columns[N].pad) \ + l = columns[N].pad - (l - columns[N].width); \ + else \ + { \ + bias = l - (columns[N].width + columns[N].pad); \ + l = 0; \ + } \ + if (l) \ + fprintf (file, "%*c", l, ' '); \ + } \ + while (0) + + fprintf (file, "%s", STATS_PREFIX); + + for (i = 0; i < ARRAY_SIZE (columns); i++) + COLUMN_ENTRY (columns[i].sub_header, "s", i); + + fprintf (file, "\n"); + + for (i = 0; i < NUM_PHASES; i++) + { + struct ld_phase_data * pd = phase_data + i; + /* This should not be needed... */ + const char * name = pd->name ? pd->name : "<unnamed>"; + + if (pd->broken) + { + fprintf (file, "%s %s: %s", + STATS_PREFIX, name, _("WARNING: Data is unreliable!\n")); + continue; + } + + fprintf (file, "%s", STATS_PREFIX); + + /* Care must be taken to keep the lines below in sync with + entries in the columns_info array. + FIXME: There ought to be a better way to do this... */ + COLUMN_ENTRY (name, "s", 0); + COLUMN_ENTRY (pd->duration, "ld", 1); +#if defined (HAVE_GETRUSAGE) + COLUMN_ENTRY (pd->use.ru_maxrss, "ld", 2); + COLUMN_ENTRY (pd->use.ru_utime.tv_sec, "ld", 3); + COLUMN_ENTRY (pd->use.ru_stime.tv_sec, "ld", 4); +#endif + fprintf (file, "\n"); + } + + fflush (file); +} + int main (int argc, char **argv) { char *emulation; long start_time = get_run_time (); + time_t start_seconds = time (NULL); #ifdef HAVE_LC_MESSAGES setlocale (LC_MESSAGES, ""); @@ -286,7 +589,23 @@ main (int argc, char **argv) program_name = argv[0]; xmalloc_set_program_name (program_name); + /* Check the LD_STATS environment variable before parsing the command line + so that the --stats option, if used, can override the environment variable. */ + char * stats_filename; + if ((stats_filename = getenv ("LD_STATS")) != NULL) + { + if (ISPRINT (stats_filename[0])) + config.stats_filename = stats_filename; + else + config.stats_filename = "-"; + config.stats = true; + } + + ld_start_phase (PHASE_ALL); + ld_start_phase (PHASE_PARSE); + expandargv (&argc, &argv); + char ** saved_argv = dupargv (argv); if (bfd_init () != BFD_INIT_MAGIC) fatal (_("%P: fatal error: libbfd ABI mismatch\n")); @@ -404,11 +723,17 @@ main (int argc, char **argv) if (config.hash_table_size != 0) bfd_hash_set_default_size (config.hash_table_size); + ld_stop_phase (PHASE_PARSE); + #if BFD_SUPPORTS_PLUGINS + ld_start_phase (PHASE_PLUGINS); /* Now all the plugin arguments have been gathered, we can load them. */ plugin_load_plugins (); + ld_stop_phase (PHASE_PLUGINS); #endif /* BFD_SUPPORTS_PLUGINS */ + ld_start_phase (PHASE_PARSE); + ldemul_set_symbols (); /* If we have not already opened and parsed a linker script, @@ -531,7 +856,31 @@ main (int argc, char **argv) link_info.has_map_file = true; } + if (config.stats_filename != NULL) + { + if (config.map_filename != NULL + && strcmp (config.stats_filename, config.map_filename) == 0) + config.stats_file = NULL; + else if (strcmp (config.stats_filename, "-") == 0) + config.stats_file = stdout; + else + { + if (config.stats_filename[0] == '+') + config.stats_file = fopen (config.stats_filename + 1, "a"); + else + config.stats_file = fopen (config.stats_filename, "w"); + + if (config.stats_file == NULL) + einfo ("%P: Warning: failed to open resource record file: %s\n", + config.stats_filename); + } + } + + ld_stop_phase (PHASE_PARSE); + + ld_start_phase (PHASE_PROCESS); lang_process (); + ld_stop_phase (PHASE_PROCESS); /* Print error messages for any missing symbols, for any warning symbols, and possibly multiple definitions. */ @@ -558,7 +907,11 @@ main (int argc, char **argv) link_info.output_bfd->flags |= flags & bfd_applicable_file_flags (link_info.output_bfd); + + ld_start_phase (PHASE_WRITE); ldwrite (); + ld_stop_phase (PHASE_WRITE); + if (config.map_file != NULL) lang_map (); @@ -653,19 +1006,38 @@ main (int argc, char **argv) if (config.emit_gnu_object_only) cmdline_emit_object_only_section (); + ld_stop_phase (PHASE_ALL); + if (config.stats) { - long run_time = get_run_time () - start_time; + report_phases (config.map_file, & start_seconds, saved_argv); + + if (config.stats_filename) + { + report_phases (config.stats_file, & start_seconds, saved_argv); + + if (config.stats_file != stdout && config.stats_file != stderr) + { + fclose (config.stats_file); + config.stats_file = NULL; + } + } + else /* This is for backwards compatibility. */ + { + long run_time = get_run_time () - start_time; - fflush (stdout); - fprintf (stderr, _("%s: total time in link: %ld.%06ld\n"), - program_name, run_time / 1000000, run_time % 1000000); - fflush (stderr); + fflush (stdout); + fprintf (stderr, _("%s: total time in link: %ld.%06ld\n"), + program_name, run_time / 1000000, run_time % 1000000); + fflush (stderr); + } } /* Prevent ld_cleanup from deleting the output file. */ output_filename = NULL; + freeargv (saved_argv); + xexit (0); return 0; } @@ -942,8 +1314,11 @@ add_archive_element (struct bfd_link_info *info, && (!no_more_claiming || bfd_get_lto_type (abfd) != lto_fat_ir_object)) { + ld_start_phase (PHASE_PLUGINS); /* We must offer this archive member to the plugins to claim. */ plugin_maybe_claim (input); + ld_stop_phase (PHASE_PLUGINS); + if (input->flags.claimed) { if (no_more_claiming) diff --git a/ld/lexsup.c b/ld/lexsup.c index 7de6e25..bde2046 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c @@ -499,8 +499,10 @@ static const struct ld_option ld_options[] = { {"split-by-reloc", optional_argument, NULL, OPTION_SPLIT_BY_RELOC}, '\0', N_("[=COUNT]"), N_("Split output sections every COUNT relocs"), TWO_DASHES }, - { {"stats", no_argument, NULL, OPTION_STATS}, - '\0', NULL, N_("Print memory usage statistics"), TWO_DASHES }, + { {"stats", optional_argument, NULL, OPTION_STATS}, + '\0', NULL, N_("Print resource usage statistics"), TWO_DASHES }, + { {"no-stats", optional_argument, NULL, OPTION_NO_STATS}, + '\0', NULL, N_("Do not print resource usage statistics"), TWO_DASHES }, { {"target-help", no_argument, NULL, OPTION_TARGET_HELP}, '\0', NULL, N_("Display target specific options"), TWO_DASHES }, { {"task-link", required_argument, NULL, OPTION_TASK_LINK}, @@ -1412,6 +1414,17 @@ parse_args (unsigned argc, char **argv) break; case OPTION_STATS: config.stats = true; + if (optarg) + config.stats_filename = optarg; + else + { + config.stats_filename = NULL; + config.stats_file = stderr; + } + break; + case OPTION_NO_STATS: + config.stats = false; + config.stats_filename = NULL; break; case OPTION_NO_SYMBOLIC: opt_symbolic = symbolic_unset; diff --git a/ld/pe-dll.c b/ld/pe-dll.c index 4e72f1b..de1cfaf 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c @@ -381,6 +381,7 @@ static const autofilter_entry_type autofilter_liblist[] = { STRING_COMMA_LEN ("libmsvcrt") }, { STRING_COMMA_LEN ("libmsvcrt-os") }, { STRING_COMMA_LEN ("libucrt") }, + { STRING_COMMA_LEN ("libucrtapp") }, { STRING_COMMA_LEN ("libucrtbase") }, { STRING_COMMA_LEN ("libpthread") }, { STRING_COMMA_LEN ("libwinpthread") }, diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp index 8dcb021..deb46d3 100644 --- a/ld/testsuite/ld-elf/sec64k.exp +++ b/ld/testsuite/ld-elf/sec64k.exp @@ -168,9 +168,9 @@ if [catch { set ofd [open "tmpdir/$test2.d" w] } x] { return } -# too big for avr, d10v and msp -# lack of fancy orphan section handling causes overlap on fr30 and iq2000 -# bfin and lm32 complain about relocations in read-only sections +# Too big for avr, d10v and msp. +# Lack of fancy orphan section handling causes overlap on fr30 and iq2000. +# bfin and lm32 complain about relocations in read-only sections. if { ![istarget "d10v-*-*"] && ![istarget "avr-*-*"] && ![istarget "msp*-*-*"] @@ -179,7 +179,13 @@ if { ![istarget "d10v-*-*"] && ![istarget "bfin-*-linux*"] && ![istarget "lm32-*-linux*"] && ![istarget "pru-*-*"] } { + + # Create a 64ksec.d test control file... + + # List the input files. foreach sfile $sfiles { puts $ofd "#source: $sfile" } + + # Add any needed linker command line options. if { [istarget spu*-*-*] } { puts $ofd "#ld: --local-store 0:0" } elseif { [istarget "i?86-*-linux*"] || [istarget "x86_64-*-linux*"] } { @@ -187,10 +193,20 @@ if { ![istarget "d10v-*-*"] } else { puts $ofd "#ld:" } - #force z80 target to compile for eZ80 in ADL mode + + # Enable the accumulation of internal linker statistics in a separate file. + # Enabled this way as you cannot have multiple #ld: options in a .d file. + # The + character causes the file to opened in append mode, so that multiple + # runs of this test will accumulate data over time. Thus allowing regular + # testers to see changes in the performance of the linker. + puts $ofd "#ld_after_inputfiles: --stats=+tmpdir/$test2.stats" + + # Force z80 target to compile for eZ80 in ADL mode. if { [istarget "z80-*-*"] } then { puts $ofd "#as: -ez80-adl" } + + # Add a test of the linked binary. puts $ofd "#readelf: -W -wN -Ss" puts $ofd "There are 660.. section headers.*:" puts $ofd "#..." @@ -199,6 +215,7 @@ if { ![istarget "d10v-*-*"] puts $ofd " \\\[65279\\\] \\.foo\\.\[0-9\]+ .*" puts $ofd " \\\[65280\\\] \\.foo\\.\[0-9\]+ .*" puts $ofd "#..." + if { [is_elf_unused_section_symbols ] } { puts $ofd " 660..: \[0-9a-f\]+\[ \]+0\[ \]+SECTION\[ \]+LOCAL\[ \]+DEFAULT\[ \]+660...*" puts $ofd "#..." @@ -209,6 +226,7 @@ if { ![istarget "d10v-*-*"] puts $ofd " 66...: \[0-9a-f\]+\[ \]+0\[ \]+NOTYPE\[ \]+LOCAL\[ \]+DEFAULT\[ \]+660.. bar_66000$" } puts $ofd "#..." + # Global symbols are not in "alphanumeric" order, so we just check # that the first and the last are present in any order (assuming no # duplicates). @@ -217,9 +235,14 @@ if { ![istarget "d10v-*-*"] puts $ofd ".* (\[0-9\] foo_1|66... foo_66000)$" puts $ofd "#pass" close $ofd + + # Now run the constructed test file. run_dump_test "tmpdir/$test2" + + # Leave the test file around in case the user wants to examine it. } +# Tidy up. for { set i 1 } { $i < $max_sec / $secs_per_file } { incr i } { catch "exec rm -f tmpdir/dump$i.o" status } diff --git a/ld/testsuite/ld-pe/secidx.d b/ld/testsuite/ld-pe/secidx.d index 184cc9f..d0e52c9 100644 --- a/ld/testsuite/ld-pe/secidx.d +++ b/ld/testsuite/ld-pe/secidx.d @@ -1,11 +1,11 @@ tmpdir/secidx\.x: +file format pei-.* -Contents of section .text: +Contents of section \.text: .*1000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c >>>><<<<>>>>><<< .*1010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c >>>>>><<>>>>>>>< .*1020 3c3c3c3c 3e3e3e3e 3e909090 <<<<>>>>>... -Contents of section .data: +Contents of section \.data: .*2000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c >>>><<<<>>>>><<< .*2010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c >>>>>><<>>>>>>>< .*2020 3e3e3e3e 01001101 00110100 11010011 >>>>............ @@ -15,13 +15,13 @@ Contents of section .data: .*2060 3c3c3c3c 3c3c3c3c 3e3e3e3e 01001102 <<<<<<<<>>>>.... .*2070 00110300 113c3c3c 3c3c3c3c 3c000000 .....<<<<<<<<... .*2080 3c3c3c3e 3e3e3e3e 3e000000 <<<>>>>>>... -Contents of section .rdata: +Contents of section \.rdata: .*3000 3e3e3e3e 3c3c3c3c 3e3e3e3e 3e3c3c3c >>>><<<<>>>>><<< .*3010 3e3e3e3e 3e3e3c3c 3e3e3e3e 3e3e3e3c >>>>>><<>>>>>>>< .*3020 3e3e3e3e 00000000 00000000 00000000 >>>>............ .*3030 3c3c3c3e 3e3e3e3e 3e000000 ffffffff <<<>>>>>>....... .*3040 00000000 ffffffff 00000000 ............ -Contents of section .idata: +Contents of section \.idata: .*4000 00000000 00000000 00000000 00000000 ................ .*4010 00000000 .... #... diff --git a/ld/testsuite/ld-scripts/map-address.exp b/ld/testsuite/ld-scripts/map-address.exp index 2291302..776fed4 100644 --- a/ld/testsuite/ld-scripts/map-address.exp +++ b/ld/testsuite/ld-scripts/map-address.exp @@ -130,19 +130,38 @@ if { [is_elf_format] } { $IMAGE_BASE tmpdir/map-address.o \ -Map=tmpdir/map-locals.map --print-map-locals"]} { fail $testname - return - } - if [is_remote host] then { - remote_upload host "tmpdir/map-locals.map" - } + } else { - # Some ELF targets do not preserve their local symbols. - setup_xfail "d30v-*-*" "dlx-*-*" "pj-*-*" "s12z-*-*" "xgate-*-*" + if [is_remote host] then { + remote_upload host "tmpdir/map-locals.map" + } + + # Some ELF targets do not preserve their local symbols. + setup_xfail "d30v-*-*" "dlx-*-*" "pj-*-*" "s12z-*-*" "xgate-*-*" + if {[regexp_diff \ + "tmpdir/map-locals.map" \ + "$srcdir/$subdir/map-locals.d"]} { + fail $testname + } else { + pass $testname + } + } +} + +set testname "map with resource usage" + +if {![ld_link $ld tmpdir/map-address \ + "$LDFLAGS -T $srcdir/$subdir/map-address.t \ + $IMAGE_BASE tmpdir/map-address.o \ + -Map=tmpdir/map-locals.map \ + --stats=tmpdir/map-stats.map"]} { + fail $testname +} else { if {[regexp_diff \ - "tmpdir/map-locals.map" \ - "$srcdir/$subdir/map-locals.d"]} { + "tmpdir/map-stats.map" \ + "$srcdir/$subdir/map-stats.d"]} { fail $testname } else { pass $testname diff --git a/ld/testsuite/ld-scripts/map-stats.d b/ld/testsuite/ld-scripts/map-stats.d new file mode 100644 index 0000000..ba9adf8 --- /dev/null +++ b/ld/testsuite/ld-scripts/map-stats.d @@ -0,0 +1,5 @@ +#... +Stats: phase.* +Stats: name.* +Stats: ALL.* +#pass diff --git a/opcodes/i386-mnem.h b/opcodes/i386-mnem.h index 312c9e3..3e69415 100644 --- a/opcodes/i386-mnem.h +++ b/opcodes/i386-mnem.h @@ -2624,7 +2624,8 @@ extern const char i386_mnemonics[]; #define MN__store_ 0x5060 #define MN__nooptimize_ 0x5068 #define MN__nf_ 0x5075 -#define MN__rex_ 0x507a -#define MN__evex_ 0x5080 -#define MN__vex_ 0x5087 -#define MN__insn 0x508d +#define MN__noimm8s_ 0x507a +#define MN__rex_ 0x5084 +#define MN__evex_ 0x508a +#define MN__vex_ 0x5091 +#define MN__insn 0x5097 diff --git a/opcodes/i386-opc.h b/opcodes/i386-opc.h index f861cdc..fac0371 100644 --- a/opcodes/i386-opc.h +++ b/opcodes/i386-opc.h @@ -1074,6 +1074,7 @@ typedef struct insn_template #define Prefix_REX2 9 /* {rex2} */ #define Prefix_NoOptimize 10 /* {nooptimize} */ #define Prefix_NF 11 /* {nf} */ +#define Prefix_NoImm8s 12 /* {noimm8s} */ /* the bits in opcode_modifier are used to generate the final opcode from the base_opcode. These bits also are used to detect alternate forms of diff --git a/opcodes/i386-opc.tbl b/opcodes/i386-opc.tbl index 15c6635..bc71987 100644 --- a/opcodes/i386-opc.tbl +++ b/opcodes/i386-opc.tbl @@ -947,7 +947,7 @@ rex.wrxb, 0x4f, x64, NoSuf|IsPrefix, {} load:Load:0, store:Store:0, + vex:VEX:0, vex2:VEX:0, vex3:VEX3:0, evex:EVEX:0, + rex:REX:x64, rex2:REX2:APX_F, nf:NF:APX_F, + - nooptimize:NoOptimize:0> + nooptimize:NoOptimize:0, noimm8s:NoImm8s:0> {<pseudopfx>}, PSEUDO_PREFIX/Prefix_<pseudopfx:ident>, <pseudopfx:cpu>, NoSuf|IsPrefix, {} diff --git a/opcodes/i386-tbl.h b/opcodes/i386-tbl.h index c9a6e80..c7d2912 100644 --- a/opcodes/i386-tbl.h +++ b/opcodes/i386-tbl.h @@ -8780,6 +8780,14 @@ static const insn_template i386_optab[] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } } }, + { MN__noimm8s_, 0x00, 0, SPACE_BASE, Prefix_NoImm8s, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0 }, + { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, + { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, + { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 } } } }, { MN_xadd, 0xc0, 2, SPACE_0F, None, { 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -47926,122 +47934,122 @@ static const i386_op_off_t i386_op_sets[] = 951, 952, 953, 954, 955, 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 973, 974, - 975, 976, 977, 978, 979, 981, 982, 984, - 986, 987, 988, 989, 990, 991, 992, 993, - 994, 995, 996, 998, 1000, 1002, 1004, 1006, - 1008, 1010, 1012, 1014, 1016, 1018, 1020, 1022, - 1024, 1026, 1028, 1030, 1032, 1034, 1036, 1038, - 1040, 1042, 1044, 1046, 1048, 1050, 1052, 1054, - 1056, 1058, 1060, 1062, 1064, 1066, 1068, 1070, - 1072, 1074, 1076, 1078, 1080, 1082, 1084, 1086, - 1088, 1090, 1092, 1094, 1096, 1098, 1100, 1102, - 1104, 1106, 1108, 1110, 1112, 1114, 1116, 1117, + 975, 976, 977, 978, 979, 980, 982, 983, + 985, 987, 988, 989, 990, 991, 992, 993, + 994, 995, 996, 997, 999, 1001, 1003, 1005, + 1007, 1009, 1011, 1013, 1015, 1017, 1019, 1021, + 1023, 1025, 1027, 1029, 1031, 1033, 1035, 1037, + 1039, 1041, 1043, 1045, 1047, 1049, 1051, 1053, + 1055, 1057, 1059, 1061, 1063, 1065, 1067, 1069, + 1071, 1073, 1075, 1077, 1079, 1081, 1083, 1085, + 1087, 1089, 1091, 1093, 1095, 1097, 1099, 1101, + 1103, 1105, 1107, 1109, 1111, 1113, 1115, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, - 1126, 1127, 1128, 1131, 1134, 1137, 1140, 1143, - 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1158, - 1168, 1172, 1176, 1180, 1184, 1188, 1191, 1195, - 1199, 1203, 1207, 1211, 1214, 1217, 1220, 1223, - 1226, 1229, 1232, 1235, 1239, 1243, 1247, 1250, - 1258, 1264, 1272, 1280, 1286, 1294, 1300, 1308, - 1312, 1316, 1319, 1323, 1327, 1331, 1335, 1339, - 1343, 1347, 1350, 1354, 1358, 1361, 1364, 1366, - 1368, 1370, 1372, 1374, 1376, 1378, 1380, 1382, - 1384, 1386, 1388, 1391, 1394, 1397, 1400, 1402, - 1404, 1406, 1408, 1410, 1412, 1414, 1416, 1418, - 1420, 1422, 1424, 1426, 1428, 1430, 1432, 1434, - 1436, 1438, 1439, 1440, 1446, 1448, 1449, 1451, - 1453, 1454, 1456, 1458, 1461, 1463, 1466, 1468, - 1470, 1471, 1473, 1476, 1478, 1482, 1486, 1495, - 1501, 1505, 1509, 1513, 1517, 1520, 1524, 1525, - 1526, 1527, 1528, 1532, 1533, 1536, 1539, 1542, - 1545, 1546, 1548, 1550, 1552, 1554, 1556, 1558, - 1560, 1563, 1566, 1569, 1572, 1575, 1578, 1581, - 1584, 1587, 1590, 1593, 1596, 1599, 1602, 1605, - 1608, 1610, 1612, 1614, 1616, 1618, 1620, 1622, - 1624, 1626, 1628, 1630, 1632, 1634, 1636, 1638, - 1640, 1642, 1644, 1647, 1650, 1656, 1659, 1664, - 1669, 1671, 1674, 1679, 1682, 1685, 1688, 1691, - 1694, 1697, 1700, 1702, 1705, 1707, 1708, 1711, - 1713, 1715, 1717, 1720, 1722, 1723, 1725, 1728, - 1730, 1732, 1734, 1736, 1737, 1738, 1742, 1744, - 1747, 1750, 1753, 1756, 1759, 1762, 1764, 1766, - 1768, 1770, 1772, 1774, 1777, 1780, 1782, 1784, - 1786, 1787, 1788, 1791, 1793, 1794, 1795, 1796, - 1797, 1798, 1799, 1801, 1803, 1804, 1805, 1806, - 1807, 1810, 1813, 1816, 1819, 1822, 1825, 1828, - 1831, 1834, 1838, 1842, 1846, 1849, 1852, 1855, - 1859, 1863, 1867, 1870, 1872, 1874, 1878, 1882, - 1884, 1886, 1890, 1892, 1894, 1896, 1899, 1903, - 1905, 1907, 1913, 1916, 1919, 1921, 1927, 1930, - 1933, 1936, 1938, 1940, 1943, 1946, 1948, 1950, - 1953, 1956, 1959, 1961, 1963, 1965, 1967, 1969, - 1971, 1973, 1975, 1977, 1979, 1982, 1984, 1986, - 1989, 1991, 1994, 1996, 1998, 2002, 2006, 2008, - 2010, 2014, 2015, 2016, 2017, 2018, 2019, 2020, - 2021, 2022, 2024, 2026, 2028, 2030, 2032, 2034, - 2036, 2038, 2040, 2042, 2044, 2046, 2048, 2050, - 2052, 2054, 2056, 2058, 2060, 2062, 2064, 2066, - 2068, 2070, 2072, 2074, 2076, 2078, 2080, 2082, - 2084, 2086, 2088, 2090, 2092, 2094, 2096, 2098, - 2099, 2100, 2102, 2104, 2106, 2108, 2110, 2112, - 2114, 2116, 2117, 2118, 2119, 2120, 2121, 2124, - 2126, 2128, 2130, 2132, 2134, 2136, 2138, 2140, - 2142, 2144, 2146, 2148, 2150, 2152, 2154, 2156, - 2158, 2160, 2162, 2164, 2166, 2168, 2170, 2172, - 2174, 2176, 2178, 2180, 2182, 2184, 2186, 2188, - 2190, 2192, 2194, 2196, 2198, 2200, 2202, 2204, - 2206, 2208, 2210, 2212, 2214, 2216, 2218, 2220, - 2222, 2224, 2226, 2228, 2230, 2232, 2234, 2236, - 2238, 2240, 2242, 2244, 2246, 2248, 2250, 2252, - 2254, 2256, 2258, 2260, 2262, 2264, 2266, 2268, - 2270, 2272, 2274, 2276, 2278, 2280, 2282, 2284, - 2286, 2288, 2290, 2292, 2294, 2296, 2298, 2300, - 2302, 2304, 2306, 2308, 2310, 2312, 2314, 2316, - 2318, 2320, 2322, 2324, 2326, 2328, 2330, 2332, - 2334, 2336, 2338, 2340, 2342, 2344, 2346, 2348, - 2350, 2352, 2354, 2356, 2358, 2360, 2362, 2364, - 2366, 2368, 2370, 2372, 2374, 2376, 2378, 2380, - 2382, 2384, 2386, 2388, 2390, 2392, 2394, 2396, - 2398, 2400, 2402, 2404, 2406, 2408, 2410, 2412, - 2414, 2416, 2418, 2420, 2422, 2424, 2426, 2428, - 2430, 2432, 2434, 2436, 2438, 2440, 2442, 2444, - 2446, 2448, 2450, 2452, 2454, 2456, 2458, 2460, - 2462, 2464, 2466, 2468, 2470, 2472, 2474, 2476, - 2478, 2480, 2482, 2484, 2486, 2488, 2490, 2492, - 2494, 2496, 2498, 2500, 2502, 2504, 2506, 2511, - 2513, 2518, 2520, 2522, 2527, 2529, 2531, 2533, - 2538, 2540, 2542, 2544, 2548, 2554, 2556, 2561, - 2563, 2565, 2567, 2569, 2571, 2572, 2573, 2574, - 2576, 2577, 2578, 2579, 2580, 2581, 2583, 2584, - 2585, 2586, 2588, 2590, 2592, 2594, 2598, 2602, - 2603, 2604, 2606, 2610, 2614, 2616, 2620, 2624, - 2625, 2626, 2628, 2630, 2632, 2634, 2639, 2643, - 2647, 2649, 2651, 2653, 2655, 2657, 2659, 2661, - 2663, 2665, 2667, 2669, 2671, 2673, 2675, 2677, - 2679, 2681, 2683, 2685, 2687, 2689, 2690, 2691, - 2693, 2695, 2696, 2697, 2700, 2703, 2706, 2709, - 2711, 2713, 2715, 2717, 2719, 2721, 2722, 2723, - 2724, 2726, 2730, 2732, 2734, 2740, 2744, 2745, - 2746, 2747, 2748, 2749, 2750, 2751, 2755, 2757, - 2759, 2763, 2765, 2767, 2769, 2771, 2773, 2775, - 2777, 2779, 2781, 2783, 2785, 2787, 2789, 2791, - 2792, 2795, 2798, 2801, 2804, 2809, 2814, 2819, - 2824, 2827, 2830, 2833, 2836, 2838, 2840, 2842, - 2844, 2846, 2848, 2850, 2851, 2853, 2855, 2857, - 2859, 2861, 2862, 2863, 2864, 2868, 2872, 2874, - 2878, 2882, 2886, 2890, 2894, 2896, 2900, 2902, - 2904, 2906, 2908, 2910, 2912, 2914, 2916, 2917, - 2919, 2921, 2923, 2925, 2927, 2929, 2931, 2933, + 1126, 1127, 1128, 1129, 1132, 1135, 1138, 1141, + 1144, 1147, 1148, 1149, 1150, 1151, 1152, 1153, + 1159, 1169, 1173, 1177, 1181, 1185, 1189, 1192, + 1196, 1200, 1204, 1208, 1212, 1215, 1218, 1221, + 1224, 1227, 1230, 1233, 1236, 1240, 1244, 1248, + 1251, 1259, 1265, 1273, 1281, 1287, 1295, 1301, + 1309, 1313, 1317, 1320, 1324, 1328, 1332, 1336, + 1340, 1344, 1348, 1351, 1355, 1359, 1362, 1365, + 1367, 1369, 1371, 1373, 1375, 1377, 1379, 1381, + 1383, 1385, 1387, 1389, 1392, 1395, 1398, 1401, + 1403, 1405, 1407, 1409, 1411, 1413, 1415, 1417, + 1419, 1421, 1423, 1425, 1427, 1429, 1431, 1433, + 1435, 1437, 1439, 1440, 1441, 1447, 1449, 1450, + 1452, 1454, 1455, 1457, 1459, 1462, 1464, 1467, + 1469, 1471, 1472, 1474, 1477, 1479, 1483, 1487, + 1496, 1502, 1506, 1510, 1514, 1518, 1521, 1525, + 1526, 1527, 1528, 1529, 1533, 1534, 1537, 1540, + 1543, 1546, 1547, 1549, 1551, 1553, 1555, 1557, + 1559, 1561, 1564, 1567, 1570, 1573, 1576, 1579, + 1582, 1585, 1588, 1591, 1594, 1597, 1600, 1603, + 1606, 1609, 1611, 1613, 1615, 1617, 1619, 1621, + 1623, 1625, 1627, 1629, 1631, 1633, 1635, 1637, + 1639, 1641, 1643, 1645, 1648, 1651, 1657, 1660, + 1665, 1670, 1672, 1675, 1680, 1683, 1686, 1689, + 1692, 1695, 1698, 1701, 1703, 1706, 1708, 1709, + 1712, 1714, 1716, 1718, 1721, 1723, 1724, 1726, + 1729, 1731, 1733, 1735, 1737, 1738, 1739, 1743, + 1745, 1748, 1751, 1754, 1757, 1760, 1763, 1765, + 1767, 1769, 1771, 1773, 1775, 1778, 1781, 1783, + 1785, 1787, 1788, 1789, 1792, 1794, 1795, 1796, + 1797, 1798, 1799, 1800, 1802, 1804, 1805, 1806, + 1807, 1808, 1811, 1814, 1817, 1820, 1823, 1826, + 1829, 1832, 1835, 1839, 1843, 1847, 1850, 1853, + 1856, 1860, 1864, 1868, 1871, 1873, 1875, 1879, + 1883, 1885, 1887, 1891, 1893, 1895, 1897, 1900, + 1904, 1906, 1908, 1914, 1917, 1920, 1922, 1928, + 1931, 1934, 1937, 1939, 1941, 1944, 1947, 1949, + 1951, 1954, 1957, 1960, 1962, 1964, 1966, 1968, + 1970, 1972, 1974, 1976, 1978, 1980, 1983, 1985, + 1987, 1990, 1992, 1995, 1997, 1999, 2003, 2007, + 2009, 2011, 2015, 2016, 2017, 2018, 2019, 2020, + 2021, 2022, 2023, 2025, 2027, 2029, 2031, 2033, + 2035, 2037, 2039, 2041, 2043, 2045, 2047, 2049, + 2051, 2053, 2055, 2057, 2059, 2061, 2063, 2065, + 2067, 2069, 2071, 2073, 2075, 2077, 2079, 2081, + 2083, 2085, 2087, 2089, 2091, 2093, 2095, 2097, + 2099, 2100, 2101, 2103, 2105, 2107, 2109, 2111, + 2113, 2115, 2117, 2118, 2119, 2120, 2121, 2122, + 2125, 2127, 2129, 2131, 2133, 2135, 2137, 2139, + 2141, 2143, 2145, 2147, 2149, 2151, 2153, 2155, + 2157, 2159, 2161, 2163, 2165, 2167, 2169, 2171, + 2173, 2175, 2177, 2179, 2181, 2183, 2185, 2187, + 2189, 2191, 2193, 2195, 2197, 2199, 2201, 2203, + 2205, 2207, 2209, 2211, 2213, 2215, 2217, 2219, + 2221, 2223, 2225, 2227, 2229, 2231, 2233, 2235, + 2237, 2239, 2241, 2243, 2245, 2247, 2249, 2251, + 2253, 2255, 2257, 2259, 2261, 2263, 2265, 2267, + 2269, 2271, 2273, 2275, 2277, 2279, 2281, 2283, + 2285, 2287, 2289, 2291, 2293, 2295, 2297, 2299, + 2301, 2303, 2305, 2307, 2309, 2311, 2313, 2315, + 2317, 2319, 2321, 2323, 2325, 2327, 2329, 2331, + 2333, 2335, 2337, 2339, 2341, 2343, 2345, 2347, + 2349, 2351, 2353, 2355, 2357, 2359, 2361, 2363, + 2365, 2367, 2369, 2371, 2373, 2375, 2377, 2379, + 2381, 2383, 2385, 2387, 2389, 2391, 2393, 2395, + 2397, 2399, 2401, 2403, 2405, 2407, 2409, 2411, + 2413, 2415, 2417, 2419, 2421, 2423, 2425, 2427, + 2429, 2431, 2433, 2435, 2437, 2439, 2441, 2443, + 2445, 2447, 2449, 2451, 2453, 2455, 2457, 2459, + 2461, 2463, 2465, 2467, 2469, 2471, 2473, 2475, + 2477, 2479, 2481, 2483, 2485, 2487, 2489, 2491, + 2493, 2495, 2497, 2499, 2501, 2503, 2505, 2507, + 2512, 2514, 2519, 2521, 2523, 2528, 2530, 2532, + 2534, 2539, 2541, 2543, 2545, 2549, 2555, 2557, + 2562, 2564, 2566, 2568, 2570, 2572, 2573, 2574, + 2575, 2577, 2578, 2579, 2580, 2581, 2582, 2584, + 2585, 2586, 2587, 2589, 2591, 2593, 2595, 2599, + 2603, 2604, 2605, 2607, 2611, 2615, 2617, 2621, + 2625, 2626, 2627, 2629, 2631, 2633, 2635, 2640, + 2644, 2648, 2650, 2652, 2654, 2656, 2658, 2660, + 2662, 2664, 2666, 2668, 2670, 2672, 2674, 2676, + 2678, 2680, 2682, 2684, 2686, 2688, 2690, 2691, + 2692, 2694, 2696, 2697, 2698, 2701, 2704, 2707, + 2710, 2712, 2714, 2716, 2718, 2720, 2722, 2723, + 2724, 2725, 2727, 2731, 2733, 2735, 2741, 2745, + 2746, 2747, 2748, 2749, 2750, 2751, 2752, 2756, + 2758, 2760, 2764, 2766, 2768, 2770, 2772, 2774, + 2776, 2778, 2780, 2782, 2784, 2786, 2788, 2790, + 2792, 2793, 2796, 2799, 2802, 2805, 2810, 2815, + 2820, 2825, 2828, 2831, 2834, 2837, 2839, 2841, + 2843, 2845, 2847, 2849, 2851, 2852, 2854, 2856, + 2858, 2860, 2862, 2863, 2864, 2865, 2869, 2873, + 2875, 2879, 2883, 2887, 2891, 2895, 2897, 2901, + 2903, 2905, 2907, 2909, 2911, 2913, 2915, 2917, + 2918, 2920, 2922, 2924, 2926, 2928, 2930, 2932, 2934, 2935, 2936, 2937, 2938, 2939, 2940, 2941, - 2942, 2944, 2946, 2948, 2950, 2952, 2954, 2955, - 2956, 2957, 2959, 2961, 2963, 2965, 2967, 2969, - 2970, 2971, 2972, 2973, 2976, 2979, 2981, 2984, - 2985, 2986, 2988, 2989, 2991, 2992, 2993, 2995, - 2997, 2998, 2999, 3000, 3001, 3002, 3005, 3010, - 3015, 3020, 3025, 3028, 3033, 3038, 3040, 3042, - 3044, 3046, 3047, 3048, 3050, 3052, 3054, 3056, - 3058, 3060, 3062, 3063, 3064, 3065, 3066, 3067, - 3068, 3073, 3078, 3079, 3080, 3081, 3082, 3083, + 2942, 2943, 2945, 2947, 2949, 2951, 2953, 2955, + 2956, 2957, 2958, 2960, 2962, 2964, 2966, 2968, + 2970, 2971, 2972, 2973, 2974, 2977, 2980, 2982, + 2985, 2986, 2987, 2989, 2990, 2992, 2993, 2994, + 2996, 2998, 2999, 3000, 3001, 3002, 3003, 3006, + 3011, 3016, 3021, 3026, 3029, 3034, 3039, 3041, + 3043, 3045, 3047, 3048, 3049, 3051, 3053, 3055, + 3057, 3059, 3061, 3063, 3064, 3065, 3066, 3067, + 3068, 3069, 3074, 3079, 3080, 3081, 3082, 3083, 3084, 3085, 3086, 3087, 3088, 3089, 3090, 3091, 3092, 3093, 3094, 3095, 3096, 3097, 3098, 3099, 3100, 3101, 3102, 3103, 3104, 3105, 3106, 3107, @@ -48066,28 +48074,28 @@ static const i386_op_off_t i386_op_sets[] = 3252, 3253, 3254, 3255, 3256, 3257, 3258, 3259, 3260, 3261, 3262, 3263, 3264, 3265, 3266, 3267, 3268, 3269, 3270, 3271, 3272, 3273, 3274, 3275, - 3276, 3277, 3278, 3279, 3281, 3283, 3284, 3285, + 3276, 3277, 3278, 3279, 3280, 3282, 3284, 3285, 3286, 3287, 3288, 3289, 3290, 3291, 3292, 3293, 3294, 3295, 3296, 3297, 3298, 3299, 3300, 3301, 3302, 3303, 3304, 3305, 3306, 3307, 3308, 3309, - 3310, 3311, 3313, 3315, 3317, 3319, 3320, 3321, + 3310, 3311, 3312, 3314, 3316, 3318, 3320, 3321, 3322, 3323, 3324, 3325, 3326, 3327, 3328, 3329, - 3330, 3331, 3332, 3334, 3335, 3336, 3337, 3339, + 3330, 3331, 3332, 3333, 3335, 3336, 3337, 3338, 3340, 3341, 3342, 3343, 3344, 3345, 3346, 3347, 3348, 3349, 3350, 3351, 3352, 3353, 3354, 3355, 3356, 3357, 3358, 3359, 3360, 3361, 3362, 3363, 3364, 3365, 3366, 3367, 3368, 3369, 3370, 3371, 3372, 3373, 3374, 3375, 3376, 3377, 3378, 3379, - 3380, 3382, 3384, 3385, 3386, 3388, 3389, 3391, - 3393, 3394, 3395, 3397, 3399, 3401, 3403, 3404, + 3380, 3381, 3383, 3385, 3386, 3387, 3389, 3390, + 3392, 3394, 3395, 3396, 3398, 3400, 3402, 3404, 3405, 3406, 3407, 3408, 3409, 3410, 3411, 3412, 3413, 3414, 3415, 3416, 3417, 3418, 3419, 3420, - 3421, 3422, 3423, 3424, 3425, 3426, 3427, 3430, - 3433, 3434, 3435, 3436, 3437, 3438, 3439, 3441, - 3443, 3445, 3446, 3447, 3448, 3449, 3450, 3451, - 3453, 3454, 3455, 3456, 3457, 3458, 3459, 3460, - 3461, 3463, 3465, 3466, 3467, 3468, 3469, 3470, - 3471, 3472, 3473, 3474, 3475, 3478, 3481, 3482, + 3421, 3422, 3423, 3424, 3425, 3426, 3427, 3428, + 3431, 3434, 3435, 3436, 3437, 3438, 3439, 3440, + 3442, 3444, 3446, 3447, 3448, 3449, 3450, 3451, + 3452, 3454, 3455, 3456, 3457, 3458, 3459, 3460, + 3461, 3462, 3464, 3466, 3467, 3468, 3469, 3470, + 3471, 3472, 3473, 3474, 3475, 3476, 3479, 3482, 3483, 3484, 3485, 3486, 3487, 3488, 3489, 3490, 3491, 3492, 3493, 3494, 3495, 3496, 3497, 3498, 3499, 3500, 3501, 3502, 3503, 3504, 3505, 3506, @@ -48095,23 +48103,23 @@ static const i386_op_off_t i386_op_sets[] = 3515, 3516, 3517, 3518, 3519, 3520, 3521, 3522, 3523, 3524, 3525, 3526, 3527, 3528, 3529, 3530, 3531, 3532, 3533, 3534, 3535, 3536, 3537, 3538, - 3539, 3542, 3544, 3547, 3550, 3552, 3555, 3558, - 3561, 3564, 3565, 3568, 3569, 3570, 3571, 3572, - 3573, 3577, 3579, 3582, 3583, 3584, 3585, 3586, + 3539, 3540, 3543, 3545, 3548, 3551, 3553, 3556, + 3559, 3562, 3565, 3566, 3569, 3570, 3571, 3572, + 3573, 3574, 3578, 3580, 3583, 3584, 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592, 3593, 3594, 3595, 3596, 3597, 3598, 3599, 3600, 3601, 3602, 3603, 3604, 3605, 3606, 3607, 3608, 3609, 3610, 3611, 3612, 3613, 3614, 3615, 3616, 3617, 3618, 3619, 3620, 3621, 3622, 3623, 3624, 3625, 3626, - 3627, 3628, 3629, 3630, 3631, 3632, 3633, 3635, + 3627, 3628, 3629, 3630, 3631, 3632, 3633, 3634, 3636, 3637, 3638, 3639, 3640, 3641, 3642, 3643, 3644, 3645, 3646, 3647, 3648, 3649, 3650, 3651, 3652, 3653, 3654, 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662, 3663, 3664, 3665, 3666, 3667, - 3668, 3669, 3670, 3671, 3672, 3673, 3674, 3677, - 3680, 3683, 3686, 3689, 3692, 3695, 3698, 3701, - 3704, 3707, 3710, 3713, 3716, 3719, 3720, 3721, - 3722, 3723, 3725, 3726, 3727, 3728, 3729, 3730, + 3668, 3669, 3670, 3671, 3672, 3673, 3674, 3675, + 3678, 3681, 3684, 3687, 3690, 3693, 3696, 3699, + 3702, 3705, 3708, 3711, 3714, 3717, 3720, 3721, + 3722, 3723, 3724, 3726, 3727, 3728, 3729, 3730, 3731, 3732, 3733, 3734, 3735, 3736, 3737, 3738, 3739, 3740, 3741, 3742, 3743, 3744, 3745, 3746, 3747, 3748, 3749, 3750, 3751, 3752, 3753, 3754, @@ -48119,7 +48127,7 @@ static const i386_op_off_t i386_op_sets[] = 3763, 3764, 3765, 3766, 3767, 3768, 3769, 3770, 3771, 3772, 3773, 3774, 3775, 3776, 3777, 3778, 3779, 3780, 3781, 3782, 3783, 3784, 3785, 3786, - 3789, 3792, 3793, 3794, 3795, 3796, 3797, 3798, + 3787, 3790, 3793, 3794, 3795, 3796, 3797, 3798, 3799, 3800, 3801, 3802, 3803, 3804, 3805, 3806, 3807, 3808, 3809, 3810, 3811, 3812, 3813, 3814, 3815, 3816, 3817, 3818, 3819, 3820, 3821, 3822, @@ -48127,34 +48135,34 @@ static const i386_op_off_t i386_op_sets[] = 3831, 3832, 3833, 3834, 3835, 3836, 3837, 3838, 3839, 3840, 3841, 3842, 3843, 3844, 3845, 3846, 3847, 3848, 3849, 3850, 3851, 3852, 3853, 3854, - 3857, 3860, 3863, 3864, 3865, 3866, 3867, 3868, + 3855, 3858, 3861, 3864, 3865, 3866, 3867, 3868, 3869, 3870, 3871, 3872, 3873, 3874, 3875, 3876, - 3877, 3878, 3879, 3882, 3885, 3886, 3887, 3890, - 3891, 3892, 3893, 3894, 3897, 3900, 3903, 3904, + 3877, 3878, 3879, 3880, 3883, 3886, 3887, 3888, + 3891, 3892, 3893, 3894, 3895, 3898, 3901, 3904, 3905, 3906, 3907, 3908, 3909, 3910, 3911, 3912, - 3913, 3915, 3916, 3917, 3918, 3920, 3921, 3922, + 3913, 3914, 3916, 3917, 3918, 3919, 3921, 3922, 3923, 3924, 3925, 3926, 3927, 3928, 3929, 3930, 3931, 3932, 3933, 3934, 3935, 3936, 3937, 3938, - 3939, 3940, 3941, 3942, 3944, 3946, 3947, 3948, + 3939, 3940, 3941, 3942, 3943, 3945, 3947, 3948, 3949, 3950, 3951, 3952, 3953, 3954, 3955, 3956, 3957, 3958, 3959, 3960, 3961, 3962, 3963, 3964, - 3965, 3966, 3967, 3968, 3969, 3970, 3971, 3973, - 3975, 3977, 3979, 3981, 3983, 3985, 3987, 3989, - 3991, 3993, 3995, 3997, 3999, 4001, 4003, 4004, - 4005, 4006, 4008, 4009, 4011, 4014, 4016, 4017, - 4018, 4020, 4022, 4023, 4024, 4025, 4026, 4027, - 4028, 4030, 4032, 4034, 4036, 4037, 4038, 4039, - 4040, 4041, 4042, 4043, 4044, 4045, 4047, 4049, - 4050, 4052, 4054, 4055, 4060, 4062, 4064, 4065, - 4066, 4067, 4068, 4069, 4070, 4071, 4073, 4075, - 4076, 4077, 4078, 4080, 4083, 4087, 4090, 4092, + 3965, 3966, 3967, 3968, 3969, 3970, 3971, 3972, + 3974, 3976, 3978, 3980, 3982, 3984, 3986, 3988, + 3990, 3992, 3994, 3996, 3998, 4000, 4002, 4004, + 4005, 4006, 4007, 4009, 4010, 4012, 4015, 4017, + 4018, 4019, 4021, 4023, 4024, 4025, 4026, 4027, + 4028, 4029, 4031, 4033, 4035, 4037, 4038, 4039, + 4040, 4041, 4042, 4043, 4044, 4045, 4046, 4048, + 4050, 4051, 4053, 4055, 4056, 4061, 4063, 4065, + 4066, 4067, 4068, 4069, 4070, 4071, 4072, 4074, + 4076, 4077, 4078, 4079, 4081, 4084, 4088, 4091, 4093, 4094, 4095, 4096, 4097, 4098, 4099, 4100, 4101, 4102, 4103, 4104, 4105, 4106, 4107, 4108, 4109, 4110, 4111, 4112, 4113, 4114, 4115, 4116, 4117, 4118, 4119, 4120, 4121, 4122, 4123, 4124, 4125, 4126, 4127, 4128, 4129, 4130, 4131, 4132, - 4133, 4134, 4135, 4137, 4139, 4141, 4143, 4145, - 4147, 4148, 4149, 4150, 4151, 4152, 4153, 4154, + 4133, 4134, 4135, 4136, 4138, 4140, 4142, 4144, + 4146, 4148, 4149, 4150, 4151, 4152, 4153, 4154, 4155, 4156, 4157, 4158, 4159, 4160, 4161, 4162, 4163, 4164, 4165, 4166, 4167, 4168, 4169, 4170, 4171, 4172, 4173, 4174, 4175, 4176, 4177, 4178, @@ -48169,32 +48177,33 @@ static const i386_op_off_t i386_op_sets[] = 4243, 4244, 4245, 4246, 4247, 4248, 4249, 4250, 4251, 4252, 4253, 4254, 4255, 4256, 4257, 4258, 4259, 4260, 4261, 4262, 4263, 4264, 4265, 4266, - 4267, 4268, 4269, 4270, 4273, 4274, 4275, 4278, - 4279, 4280, 4282, 4283, 4284, 4285, 4287, 4288, - 4289, 4290, 4292, 4293, 4294, 4295, 4298, 4299, - 4300, 4301, 4302, 4305, 4308, 4311, 4314, 4317, - 4318, 4319, 4320, 4321, 4323, 4325, 4326, 4327, - 4328, 4331, 4334, 4337, 4340, 4343, 4344, 4345, - 4346, 4348, 4349, 4350, 4351, 4354, 4355, 4356, + 4267, 4268, 4269, 4270, 4271, 4274, 4275, 4276, + 4279, 4280, 4281, 4283, 4284, 4285, 4286, 4288, + 4289, 4290, 4291, 4293, 4294, 4295, 4296, 4299, + 4300, 4301, 4302, 4303, 4306, 4309, 4312, 4315, + 4318, 4319, 4320, 4321, 4322, 4324, 4326, 4327, + 4328, 4329, 4332, 4335, 4338, 4341, 4344, 4345, + 4346, 4347, 4349, 4350, 4351, 4352, 4355, 4356, 4357, 4358, 4359, 4360, 4361, 4362, 4363, 4364, 4365, 4366, 4367, 4368, 4369, 4370, 4371, 4372, 4373, 4374, 4375, 4376, 4377, 4378, 4379, 4380, 4381, 4382, 4383, 4384, 4385, 4386, 4387, 4388, - 4389, 4390, 4392, 4393, 4394, 4396, 4398, 4400, - 4402, 4404, 4405, 4406, 4409, 4412, 4413, 4414, - 4415, 4416, 4417, 4418, 4420, 4422, 4424, 4426, - 4427, 4428, 4429, 4430, 4433, 4434, 4435, 4438, - 4439, 4440, 4443, 4444, 4445, 4448, 4449, 4450, - 4453, 4454, 4455, 4456, 4457, 4458, 4459, 4460, + 4389, 4390, 4391, 4393, 4394, 4395, 4397, 4399, + 4401, 4403, 4405, 4406, 4407, 4410, 4413, 4414, + 4415, 4416, 4417, 4418, 4419, 4421, 4423, 4425, + 4427, 4428, 4429, 4430, 4431, 4434, 4435, 4436, + 4439, 4440, 4441, 4444, 4445, 4446, 4449, 4450, + 4451, 4454, 4455, 4456, 4457, 4458, 4459, 4460, 4461, 4462, 4463, 4464, 4465, 4466, 4467, 4468, 4469, 4470, 4471, 4472, 4473, 4474, 4475, 4476, 4477, 4478, 4479, 4480, 4481, 4482, 4483, 4484, 4485, 4486, 4487, 4488, 4489, 4490, 4491, 4492, - 4493, 4494, 4495, 4496, 4497, 4500, 4501, 4502, - 4505, 4506, 4507, 4508, 4509, 4510, 4511, 4514, - 4517, 4518, 4519, 4520, 4521, 4522, 4523, 4524, + 4493, 4494, 4495, 4496, 4497, 4498, 4501, 4502, + 4503, 4506, 4507, 4508, 4509, 4510, 4511, 4512, + 4515, 4518, 4519, 4520, 4521, 4522, 4523, 4524, 4525, 4526, 4527, 4528, 4529, 4530, 4531, 4532, - 4533, 4534, 4535, 4537, 4538, 4539, 4540, 4541 + 4533, 4534, 4535, 4536, 4538, 4539, 4540, 4541, + 4542 }; /* i386 mnemonics table. */ @@ -50414,6 +50423,7 @@ const char i386_mnemonics[] = "\0""{store}" "\0""{nooptimize}" "\0""{nf}" + "\0""{noimm8s}" "\0""{rex}" "\0""{evex}" "\0""{vex}" |