Changeset 265

Timestamp:

11/22/09 19:52:11 (15 years ago)

Author:

walter

Message:

bugzilla 3540

Files:

• branches/dmd-1.x/src/backend/dwarf.c (modified) (2 diffs)
• trunk/src/backend/dwarf.c (modified) (2 diffs)

branches/dmd-1.x/src/backend/dwarf.c

@@ -619 +619 @@
-        ;
-    }
-    }
-    linebuf->writeByte(0);      // end of file_names
-
-    debugline.prologue_length = linebuf->size() - 10;
-
-    for (unsigned seg = 1; seg <= seg_count; seg++)
-    {
-    seg_data *sd = SegData[seg];
-    unsigned addressmax = 0;
-    unsigned linestart = ~0;
-
-    if (!sd->SDlinnum_count)
-        continue;
-#if ELFOBJ
-    if (!sd->SDsym) // gdb ignores line number data without a DW_AT_name
-        continue;
-#endif
-
-    // Set address to start of segment with DW_LNE_set_address
-    linebuf->writeByte(0);
-    linebuf->writeByte(5);
-    linebuf->writeByte(2);
-    dwarf_addrel(lineseg,linebuf->size(),seg);
-    linebuf->write32(0);
-
-    //printf("sd = %x, SDlinnum_count = %d\n", sd, sd->SDlinnum_count);
-    for (int i = 0; i < sd->SDlinnum_count; i++)
-    {   linnum_data *ld = &sd->SDlinnum_data[i];
+
+        // Set address to start of segment with DW_LNE_set_address
+        linebuf->writeByte(0);
+        linebuf->writeByte(5);
+        linebuf->writeByte(2);
+        dwarf_addrel(lineseg,linebuf->size(),seg);
+        linebuf->write32(0);
-
-        // Dwarf2 6.2.2 State machine registers
-        unsigned address = 0;   // instruction address
-        unsigned file = ld->filenumber;
-        unsigned line = 1;      // line numbers beginning with 1
-        unsigned column = 0;    // column number, leftmost column is 1
-        int is_stmt = debugline.default_is_stmt;    // TRUE if beginning of a statement
-        int basic_block = FALSE;  // TRUE if start of basic block
-        int end_sequence = FALSE; // TRUE if address is after end of sequence
-
-        linebuf->writeByte(DW_LNS_set_file);
-        linebuf->writeuLEB128(file);
-
-        for (int j = 0; j < ld->linoff_count; j++)
-        {   int lininc = ld->linoff[j][0] - line;
-        int addinc = ld->linoff[j][1] - address;
-
-        //printf("\tld[%d] line = %d offset = x%x lininc = %d addinc = %d\n", j, ld->linoff[j][0], ld->linoff[j][1], lininc, addinc);
-
-        //assert(addinc >= 0);
@@ -682 +682 @@
-                    debugline.opcode_base;
-
-            if (opcode <= 255)
-            {   linebuf->writeByte(opcode);
-            continue;
-            }
-        }
-        if (lininc)
-        {
-            linebuf->writeByte(DW_LNS_advance_line);
-            linebuf->writesLEB128((long)lininc);
-        }
-        if (addinc)
-        {
-            linebuf->writeByte(DW_LNS_advance_pc);
-            linebuf->writeuLEB128((unsigned long)addinc);
-        }
-        if (lininc || addinc)
-            linebuf->writeByte(DW_LNS_copy);
-        }
+
+        // Write DW_LNE_end_sequence
+        linebuf->writeByte(0);
+        linebuf->writeByte(1);
+        linebuf->writeByte(1);
-    }
-
-    // Write DW_LNE_end_sequence
-    linebuf->writeByte(0);
-    linebuf->writeByte(1);
-    linebuf->writeByte(1);
-    }
-
-    debugline.total_length = linebuf->size() - 4;
-    memcpy(linebuf->buf, &debugline, sizeof(debugline));
-
-    /* ================================================= */
-
-    abbrevbuf->writeByte(0);
-
-    /* ================================================= */
-
-    infobuf->writeByte(0);  // ending abbreviation code
-
-    debuginfo.total_length = infobuf->size() - 4;
-    memcpy(infobuf->buf, &debuginfo, sizeof(debuginfo));
-
-    /* ================================================= */
-
-    // Terminate by offset field containing 0
-    debug_pubnames_buf->write32(0);

