# endif
#endif
+#ifndef EH_FRAME_ALIGNMENT
+# ifdef BFD_ASSEMBLER
+# define EH_FRAME_ALIGNMENT (bfd_get_arch_size (stdoutput) == 64 ? 3 : 2)
+# else
+# define EH_FRAME_ALIGNMENT 2
+# endif
+#endif
+
#ifndef tc_cfi_frame_initial_instructions
# define tc_cfi_frame_initial_instructions() ((void)0)
#endif
symbolS *lab1;
symbolS *lab2;
} ll;
+
+ struct cfi_escape_data {
+ struct cfi_escape_data *next;
+ expressionS exp;
+ } *esc;
} u;
};
/* List of CIEs so that they could be reused. */
static struct cie_entry *cie_root;
+/* Stack of old CFI data, for save/restore. */
+struct cfa_save_data
+{
+ struct cfa_save_data *next;
+ offsetT cfa_offset;
+};
+
+static struct cfa_save_data *cfa_save_stack;
\f
/* Construct a new FDE structure and add it to the end of the fde list. */
cur_fde_data->return_column = regno;
}
+/* Universal functions to store new instructions. */
+
+static void
+cfi_add_CFA_insn(int insn)
+{
+ struct cfi_insn_data *insn_ptr = alloc_cfi_insn_data ();
+
+ insn_ptr->insn = insn;
+}
+
+static void
+cfi_add_CFA_insn_reg (int insn, unsigned regno)
+{
+ struct cfi_insn_data *insn_ptr = alloc_cfi_insn_data ();
+
+ insn_ptr->insn = insn;
+ insn_ptr->u.r = regno;
+}
+
+static void
+cfi_add_CFA_insn_offset (int insn, offsetT offset)
+{
+ struct cfi_insn_data *insn_ptr = alloc_cfi_insn_data ();
+
+ insn_ptr->insn = insn;
+ insn_ptr->u.i = offset;
+}
+
+static void
+cfi_add_CFA_insn_reg_reg (int insn, unsigned reg1, unsigned reg2)
+{
+ struct cfi_insn_data *insn_ptr = alloc_cfi_insn_data ();
+
+ insn_ptr->insn = insn;
+ insn_ptr->u.rr.reg1 = reg1;
+ insn_ptr->u.rr.reg2 = reg2;
+}
+
+static void
+cfi_add_CFA_insn_reg_offset (int insn, unsigned regno, offsetT offset)
+{
+ struct cfi_insn_data *insn_ptr = alloc_cfi_insn_data ();
+
+ insn_ptr->insn = insn;
+ insn_ptr->u.ri.reg = regno;
+ insn_ptr->u.ri.offset = offset;
+}
+
/* Add a CFI insn to advance the PC from the last address to LABEL. */
void
void
cfi_add_CFA_offset (unsigned regno, offsetT offset)
{
- struct cfi_insn_data *insn = alloc_cfi_insn_data ();
-
- insn->insn = DW_CFA_offset;
- insn->u.ri.reg = regno;
- insn->u.ri.offset = offset;
+ unsigned int abs_data_align;
+
+ cfi_add_CFA_insn_reg_offset (DW_CFA_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_def_cfa (unsigned regno, offsetT offset)
{
- struct cfi_insn_data *insn = alloc_cfi_insn_data ();
-
- insn->insn = DW_CFA_def_cfa;
- insn->u.ri.reg = regno;
- insn->u.ri.offset = offset;
-
+ cfi_add_CFA_insn_reg_offset (DW_CFA_def_cfa, regno, offset);
cur_cfa_offset = offset;
}
void
cfi_add_CFA_register (unsigned reg1, unsigned reg2)
{
- struct cfi_insn_data *insn = alloc_cfi_insn_data ();
-
- insn->insn = DW_CFA_register;
- insn->u.rr.reg1 = reg1;
- insn->u.rr.reg2 = reg2;
+ cfi_add_CFA_insn_reg_reg (DW_CFA_register, reg1, reg2);
}
/* Add a DW_CFA_def_cfa_register record to the CFI data. */
void
cfi_add_CFA_def_cfa_register (unsigned regno)
{
- struct cfi_insn_data *insn = alloc_cfi_insn_data ();
-
- insn->insn = DW_CFA_def_cfa_register;
- insn->u.r = regno;
+ cfi_add_CFA_insn_reg (DW_CFA_def_cfa_register, regno);
}
/* Add a DW_CFA_def_cfa_offset record to the CFI data. */
void
cfi_add_CFA_def_cfa_offset (offsetT offset)
{
- struct cfi_insn_data *insn = alloc_cfi_insn_data ();
-
- insn->insn = DW_CFA_def_cfa_offset;
- insn->u.i = offset;
-
+ cfi_add_CFA_insn_offset (DW_CFA_def_cfa_offset, offset);
cur_cfa_offset = offset;
}
+void
+cfi_add_CFA_restore (unsigned regno)
+{
+ cfi_add_CFA_insn_reg (DW_CFA_restore, regno);
+}
+
+void
+cfi_add_CFA_undefined (unsigned regno)
+{
+ cfi_add_CFA_insn_reg (DW_CFA_undefined, regno);
+}
+
+void
+cfi_add_CFA_same_value (unsigned regno)
+{
+ cfi_add_CFA_insn_reg (DW_CFA_same_value, regno);
+}
+
+void
+cfi_add_CFA_remember_state (void)
+{
+ struct cfa_save_data *p;
+
+ cfi_add_CFA_insn (DW_CFA_remember_state);
+
+ p = xmalloc (sizeof (*p));
+ p->cfa_offset = cur_cfa_offset;
+ p->next = cfa_save_stack;
+ cfa_save_stack = p;
+}
+
+void
+cfi_add_CFA_restore_state (void)
+{
+ struct cfa_save_data *p;
+
+ cfi_add_CFA_insn (DW_CFA_restore_state);
+
+ p = cfa_save_stack;
+ if (p)
+ {
+ cur_cfa_offset = p->cfa_offset;
+ cfa_save_stack = p->next;
+ free (p);
+ }
+}
+
\f
/* Parse CFI assembler directives. */
static void dot_cfi (int);
+static void dot_cfi_escape (int);
static void dot_cfi_startproc (int);
static void dot_cfi_endproc (int);
/* Fake CFI type; outside the byte range of any real CFI insn. */
-#define CFI_adjust_cfa_offset 0x100
+#define CFI_adjust_cfa_offset 0x100
+#define CFI_return_column 0x101
+#define CFI_rel_offset 0x102
+#define CFI_escape 0x103
const pseudo_typeS cfi_pseudo_table[] =
{
{ "cfi_def_cfa_offset", dot_cfi, DW_CFA_def_cfa_offset },
{ "cfi_adjust_cfa_offset", dot_cfi, CFI_adjust_cfa_offset },
{ "cfi_offset", dot_cfi, DW_CFA_offset },
+ { "cfi_rel_offset", dot_cfi, CFI_rel_offset },
{ "cfi_register", dot_cfi, DW_CFA_register },
+ { "cfi_return_column", dot_cfi, CFI_return_column },
+ { "cfi_restore", dot_cfi, DW_CFA_restore },
+ { "cfi_undefined", dot_cfi, DW_CFA_undefined },
+ { "cfi_same_value", dot_cfi, DW_CFA_same_value },
+ { "cfi_remember_state", dot_cfi, DW_CFA_remember_state },
+ { "cfi_restore_state", dot_cfi, DW_CFA_restore_state },
+ { "cfi_window_save", dot_cfi, DW_CFA_GNU_window_save },
+ { "cfi_escape", dot_cfi_escape, 0 },
{ NULL, NULL, 0 }
};
switch (arg)
{
- /* Instructions that take two arguments (register, integer). */
case DW_CFA_offset:
- case DW_CFA_def_cfa:
reg1 = cfi_parse_reg ();
cfi_parse_separator ();
offset = cfi_parse_const ();
+ cfi_add_CFA_offset (reg1, offset);
+ break;
- if (arg == DW_CFA_def_cfa)
- cfi_add_CFA_def_cfa (reg1, offset);
- else
- cfi_add_CFA_offset (reg1, offset);
+ case CFI_rel_offset:
+ reg1 = cfi_parse_reg ();
+ cfi_parse_separator ();
+ offset = cfi_parse_const ();
+ cfi_add_CFA_offset (reg1, offset - cur_cfa_offset);
+ break;
+
+ case DW_CFA_def_cfa:
+ reg1 = cfi_parse_reg ();
+ cfi_parse_separator ();
+ offset = cfi_parse_const ();
+ cfi_add_CFA_def_cfa (reg1, offset);
break;
- /* Instructions that take two arguments (register, register). */
case DW_CFA_register:
reg1 = cfi_parse_reg ();
cfi_parse_separator ();
reg2 = cfi_parse_reg ();
-
cfi_add_CFA_register (reg1, reg2);
break;
- /* Instructions that take one register argument. */
case DW_CFA_def_cfa_register:
reg1 = cfi_parse_reg ();
cfi_add_CFA_def_cfa_register (reg1);
break;
- /* Instructions that take one integer argument. */
case DW_CFA_def_cfa_offset:
offset = cfi_parse_const ();
cfi_add_CFA_def_cfa_offset (offset);
break;
- /* Special handling for pseudo-instruction. */
case CFI_adjust_cfa_offset:
offset = cfi_parse_const ();
cfi_add_CFA_def_cfa_offset (cur_cfa_offset + offset);
break;
+ case DW_CFA_restore:
+ reg1 = cfi_parse_reg ();
+ cfi_add_CFA_restore (reg1);
+ break;
+
+ case DW_CFA_undefined:
+ reg1 = cfi_parse_reg ();
+ cfi_add_CFA_undefined (reg1);
+ break;
+
+ case DW_CFA_same_value:
+ reg1 = cfi_parse_reg ();
+ cfi_add_CFA_same_value (reg1);
+ break;
+
+ case CFI_return_column:
+ reg1 = cfi_parse_reg ();
+ cfi_set_return_column (reg1);
+ break;
+
+ case DW_CFA_remember_state:
+ cfi_add_CFA_remember_state ();
+ break;
+
+ case DW_CFA_restore_state:
+ cfi_add_CFA_restore_state ();
+ break;
+
+ case DW_CFA_GNU_window_save:
+ cfi_add_CFA_insn (DW_CFA_GNU_window_save);
+ break;
+
default:
abort ();
}
demand_empty_rest_of_line ();
}
+static void
+dot_cfi_escape (int ignored ATTRIBUTE_UNUSED)
+{
+ struct cfi_escape_data *head, **tail, *e;
+ struct cfi_insn_data *insn;
+
+ if (!cur_fde_data)
+ {
+ as_bad (_("CFI instruction used without previous .cfi_startproc"));
+ return;
+ }
+
+ /* If the last address was not at the current PC, advance to current. */
+ if (symbol_get_frag (last_address) != frag_now
+ || S_GET_VALUE (last_address) != frag_now_fix ())
+ cfi_add_advance_loc (symbol_temp_new_now ());
+
+ tail = &head;
+ do
+ {
+ e = xmalloc (sizeof (*e));
+ do_parse_cons_expression (&e->exp, 1);
+ *tail = e;
+ tail = &e->next;
+ }
+ while (*input_line_pointer++ == ',');
+ *tail = NULL;
+
+ insn = alloc_cfi_insn_data ();
+ insn->insn = CFI_escape;
+ insn->u.esc = head;
+}
+
static void
dot_cfi_startproc (int ignored ATTRIBUTE_UNUSED)
{
break;
case DW_CFA_def_cfa_register:
- out_one (DW_CFA_def_cfa_register);
- out_uleb128 (insn->u.i);
+ case DW_CFA_undefined:
+ case DW_CFA_same_value:
+ out_one (insn->insn);
+ out_uleb128 (insn->u.r);
break;
case DW_CFA_def_cfa_offset:
}
break;
+ case DW_CFA_restore:
+ regno = insn->u.r;
+ if (regno <= 0x3F)
+ {
+ out_one (DW_CFA_restore + regno);
+ }
+ else
+ {
+ out_one (DW_CFA_restore_extended);
+ out_uleb128 (regno);
+ }
+ break;
+
case DW_CFA_offset:
regno = insn->u.ri.reg;
offset = insn->u.ri.offset / DWARF2_CIE_DATA_ALIGNMENT;
if (offset < 0)
{
- out_one (DW_CFA_offset_extended);
+ out_one (DW_CFA_offset_extended_sf);
out_uleb128 (regno);
out_sleb128 (offset);
}
out_uleb128 (insn->u.rr.reg2);
break;
- case DW_CFA_nop:
- out_one (DW_CFA_nop);
+ case DW_CFA_remember_state:
+ case DW_CFA_restore_state:
+ out_one (insn->insn);
break;
+ case DW_CFA_GNU_window_save:
+ out_one (DW_CFA_GNU_window_save);
+ break;
+
+ case CFI_escape:
+ {
+ struct cfi_escape_data *e;
+ for (e = insn->u.esc; e ; e = e->next)
+ emit_expr (&e->exp, 1);
+ break;
+ }
+
default:
abort ();
}
out_one (0);
out_uleb128 (DWARF2_LINE_MIN_INSN_LENGTH); /* Code alignment */
out_sleb128 (DWARF2_CIE_DATA_ALIGNMENT); /* Data alignment */
- out_one (cie->return_column); /* Return column */
+ if (DW_CIE_VERSION == 1) /* Return column. */
+ out_one (cie->return_column);
+ else
+ out_uleb128 (cie->return_column);
out_uleb128 (1); /* Augmentation size */
+#if defined DIFF_EXPR_OK || defined tc_cfi_emit_pcrel_expr
out_one (DW_EH_PE_pcrel | DW_EH_PE_sdata4);
+#else
+ out_one (DW_EH_PE_sdata4);
+#endif
if (cie->first)
for (i = cie->first; i != cie->last; i = i->next)
static void
output_fde (struct fde_entry *fde, struct cie_entry *cie,
- struct cfi_insn_data *first)
+ struct cfi_insn_data *first, int align)
{
symbolS *after_size_address, *end_address;
expressionS exp;
exp.X_add_symbol = after_size_address;
exp.X_op_symbol = cie->start_address;
emit_expr (&exp, 4); /* CIE offset */
-
+
+#ifdef DIFF_EXPR_OK
exp.X_add_symbol = fde->start_address;
exp.X_op_symbol = symbol_temp_new_now ();
emit_expr (&exp, 4); /* Code offset */
+#else
+ exp.X_op = O_symbol;
+ exp.X_add_symbol = fde->start_address;
+ exp.X_op_symbol = NULL;
+#ifdef tc_cfi_emit_pcrel_expr
+ tc_cfi_emit_pcrel_expr (&exp, 4); /* Code offset */
+#else
+ emit_expr (&exp, 4); /* Code offset */
+#endif
+ exp.X_op = O_subtract;
+#endif
exp.X_add_symbol = fde->end_address;
exp.X_op_symbol = fde->start_address; /* Code length */
for (; first; first = first->next)
output_cfi_insn (first);
- frag_align (2, 0, 0);
+ frag_align (align, 0, 0);
symbol_set_value_now (end_address);
}
break;
case DW_CFA_def_cfa_register:
+ case DW_CFA_restore:
+ case DW_CFA_undefined:
+ case DW_CFA_same_value:
if (i->u.r != j->u.r)
goto fail;
break;
goto fail;
break;
+ case CFI_escape:
+ /* Don't bother matching these for now. */
+ goto fail;
+
default:
abort ();
}
}
/* Success if we reached the end of the CIE list, and we've either
- run out of FDE entries or we've encountered an advance. */
- if (i == cie->last && (!j || j->insn == DW_CFA_advance_loc))
+ run out of FDE entries or we've encountered an advance or
+ escape. */
+ if (i == cie->last
+ && (!j
+ || j->insn == DW_CFA_advance_loc
+ || j->insn == CFI_escape))
{
*pfirst = j;
return cie;
cie->first = fde->data;
for (i = cie->first; i ; i = i->next)
- if (i->insn == DW_CFA_advance_loc)
+ if (i->insn == DW_CFA_advance_loc
+ || i->insn == CFI_escape)
break;
cie->last = i;
{
segT cfi_seg;
struct fde_entry *fde;
+ int save_flag_traditional_format;
if (cur_fde_data)
{
cfi_seg = subseg_new (".eh_frame", 0);
#ifdef BFD_ASSEMBLER
bfd_set_section_flags (stdoutput, cfi_seg,
- SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_DATA);
+ SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_READONLY);
#endif
subseg_set (cfi_seg, 0);
- record_alignment (cfi_seg, 2);
+ record_alignment (cfi_seg, EH_FRAME_ALIGNMENT);
+
+ /* Make sure check_eh_frame doesn't do anything with our output. */
+ save_flag_traditional_format = flag_traditional_format;
+ flag_traditional_format = 1;
for (fde = all_fde_data; fde ; fde = fde->next)
{
struct cie_entry *cie;
cie = select_cie_for_fde (fde, &first);
- output_fde (fde, cie, first);
+ output_fde (fde, cie, first, fde->next == NULL ? EH_FRAME_ALIGNMENT : 2);
}
+
+ flag_traditional_format = save_flag_traditional_format;
}
projects / deliverable / binutils-gdb.git / blobdiff