[llvm-commits] [llvm] r110617 - in /llvm/trunk: include/llvm/MC/MCContext.h include/llvm/MC/MCDwarf.h lib/MC/MCContext.cpp lib/MC/MCMachOStreamer.cpp
Kevin Enderby
enderby at apple.com
Mon Aug 9 15:52:14 PDT 2010
Author: enderby
Date: Mon Aug 9 17:52:14 2010
New Revision: 110617
URL: http://llvm.org/viewvc/llvm-project?rev=110617&view=rev
Log:
Next bit of support for the dwarf .file directive. This patch takes the
previously collected info from the .file directives and outputs the encoded
bytes for it. For now this is only in the Mach-O streamer but at some point
will move to a more generic place.
Modified:
llvm/trunk/include/llvm/MC/MCContext.h
llvm/trunk/include/llvm/MC/MCDwarf.h
llvm/trunk/lib/MC/MCContext.cpp
llvm/trunk/lib/MC/MCMachOStreamer.cpp
Modified: llvm/trunk/include/llvm/MC/MCContext.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCContext.h?rev=110617&r1=110616&r2=110617&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCContext.h (original)
+++ llvm/trunk/include/llvm/MC/MCContext.h Mon Aug 9 17:52:14 2010
@@ -151,6 +151,9 @@
const std::vector<MCDwarfFile *> &getMCDwarfFiles() {
return MCDwarfFiles;
}
+ const std::vector<StringRef> &getMCDwarfDirs() {
+ return MCDwarfDirs;
+ }
/// @}
Modified: llvm/trunk/include/llvm/MC/MCDwarf.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCDwarf.h?rev=110617&r1=110616&r2=110617&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCDwarf.h (original)
+++ llvm/trunk/include/llvm/MC/MCDwarf.h Mon Aug 9 17:52:14 2010
@@ -46,6 +46,10 @@
/// getName - Get the base name of this MCDwarfFile.
StringRef getName() const { return Name; }
+ /// getDirIndex - Get the dirIndex of this MCDwarfFile.
+ unsigned getDirIndex() const { return DirIndex; }
+
+
/// print - Print the value to the stream \arg OS.
void print(raw_ostream &OS) const;
Modified: llvm/trunk/lib/MC/MCContext.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCContext.cpp?rev=110617&r1=110616&r2=110617&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCContext.cpp (original)
+++ llvm/trunk/lib/MC/MCContext.cpp Mon Aug 9 17:52:14 2010
@@ -222,7 +222,7 @@
} else {
StringRef Directory = Slash.first;
Name = Slash.second;
- for (DirIndex = 1; DirIndex < MCDwarfDirs.size(); DirIndex++) {
+ for (DirIndex = 0; DirIndex < MCDwarfDirs.size(); DirIndex++) {
if (Directory == MCDwarfDirs[DirIndex])
break;
}
@@ -231,6 +231,11 @@
memcpy(Buf, Directory.data(), Directory.size());
MCDwarfDirs.push_back(StringRef(Buf, Directory.size()));
}
+ // The DirIndex is one based, as DirIndex of 0 is used for FileNames with
+ // no directories. MCDwarfDirs[] is unlike MCDwarfFiles[] in that the
+ // directory names are stored at MCDwarfDirs[DirIndex-1] where FileNames are
+ // stored at MCDwarfFiles[FileNumber].Name .
+ DirIndex++;
}
// Now make the MCDwarfFile entry and place it in the slot in the MCDwarfFiles
Modified: llvm/trunk/lib/MC/MCMachOStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCMachOStreamer.cpp?rev=110617&r1=110616&r2=110617&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCMachOStreamer.cpp (original)
+++ llvm/trunk/lib/MC/MCMachOStreamer.cpp Mon Aug 9 17:52:14 2010
@@ -18,6 +18,8 @@
#include "llvm/MC/MCSection.h"
#include "llvm/MC/MCSymbol.h"
#include "llvm/MC/MCMachOSymbolFlags.h"
+#include "llvm/MC/MCSectionMachO.h"
+#include "llvm/MC/MCDwarf.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetAsmBackend.h"
@@ -30,6 +32,10 @@
private:
void EmitInstToFragment(const MCInst &Inst);
void EmitInstToData(const MCInst &Inst);
+ // FIXME: These will likely moved to a better place.
+ const MCExpr * MakeStartMinusEndExpr(MCSymbol *Start, MCSymbol *End,
+ int IntVal);
+ void EmitDwarfFileTable(void);
public:
MCMachOStreamer(MCContext &Context, TargetAsmBackend &TAB,
@@ -424,7 +430,156 @@
EmitInstToFragment(Inst);
}
+//
+// This helper routine returns an expression of End - Start + IntVal for use
+// by EmitDwarfFileTable() below.
+//
+const MCExpr * MCMachOStreamer::MakeStartMinusEndExpr(MCSymbol *Start,
+ MCSymbol *End,
+ int IntVal) {
+ MCSymbolRefExpr::VariantKind Variant = MCSymbolRefExpr::VK_None;
+ const MCExpr *Res =
+ MCSymbolRefExpr::Create(End, Variant, getContext());
+ const MCExpr *RHS =
+ MCSymbolRefExpr::Create(Start, Variant, getContext());
+ const MCExpr *Res1 =
+ MCBinaryExpr::Create(MCBinaryExpr::Sub, Res, RHS,getContext());
+ const MCExpr *Res2 =
+ MCConstantExpr::Create(IntVal, getContext());
+ const MCExpr *Res3 =
+ MCBinaryExpr::Create(MCBinaryExpr::Sub, Res1, Res2, getContext());
+ return Res3;
+}
+
+//
+// This emits the Dwarf file (and eventually the line) table.
+//
+void MCMachOStreamer::EmitDwarfFileTable(void) {
+ // For now make sure we don't put out the Dwarf file table if no .file
+ // directives were seen.
+ const std::vector<MCDwarfFile *> &MCDwarfFiles =
+ getContext().getMCDwarfFiles();
+ if (MCDwarfFiles.size() == 0)
+ return;
+
+ // This is the Mach-O section, for ELF it is the .debug_line section.
+ SwitchSection(getContext().getMachOSection("__DWARF", "__debug_line",
+ MCSectionMachO::S_ATTR_DEBUG,
+ 0, SectionKind::getDataRelLocal()));
+
+ // Create a symbol at the beginning of this section.
+ MCSymbol *LineStartSym = getContext().CreateTempSymbol();
+ // Set the value of the symbol, as we are at the start of the section.
+ EmitLabel(LineStartSym);
+
+ // Create a symbol for the end of the section (to be set when we get there).
+ MCSymbol *LineEndSym = getContext().CreateTempSymbol();
+
+ // The first 4 bytes is the total length of the information for this
+ // compilation unit (not including these 4 bytes for the length).
+ EmitValue(MakeStartMinusEndExpr(LineStartSym, LineEndSym, 4), 4, 0);
+
+ // Next 2 bytes is the Version, which is Dwarf 2.
+ EmitIntValue(2, 2);
+
+ // Create a symbol for the end of the prologue (to be set when we get there).
+ MCSymbol *ProEndSym = getContext().CreateTempSymbol(); // Lprologue_end
+
+ // Length of the prologue, is the next 4 bytes. Which is the start of the
+ // section to the end of the prologue. Not including the 4 bytes for the
+ // total length, the 2 bytes for the version, and these 4 bytes for the
+ // length of the prologue.
+ EmitValue(MakeStartMinusEndExpr(LineStartSym, ProEndSym, (4 + 2 + 4)), 4, 0);
+
+ // Parameters of the state machine, are next.
+ // Define the architecture-dependent minimum instruction length (in
+ // bytes). This value should be rather too small than too big. */
+ // DWARF2_LINE_MIN_INSN_LENGTH
+ EmitIntValue(1, 1);
+ // Flag that indicates the initial value of the is_stmt_start flag.
+ // DWARF2_LINE_DEFAULT_IS_STMT
+ EmitIntValue(1, 1);
+ // Minimum line offset in a special line info. opcode. This value
+ // was chosen to give a reasonable range of values. */
+ // DWARF2_LINE_BASE
+ EmitIntValue(-5, 1);
+ // Range of line offsets in a special line info. opcode.
+ // DWARF2_LINE_RANGE
+ EmitIntValue(14, 1);
+ // First special line opcode - leave room for the standard opcodes.
+ // DWARF2_LINE_OPCODE_BASE
+ EmitIntValue(13, 1);
+
+ // Standard opcode lengths
+ EmitIntValue(0, 1); // length of DW_LNS_copy
+ EmitIntValue(1, 1); // length of DW_LNS_advance_pc
+ EmitIntValue(1, 1); // length of DW_LNS_advance_line
+ EmitIntValue(1, 1); // length of DW_LNS_set_file
+ EmitIntValue(1, 1); // length of DW_LNS_set_column
+ EmitIntValue(0, 1); // length of DW_LNS_negate_stmt
+ EmitIntValue(0, 1); // length of DW_LNS_set_basic_block
+ EmitIntValue(0, 1); // length of DW_LNS_const_add_pc
+ EmitIntValue(1, 1); // length of DW_LNS_fixed_advance_pc
+ EmitIntValue(0, 1); // length of DW_LNS_set_prologue_end
+ EmitIntValue(0, 1); // length of DW_LNS_set_epilogue_begin
+ EmitIntValue(1, 1); // DW_LNS_set_isa
+
+ // Put out the directory and file tables.
+
+ // First the directory table.
+ const std::vector<StringRef> &MCDwarfDirs =
+ getContext().getMCDwarfDirs();
+ for (unsigned i = 0; i < MCDwarfDirs.size(); i++) {
+ EmitBytes(MCDwarfDirs[i], 0); // the DirectoryName
+ EmitBytes(StringRef("\0", 1), 0); // the null termination of the string
+ }
+ EmitIntValue(0, 1); // Terminate the directory list
+
+ // Second the file table.
+ for (unsigned i = 1; i < MCDwarfFiles.size(); i++) {
+ EmitBytes(MCDwarfFiles[i]->getName(), 0); // FileName
+ EmitBytes(StringRef("\0", 1), 0); // the null termination of the string
+ // FIXME the Directory number should be a .uleb128 not a .byte
+ EmitIntValue(MCDwarfFiles[i]->getDirIndex(), 1);
+ EmitIntValue(0, 1); // last modification timestamp (always 0)
+ EmitIntValue(0, 1); // filesize (always 0)
+ }
+ EmitIntValue(0, 1); // Terminate the file list
+
+ // This is the end of the prologue, so set the value of the symbol at the
+ // end of the prologue (that was used in a previous expression).
+ EmitLabel(ProEndSym);
+
+ // TODO: This is the point where the line tables would be emitted.
+
+ // If there are no line tables emited then we emit:
+ // The following DW_LNE_set_address sequence to set the address to zero
+ // TODO test for 32-bit or 64-bit output
+ // This is the sequence for 32-bit code
+ EmitIntValue(0, 1);
+ EmitIntValue(5, 1);
+ EmitIntValue(2, 1);
+ EmitIntValue(0, 1);
+ EmitIntValue(0, 1);
+ EmitIntValue(0, 1);
+ EmitIntValue(0, 1);
+
+ // Lastly emit the DW_LNE_end_sequence which consists of 3 bytes '00 01 01'
+ // (00 is the code for extended opcodes, followed by a ULEB128 length of the
+ // extended opcode (01), and the DW_LNE_end_sequence (01).
+ EmitIntValue(0, 1); // DW_LNS_extended_op
+ EmitIntValue(1, 1); // ULEB128 length of the extended opcode
+ EmitIntValue(1, 1); // DW_LNE_end_sequence
+
+ // This is the end of the section, so set the value of the symbol at the end
+ // of this section (that was used in a previous expression).
+ EmitLabel(LineEndSym);
+}
+
void MCMachOStreamer::Finish() {
+ // Dump out the dwarf file and directory tables (soon to include line table)
+ EmitDwarfFileTable();
+
// We have to set the fragment atom associations so we can relax properly for
// Mach-O.
More information about the llvm-commits
mailing list