aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2017-03-05 23:25:16 +1030
committerAlan Modra <amodra@gmail.com>2017-03-06 20:43:45 +1030
commitea0de82ec2d7f109ba179d8d55130805e680f02d (patch)
tree9b9c946283977b68aff0d27f3053c66eb664ed5e
parent9e1a8675d49a5bbb881f664f8b7a1081432c994d (diff)
downloadgdb-ea0de82ec2d7f109ba179d8d55130805e680f02d.zip
gdb-ea0de82ec2d7f109ba179d8d55130805e680f02d.tar.gz
gdb-ea0de82ec2d7f109ba179d8d55130805e680f02d.tar.bz2
dw2gencfi.c DWARF2_FDE_RELOC_SIZE
Add asserts that reloc size matches encoding size, and tidy. * dw2gencfi.c (encoding_size): Return unsigned int. (emit_expr_encoded): Assert size matches reloc bitsize. (output_fde): Use unsigned for offset_size and addr_size. Set addr_size earlier and use in place of constant 4 and uses of DWARF2_FDE_RELOC_SIZE. Assert it matches reloc bitsize.
-rw-r--r--gas/ChangeLog8
-rw-r--r--gas/dw2gencfi.c26
2 files changed, 22 insertions, 12 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 24871a2..9b1849d 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,13 @@
2017-03-06 Alan Modra <amodra@gmail.com>
+ * dw2gencfi.c (encoding_size): Return unsigned int.
+ (emit_expr_encoded): Assert size matches reloc bitsize.
+ (output_fde): Use unsigned for offset_size and addr_size. Set
+ addr_size earlier and use in place of constant 4 and uses of
+ DWARF2_FDE_RELOC_SIZE. Assert it matches reloc bitsize.
+
+2017-03-06 Alan Modra <amodra@gmail.com>
+
* dw2gencfi.c: Wrap overlong lines. Add parens for emacs
auto reformat. Formatting and whitespace fixes.
diff --git a/gas/dw2gencfi.c b/gas/dw2gencfi.c
index b90b48f..359e732 100644
--- a/gas/dw2gencfi.c
+++ b/gas/dw2gencfi.c
@@ -157,7 +157,7 @@ out_sleb128 (offsetT value)
output_leb128 (frag_more (sizeof_leb128 (value, 1)), value, 1);
}
-static offsetT
+static unsigned int
encoding_size (unsigned char encoding)
{
if (encoding == DW_EH_PE_omit)
@@ -183,7 +183,7 @@ encoding_size (unsigned char encoding)
static void
emit_expr_encoded (expressionS *exp, int encoding, bfd_boolean emit_encoding)
{
- offsetT size = encoding_size (encoding);
+ unsigned int size = encoding_size (encoding);
bfd_reloc_code_real_type code;
if (encoding == DW_EH_PE_omit)
@@ -197,6 +197,7 @@ emit_expr_encoded (expressionS *exp, int encoding, bfd_boolean emit_encoding)
{
reloc_howto_type *howto = bfd_reloc_type_lookup (stdoutput, code);
char *p = frag_more (size);
+ gas_assert (size == howto->bitsize / 8);
md_number_to_chars (p, 0, size);
fix_new (frag_now, p - frag_now->fr_literal, size, exp->X_add_symbol,
exp->X_add_number, howto->pc_relative, code);
@@ -1934,8 +1935,8 @@ output_fde (struct fde_entry *fde, struct cie_entry *cie,
expressionS exp;
offsetT augmentation_size;
enum dwarf2_format fmt = DWARF2_FORMAT (now_seg);
- int offset_size;
- int addr_size;
+ unsigned int offset_size;
+ unsigned int addr_size;
after_size_address = symbol_temp_make ();
end_address = symbol_temp_make ();
@@ -1973,13 +1974,15 @@ output_fde (struct fde_entry *fde, struct cie_entry *cie,
{
bfd_reloc_code_real_type code
= tc_cfi_reloc_for_encoding (cie->fde_encoding);
+ addr_size = DWARF2_FDE_RELOC_SIZE;
if (code != BFD_RELOC_NONE)
{
reloc_howto_type *howto = bfd_reloc_type_lookup (stdoutput, code);
- char *p = frag_more (4);
- md_number_to_chars (p, 0, 4);
- fix_new (frag_now, p - frag_now->fr_literal, 4, fde->start_address,
- 0, howto->pc_relative, code);
+ char *p = frag_more (addr_size);
+ gas_assert (addr_size == howto->bitsize / 8);
+ md_number_to_chars (p, 0, addr_size);
+ fix_new (frag_now, p - frag_now->fr_literal, addr_size,
+ fde->start_address, 0, howto->pc_relative, code);
}
else
{
@@ -1988,19 +1991,18 @@ output_fde (struct fde_entry *fde, struct cie_entry *cie,
#if CFI_DIFF_EXPR_OK
exp.X_add_symbol = fde->start_address;
exp.X_op_symbol = symbol_temp_new_now ();
- emit_expr (&exp, DWARF2_FDE_RELOC_SIZE); /* Code offset. */
+ emit_expr (&exp, addr_size); /* Code offset. */
#else
exp.X_op = O_symbol;
exp.X_add_symbol = fde->start_address;
#if defined(tc_cfi_emit_pcrel_expr)
- tc_cfi_emit_pcrel_expr (&exp, DWARF2_FDE_RELOC_SIZE); /* Code offset. */
+ tc_cfi_emit_pcrel_expr (&exp, addr_size); /* Code offset. */
#else
- emit_expr (&exp, DWARF2_FDE_RELOC_SIZE); /* Code offset. */
+ emit_expr (&exp, addr_size); /* Code offset. */
#endif
#endif
}
- addr_size = DWARF2_FDE_RELOC_SIZE;
}
else
{