Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

rs_fill_nop and md_generate_nops

Browse Source 
Make rs_fill_nop behave like rs_fill in using a repeat count
(fr_offset) to emit fr_var length repeated nop patterns.  Besides
being more elegant, this reduces memory required for large .nops
directives.

	* as.h (rs_fill_nop): Update comment.
	* config/tc-i386.c (i386_generate_nops): Handle rs_fill_nop as
	for rs_align_code.
	* config/tc-i386.h (MAX_MEM_FOR_RS_SPACE_NOP): Define.
	* listing.c (calc_hex): Handle rs_fill_nop as for rs_fill.
	* read.c (MAX_MEM_FOR_RS_SPACE_NOP): Define.
	(s_nops): Use MAX_MEM_FOR_RS_SPACE_NOP setting up frag.
	* write.c (write_contents): Call md_generate_nops for rs_fill_nop
	before the fr_fix part is written, so that rs_fill_nop can be
	handled as for rs_fill.
This commit is contained in:
Alan Modra
2025-05-19 16:07:20 +09:30
parent 0c951ab895
commit 689f3edfb8
6 changed files with 25 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
gas/write.c
View File

@@ -1653,6 +1653,19 @@ write_contents (bfd *abfd ATTRIBUTE_UNUSED,
offsetT count;
gas_assert (f->fr_type == rs_fill || f->fr_type == rs_fill_nop);
count = f->fr_offset;
fill_literal = f->fr_literal + f->fr_fix;
if (f->fr_type == rs_fill_nop && count > 0)
{
md_generate_nops (f, fill_literal, count, *fill_literal);
/* md_generate_nops updates fr_fix and fr_var. */
f->fr_offset = (f->fr_next->fr_address - f->fr_address
- f->fr_fix) / f->fr_var;
count = f->fr_offset;
fill_literal = f->fr_literal + f->fr_fix;
}
if (f->fr_fix)
{
x = bfd_set_section_contents (stdoutput, sec,
@@ -1671,39 +1684,6 @@ write_contents (bfd *abfd ATTRIBUTE_UNUSED,
}
fill_size = f->fr_var;
count = f->fr_offset;
fill_literal = f->fr_literal + f->fr_fix;
if (f->fr_type == rs_fill_nop)
{
gas_assert (count >= 0 && fill_size == 1);
if (count > 0)
{
char *buf = xmalloc (count);
md_generate_nops (f, buf, count, *fill_literal);
x = bfd_set_section_contents
(stdoutput, sec, buf, (file_ptr) offset,
(bfd_size_type) count);
if (!x)
as_fatal (ngettext ("can't fill %ld byte "
"in section %s of %s: '%s'",
"can't fill %ld bytes "
"in section %s of %s: '%s'",
(long) count),
(long) count,
bfd_section_name (sec),
bfd_get_filename (stdoutput),
bfd_errmsg (bfd_get_error ()));
offset += count;
#ifndef NO_LISTING
if (listing & LISTING_LISTING)
f->fr_opcode = buf;
else
#endif
free (buf);
}
continue;
}
gas_assert (count >= 0);
if (fill_size && count)