espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-27 22:48:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

bundle_lock message tidy

Browse Source 
I'd edited these thinking that there might be cases where the counts
were one, but on further investigation it appears not.  What's left
here are some minor tweaks.

	* read.c (assemble_one, s_bundle_unlock): Formatting.
	Consistently add comma and "bytes" to error message.
	* testsuite/gas/i386/bundle-bad.l: Adjust to suit.
This commit is contained in:
Alan Modra
2017-11-07 16:32:07 +10:30
parent d3a49aa80b
commit e54e9ac577
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gas/ChangeLog
View File

@ -1,3 +1,9 @@
2017-11-07 Alan Modra <amodra@gmail.com>
* read.c (assemble_one, s_bundle_unlock): Formatting.
Consistently add comma and "bytes" to error message.
* testsuite/gas/i386/bundle-bad.l: Adjust to suit.
2017-11-07 Alan Modra <amodra@gmail.com> 2017-11-07 Alan Modra <amodra@gmail.com>
* testsuite/gas/arm/got_prel.d, * testsuite/gas/arm/got_prel.d,

21
gas/read.c
View File

@ -713,19 +713,19 @@ assemble_one (char *line)
/* Make sure this hasn't pushed the locked sequence /* Make sure this hasn't pushed the locked sequence
past the bundle size. */ past the bundle size. */
unsigned int bundle_size = pending_bundle_size (bundle_lock_frag); unsigned int bundle_size = pending_bundle_size (bundle_lock_frag);
if (bundle_size > (1U << bundle_align_p2)) if (bundle_size > 1U << bundle_align_p2)
as_bad (_("\ as_bad (_ (".bundle_lock sequence at %u bytes, "
.bundle_lock sequence at %u bytes but .bundle_align_mode limit is %u bytes"), "but .bundle_align_mode limit is %u bytes"),
bundle_size, 1U << bundle_align_p2); bundle_size, 1U << bundle_align_p2);
} }
else if (bundle_align_p2 > 0) else if (bundle_align_p2 > 0)
{ {
unsigned int insn_size = pending_bundle_size (insn_start_frag); unsigned int insn_size = pending_bundle_size (insn_start_frag);
if (insn_size > (1U << bundle_align_p2)) if (insn_size > 1U << bundle_align_p2)
as_bad (_("\ as_bad (_("single instruction is %u bytes long, "
single instruction is %u bytes long but .bundle_align_mode limit is %u"), "but .bundle_align_mode limit is %u bytes"),
(unsigned int) insn_size, 1U << bundle_align_p2); insn_size, 1U << bundle_align_p2);
finish_bundle (insn_start_frag, insn_size); finish_bundle (insn_start_frag, insn_size);
} }
@ -6244,9 +6244,10 @@ s_bundle_unlock (int arg ATTRIBUTE_UNUSED)
size = pending_bundle_size (bundle_lock_frag); size = pending_bundle_size (bundle_lock_frag);
if (size > (1U << bundle_align_p2)) if (size > 1U << bundle_align_p2)
as_bad (_(".bundle_lock sequence is %u bytes, but bundle size only %u"), as_bad (_(".bundle_lock sequence is %u bytes, "
size, 1 << bundle_align_p2); "but bundle size is only %u bytes"),
size, 1u << bundle_align_p2);
else else
finish_bundle (bundle_lock_frag, size); finish_bundle (bundle_lock_frag, size);

6
gas/testsuite/gas/i386/bundle-bad.l
View File

@ -1,9 +1,9 @@
[^:]*: Assembler messages: [^:]*: Assembler messages:
[^:]*:4:.*\.bundle_lock is meaningless without \.bundle_align_mode [^:]*:4:.*\.bundle_lock is meaningless without \.bundle_align_mode
[^:]*:6:.*\.bundle_unlock without preceding \.bundle_lock [^:]*:6:.*\.bundle_unlock without preceding \.bundle_lock
[^:]*:11:.*single instruction is [0-9]+ bytes long but \.bundle_align_mode limit is [0-9]+ [^:]*:11:.*single instruction is [0-9]+ bytes long, but \.bundle_align_mode limit is [0-9]+ bytes
[^:]*:18:.*\.bundle_lock sequence at [0-9]+ bytes but \.bundle_align_mode limit is [0-9]+ bytes [^:]*:18:.*\.bundle_lock sequence at [0-9]+ bytes, but \.bundle_align_mode limit is [0-9]+ bytes
[^:]*:19:.*\.bundle_lock sequence is [0-9]+ bytes, but bundle size only [0-9]+ [^:]*:19:.*\.bundle_lock sequence is [0-9]+ bytes, but bundle size is only [0-9]+ bytes
[^:]*:26:.*cannot change section or subsection inside \.bundle_lock [^:]*:26:.*cannot change section or subsection inside \.bundle_lock
[^:]*:31:.*cannot change \.bundle_align_mode inside \.bundle_lock [^:]*:31:.*cannot change \.bundle_align_mode inside \.bundle_lock
[^:]*:36:.*\.bundle_unlock without preceding \.bundle_lock [^:]*:36:.*\.bundle_unlock without preceding \.bundle_lock