trunk/src/backend/dwarf.c

@@ -619 +619 @@
-        ;
-    }
-    }
-    linebuf->writeByte(0);      // end of file_names
-
-    debugline.prologue_length = linebuf->size() - 10;
-
-    for (unsigned seg = 1; seg <= seg_count; seg++)
-    {
-    seg_data *sd = SegData[seg];
-    unsigned addressmax = 0;
-    unsigned linestart = ~0;
-
-    if (!sd->SDlinnum_count)
-        continue;
-#if ELFOBJ
-    if (!sd->SDsym) // gdb ignores line number data without a DW_AT_name
-        continue;
-#endif
-
-    // Set address to start of segment with DW_LNE_set_address
-    linebuf->writeByte(0);
-    linebuf->writeByte(5);
-    linebuf->writeByte(2);
-    dwarf_addrel(lineseg,linebuf->size(),seg);
-    linebuf->write32(0);
-
-    //printf("sd = %x, SDlinnum_count = %d\n", sd, sd->SDlinnum_count);
-    for (int i = 0; i < sd->SDlinnum_count; i++)
-    {   linnum_data *ld = &sd->SDlinnum_data[i];
+
+        // Set address to start of segment with DW_LNE_set_address
+        linebuf->writeByte(0);
+        linebuf->writeByte(5);
+        linebuf->writeByte(2);
+        dwarf_addrel(lineseg,linebuf->size(),seg);
+        linebuf->write32(0);
-
-        // Dwarf2 6.2.2 State machine registers
-        unsigned address = 0;   // instruction address
-        unsigned file = ld->filenumber;
-        unsigned line = 1;      // line numbers beginning with 1
-        unsigned column = 0;    // column number, leftmost column is 1
-        int is_stmt = debugline.default_is_stmt;    // TRUE if beginning of a statement
-        int basic_block = FALSE;  // TRUE if start of basic block
-        int end_sequence = FALSE; // TRUE if address is after end of sequence
-
-        linebuf->writeByte(DW_LNS_set_file);
-        linebuf->writeuLEB128(file);
-
-        for (int j = 0; j < ld->linoff_count; j++)
-        {   int lininc = ld->linoff[j][0] - line;
-        int addinc = ld->linoff[j][1] - address;
-
-        //printf("\tld[%d] line = %d offset = x%x lininc = %d addinc = %d\n", j, ld->linoff[j][0], ld->linoff[j][1], lininc, addinc);
-
-        //assert(addinc >= 0);
@@ -682 +682 @@
-                    debugline.opcode_base;
-
-            if (opcode <= 255)
-            {   linebuf->writeByte(opcode);
-            continue;
-            }
-        }
-        if (lininc)
-        {
-            linebuf->writeByte(DW_LNS_advance_line);
-            linebuf->writesLEB128((long)lininc);
-        }
-        if (addinc)
-        {
-            linebuf->writeByte(DW_LNS_advance_pc);
-            linebuf->writeuLEB128((unsigned long)addinc);
-        }
-        if (lininc || addinc)
-            linebuf->writeByte(DW_LNS_copy);
-        }
+
+        // Write DW_LNE_end_sequence
+        linebuf->writeByte(0);
+        linebuf->writeByte(1);
+        linebuf->writeByte(1);
-    }
-
-    // Write DW_LNE_end_sequence
-    linebuf->writeByte(0);
-    linebuf->writeByte(1);
-    linebuf->writeByte(1);
-    }
-
-    debugline.total_length = linebuf->size() - 4;
-    memcpy(linebuf->buf, &debugline, sizeof(debugline));
-
-    /* ================================================= */
-
-    abbrevbuf->writeByte(0);
-
-    /* ================================================= */
-
-    infobuf->writeByte(0);  // ending abbreviation code
-
-    debuginfo.total_length = infobuf->size() - 4;
-    memcpy(infobuf->buf, &debuginfo, sizeof(debuginfo));
-
-    /* ================================================= */
-
-    // Terminate by offset field containing 0
-    debug_pubnames_buf->write32(0);