/* dw2gencfi.c - Support for generating Dwarf2 CFI information.
- Copyright (C) 2003-2016 Free Software Foundation, Inc.
+ Copyright (C) 2003-2017 Free Software Foundation, Inc.
Contributed by Michal Ludvig <mludvig@suse.cz>
This file is part of GAS, the GNU Assembler.
static struct fde_entry *
alloc_fde_entry (void)
{
- struct fde_entry *fde = (struct fde_entry *)
- xcalloc (1, sizeof (struct fde_entry));
+ struct fde_entry *fde = XCNEW (struct fde_entry);
- frchain_now->frch_cfi_data = (struct frch_cfi_data *)
- xcalloc (1, sizeof (struct frch_cfi_data));
+ frchain_now->frch_cfi_data = XCNEW (struct frch_cfi_data);
frchain_now->frch_cfi_data->cur_fde_data = fde;
*last_fde_data = fde;
last_fde_data = &fde->next;
static struct cfi_insn_data *
alloc_cfi_insn_data (void)
{
- struct cfi_insn_data *insn = (struct cfi_insn_data *)
- xcalloc (1, sizeof (struct cfi_insn_data));
+ struct cfi_insn_data *insn = XCNEW (struct cfi_insn_data);
struct fde_entry *cur_fde_data = frchain_now->frch_cfi_data->cur_fde_data;
*cur_fde_data->last = insn;
as_bad (_("register save offset not a multiple of %u"), abs_data_align);
}
+/* Add a DW_CFA_val_offset record to the CFI data. */
+
+void
+cfi_add_CFA_val_offset (unsigned regno, offsetT offset)
+{
+ unsigned int abs_data_align;
+
+ gas_assert (DWARF2_CIE_DATA_ALIGNMENT != 0);
+ cfi_add_CFA_insn_reg_offset (DW_CFA_val_offset, regno, offset);
+
+ abs_data_align = (DWARF2_CIE_DATA_ALIGNMENT < 0
+ ? -DWARF2_CIE_DATA_ALIGNMENT : DWARF2_CIE_DATA_ALIGNMENT);
+ if (offset % abs_data_align)
+ as_bad (_("register save offset not a multiple of %u"), abs_data_align);
+}
+
/* Add a DW_CFA_def_cfa record to the CFI data. */
void
cfi_add_CFA_insn (DW_CFA_remember_state);
- p = (struct cfa_save_data *) xmalloc (sizeof (*p));
+ p = XNEW (struct cfa_save_data);
p->cfa_offset = frchain_now->frch_cfi_data->cur_cfa_offset;
p->next = frchain_now->frch_cfi_data->cfa_save_stack;
frchain_now->frch_cfi_data->cfa_save_stack = p;
{ "cfi_val_encoded_addr", dot_cfi_val_encoded_addr, 0 },
{ "cfi_inline_lsda", dot_cfi_inline_lsda, 0 },
{ "cfi_label", dot_cfi_label, 0 },
+ { "cfi_val_offset", dot_cfi, DW_CFA_val_offset },
{ NULL, NULL, 0 }
};
cfi_add_CFA_offset (reg1, offset);
break;
+ case DW_CFA_val_offset:
+ reg1 = cfi_parse_reg ();
+ cfi_parse_separator ();
+ offset = cfi_parse_const ();
+ cfi_add_CFA_val_offset (reg1, offset);
+ break;
+
case CFI_rel_offset:
reg1 = cfi_parse_reg ();
cfi_parse_separator ();
tail = &head;
do
{
- e = (struct cfi_escape_data *) xmalloc (sizeof (*e));
+ e = XNEW (struct cfi_escape_data);
do_parse_cons_expression (&e->exp, 1);
*tail = e;
tail = &e->next;
case O_constant:
if ((encoding & 0x70) != DW_EH_PE_pcrel)
break;
+ /* Fall through. */
default:
encoding = DW_EH_PE_omit;
break;
}
demand_empty_rest_of_line ();
- if (cfi_sections_set && cfi_sections != sections)
+ if (cfi_sections_set
+ && (sections & (CFI_EMIT_eh_frame | CFI_EMIT_eh_frame_compact))
+ && (cfi_sections & (CFI_EMIT_eh_frame | CFI_EMIT_eh_frame_compact))
+ != (sections & (CFI_EMIT_eh_frame | CFI_EMIT_eh_frame_compact)))
as_bad (_("inconsistent uses of .cfi_sections"));
cfi_sections = sections;
}
num_ops = 0;
do
{
- e = (struct cfi_escape_data *) xmalloc (sizeof (*e));
+ e = XNEW (struct cfi_escape_data);
do_parse_cons_expression (&e->exp, 1);
*tail = e;
tail = &e->next;
num_ops = 3;
last_fde->eh_data_size = num_ops;
- last_fde->eh_data = (bfd_byte *) xmalloc (num_ops);
+ last_fde->eh_data = XNEWVEC (bfd_byte, num_ops);
num_ops = 0;
while (head)
{
}
break;
+ case DW_CFA_val_offset:
+ regno = insn->u.ri.reg;
+ offset = insn->u.ri.offset / DWARF2_CIE_DATA_ALIGNMENT;
+ if (offset < 0)
+ {
+ out_one (DW_CFA_val_offset_sf);
+ out_uleb128 (regno);
+ out_sleb128 (offset);
+ }
+ else
+ {
+ out_one (DW_CFA_val_offset);
+ out_uleb128 (regno);
+ out_uleb128 (offset);
+ }
+ break;
+
case DW_CFA_register:
out_one (DW_CFA_register);
out_uleb128 (insn->u.rr.reg1);
fail:;
}
- cie = (struct cie_entry *) xmalloc (sizeof (struct cie_entry));
+ cie = XNEW (struct cie_entry);
cie->next = cie_root;
cie_root = cie;
SET_CUR_SEG (cie, CUR_SEG (fde));
{ "cfi_val_encoded_addr", dot_cfi_dummy, 0 },
{ "cfi_label", dot_cfi_dummy, 0 },
{ "cfi_inline_lsda", dot_cfi_dummy, 0 },
+ { "cfi_val_offset", dot_cfi_dummy, 0 },
{ NULL, NULL, 0 }
};