const char *temp_prefix;
gboolean emit_line, appending, collect_line_info;
GSList *line_info;
+ int cur_file_index;
};
static void
w->class_to_vtype_die = g_hash_table_new (NULL, NULL);
w->class_to_pointer_die = g_hash_table_new (NULL, NULL);
w->class_to_reference_die = g_hash_table_new (NULL, NULL);
+ w->cur_file_index = -1;
return w;
}
static int subprogram_attr [] = {
DW_AT_name , DW_FORM_string,
+#ifndef TARGET_IOS
DW_AT_description , DW_FORM_string,
+#endif
DW_AT_low_pc , DW_FORM_addr,
DW_AT_high_pc , DW_FORM_addr,
DW_AT_frame_base , DW_FORM_block1
static int tramp_subprogram_attr [] = {
DW_AT_name , DW_FORM_string,
+#ifndef TARGET_IOS
DW_AT_description , DW_FORM_string,
+#endif
DW_AT_low_pc , DW_FORM_addr,
DW_AT_high_pc , DW_FORM_addr,
};
int i;
GHashTable *dir_to_index, *index_to_dir;
GSList *l;
+ GSList *info_list;
g_assert (w->collect_line_info);
add_line_number_file_name (w, "<unknown>", 0, 0);
/* Collect files */
- // FIXME: Revert list
- for (l = w->line_info; l; l = l->next) {
+ info_list = g_slist_reverse (w->line_info);
+ for (l = info_list; l; l = l->next) {
MethodLineNumberInfo *info = l->data;
MonoDebugMethodInfo *minfo;
char *source_file;
emit_label (w, ".Ldebug_line_header_end");
/* Emit line number table */
- for (l = w->line_info; l; l = l->next) {
+ for (l = info_list; l; l = l->next) {
MethodLineNumberInfo *info = l->data;
emit_line_number_info (w, info->method, info->start_symbol, info->end_symbol, info->code, info->code_size, info->debug_info);
}
+ g_slist_free (info_list);
emit_byte (w, 0);
emit_byte (w, 1);
if (opcode != 0) {
emit_byte (w, opcode);
} else {
+ //printf ("large: %d %d %d\n", line_diff, addr_diff, max_special_addr_diff);
emit_byte (w, DW_LNS_advance_line);
emit_sleb128 (w, line_diff);
emit_byte (w, DW_LNS_advance_pc);
MonoDebugMethodInfo *minfo;
MonoDebugLineNumberEntry *ln_array;
int *native_to_il_offset = NULL;
-
+
if (!w->emit_line) {
mono_metadata_free_mh (header);
return;
prev_il_offset = -1;
for (i = 0; i < code_size; ++i) {
+ int line_diff, addr_diff;
+
if (!minfo)
continue;
prev_il_offset = il_offset;
loc = mono_debug_symfile_lookup_location (minfo, il_offset);
- if (loc && loc->source_file) {
- int line_diff = (gint32)loc->row - (gint32)prev_line;
- int addr_diff = i - prev_native_offset;
-
- if (first) {
- emit_section_change (w, ".debug_line", LINE_SUBSECTION_DATA);
-
- emit_byte (w, 0);
- emit_byte (w, sizeof (gpointer) + 1);
- emit_byte (w, DW_LNE_set_address);
- if (start_symbol)
- emit_pointer_unaligned (w, start_symbol);
- else
- emit_pointer_value (w, code);
+ if (!(loc && loc->source_file))
+ continue;
- /*
- * The prolog+initlocals region does not have a line number, this
- * makes them belong to the first line of the method.
- */
- emit_byte (w, DW_LNS_advance_line);
- emit_sleb128 (w, (gint32)loc->row - (gint32)prev_line);
- prev_line = loc->row;
- }
+ line_diff = (gint32)loc->row - (gint32)prev_line;
+ addr_diff = i - prev_native_offset;
+
+ if (first) {
+ emit_section_change (w, ".debug_line", LINE_SUBSECTION_DATA);
- if (loc->row != prev_line) {
- if (!prev_file_name || strcmp (loc->source_file, prev_file_name) != 0) {
- /* Add an entry to the file table */
- /* FIXME: Avoid duplicates */
- if (w->collect_line_info)
- file_index = get_line_number_file_name (w, loc->source_file) + 1;
- else
- file_index = emit_line_number_file_name (w, loc->source_file, 0, 0);
- g_free (prev_file_name);
- prev_file_name = g_strdup (loc->source_file);
+ emit_byte (w, 0);
+ emit_byte (w, sizeof (gpointer) + 1);
+ emit_byte (w, DW_LNE_set_address);
+ if (start_symbol)
+ emit_pointer_unaligned (w, start_symbol);
+ else
+ emit_pointer_value (w, code);
+
+ /*
+ * The prolog+initlocals region does not have a line number, this
+ * makes them belong to the first line of the method.
+ */
+ emit_byte (w, DW_LNS_advance_line);
+ //printf ("FIRST: %d %d %d\n", prev_line, loc->row, il_offset);
+ emit_sleb128 (w, (gint32)loc->row - (gint32)prev_line);
+ prev_line = loc->row;
+ first = FALSE;
+ }
+ if (loc->row != prev_line) {
+ if (!prev_file_name || strcmp (loc->source_file, prev_file_name) != 0) {
+ /* Add an entry to the file table */
+ /* FIXME: Avoid duplicates */
+ if (w->collect_line_info)
+ file_index = get_line_number_file_name (w, loc->source_file) + 1;
+ else
+ file_index = emit_line_number_file_name (w, loc->source_file, 0, 0);
+ g_free (prev_file_name);
+ prev_file_name = g_strdup (loc->source_file);
+
+ if (w->cur_file_index != file_index) {
emit_byte (w, DW_LNS_set_file);
emit_uleb128 (w, file_index);
emit_byte (w, DW_LNS_copy);
- }
- //printf ("X: %p(+0x%x) %d %s:%d(+%d)\n", code + i, addr_diff, loc->il_offset, loc->source_file, loc->row, line_diff);
-
- emit_advance_op (w, line_diff, addr_diff);
-
- prev_line = loc->row;
- prev_native_offset = i;
+ w->cur_file_index = file_index;
+ }
}
+ //printf ("X: %p(+0x%x) %d %s:%d(+%d)\n", code + i, addr_diff, loc->il_offset, loc->source_file, loc->row, line_diff);
+ emit_advance_op (w, line_diff, addr_diff);
- first = FALSE;
-
- mono_debug_symfile_free_location (loc);
+ prev_line = loc->row;
+ prev_native_offset = i;
}
+
+ mono_debug_symfile_free_location (loc);
}
g_free (native_to_il_offset);
emit_uleb128 (w, ABBREV_SUBPROGRAM);
name = mono_method_full_name (method, FALSE);
emit_string (w, name);
+#ifndef TARGET_IOS
emit_string (w, name);
+#endif
g_free (name);
if (start_symbol) {
emit_pointer_unaligned (w, start_symbol);
projects / mono.git / blobdiff