[llvm-commits] [llvm] r80168 - in /llvm/trunk: test/MC/MachO/sections.s tools/llvm-mc/AsmParser.cpp tools/llvm-mc/AsmParser.h tools/llvm-mc/llvm-mc.cpp
Daniel Dunbar
daniel at zuster.org
Wed Aug 26 15:49:51 PDT 2009
Author: ddunbar
Date: Wed Aug 26 17:49:51 2009
New Revision: 80168
URL: http://llvm.org/viewvc/llvm-project?rev=80168&view=rev
Log:
llvm-mc/Mach-O: Unique sections properly, so we don't get duplicate text
sections, etc.
- The quick and dirty way, just clone the TargetLoweringObjectFile
code. Eventually this should be shared... somehow.
Modified:
llvm/trunk/test/MC/MachO/sections.s
llvm/trunk/tools/llvm-mc/AsmParser.cpp
llvm/trunk/tools/llvm-mc/AsmParser.h
llvm/trunk/tools/llvm-mc/llvm-mc.cpp
Modified: llvm/trunk/test/MC/MachO/sections.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/MachO/sections.s?rev=80168&r1=80167&r2=80168&view=diff
==============================================================================
--- llvm/trunk/test/MC/MachO/sections.s (original)
+++ llvm/trunk/test/MC/MachO/sections.s Wed Aug 26 17:49:51 2009
@@ -1,5 +1,8 @@
// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | macho-dump | FileCheck %s
+ .text
+ .section __TEXT,__text,regular,pure_instructions
+
.const
.static_const
.cstring
Modified: llvm/trunk/tools/llvm-mc/AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/AsmParser.cpp?rev=80168&r1=80167&r2=80168&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/AsmParser.cpp (original)
+++ llvm/trunk/tools/llvm-mc/AsmParser.cpp Wed Aug 26 17:49:51 2009
@@ -14,6 +14,7 @@
#include "AsmParser.h"
#include "AsmExpr.h"
+#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/Twine.h"
#include "llvm/MC/MCContext.h"
#include "llvm/MC/MCInst.h"
@@ -25,6 +26,48 @@
#include "llvm/Target/TargetAsmParser.h"
using namespace llvm;
+// Mach-O section uniquing.
+//
+// FIXME: Figure out where this should live, it should be shared by
+// TargetLoweringObjectFile.
+typedef StringMap<const MCSectionMachO*> MachOUniqueMapTy;
+
+AsmParser::~AsmParser() {
+ // If we have the MachO uniquing map, free it.
+ delete (MachOUniqueMapTy*)SectionUniquingMap;
+}
+
+const MCSection *AsmParser::getMachOSection(const StringRef &Segment,
+ const StringRef &Section,
+ unsigned TypeAndAttributes,
+ unsigned Reserved2,
+ SectionKind Kind) const {
+ // We unique sections by their segment/section pair. The returned section
+ // may not have the same flags as the requested section, if so this should be
+ // diagnosed by the client as an error.
+
+ // Create the map if it doesn't already exist.
+ if (SectionUniquingMap == 0)
+ SectionUniquingMap = new MachOUniqueMapTy();
+ MachOUniqueMapTy &Map = *(MachOUniqueMapTy*)SectionUniquingMap;
+
+ // Form the name to look up.
+ SmallString<64> Name;
+ Name += Segment;
+ Name.push_back(',');
+ Name += Section;
+
+ // Do the lookup, if we have a hit, return it.
+ const MCSectionMachO *&Entry = Map[Name.str()];
+
+ // FIXME: This should validate the type and attributes.
+ if (Entry) return Entry;
+
+ // Otherwise, return a new section.
+ return Entry = MCSectionMachO::Create(Segment, Section, TypeAndAttributes,
+ Reserved2, Kind, Ctx);
+}
+
void AsmParser::Warning(SMLoc L, const Twine &Msg) {
Lexer.PrintMessage(L, Msg.str(), "warning");
}
@@ -40,6 +83,15 @@
}
bool AsmParser::Run() {
+ // Create the initial section.
+ //
+ // FIXME: Support -n.
+ // FIXME: Target hook & command line option for initial section.
+ Out.SwitchSection(getMachOSection("__TEXT", "__text",
+ MCSectionMachO::S_ATTR_PURE_INSTRUCTIONS,
+ 0, SectionKind()));
+
+
// Prime the lexer.
Lexer.Lex();
@@ -770,15 +822,9 @@
if (!ErrorStr.empty())
return Error(Loc, ErrorStr.c_str());
- // FIXME: CACHE THESE.
-
// FIXME: Arch specific.
- MCSection *S = 0; //Ctx.GetSection(Section);
- if (S == 0)
- S = MCSectionMachO::Create(Segment, Section, TAA, StubSize,
- SectionKind(), Ctx);
-
- Out.SwitchSection(S);
+ Out.SwitchSection(getMachOSection(Segment, Section, TAA, StubSize,
+ SectionKind()));
return false;
}
@@ -792,13 +838,8 @@
Lexer.Lex();
// FIXME: Arch specific.
- // FIXME: Cache this!
- MCSection *S = 0; // Ctx.GetSection(Section);
- if (S == 0)
- S = MCSectionMachO::Create(Segment, Section, TAA, StubSize,
- SectionKind(), Ctx);
-
- Out.SwitchSection(S);
+ Out.SwitchSection(getMachOSection(Segment, Section, TAA, StubSize,
+ SectionKind()));
// Set the implicit alignment, if any.
//
Modified: llvm/trunk/tools/llvm-mc/AsmParser.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/AsmParser.h?rev=80168&r1=80167&r2=80168&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/AsmParser.h (original)
+++ llvm/trunk/tools/llvm-mc/AsmParser.h Wed Aug 26 17:49:51 2009
@@ -18,6 +18,7 @@
#include "AsmLexer.h"
#include "AsmCond.h"
#include "llvm/MC/MCAsmParser.h"
+#include "llvm/MC/MCSectionMachO.h"
#include "llvm/MC/MCStreamer.h"
namespace llvm {
@@ -40,10 +41,15 @@
AsmCond TheCondState;
std::vector<AsmCond> TheCondStack;
+ // FIXME: Figure out where this should leave, the code is a copy of that which
+ // is also used by TargetLoweringObjectFile.
+ mutable void *SectionUniquingMap;
+
public:
AsmParser(SourceMgr &_SM, MCContext &_Ctx, MCStreamer &_Out)
- : Lexer(_SM), Ctx(_Ctx), Out(_Out), TargetParser(0) {}
- ~AsmParser() {}
+ : Lexer(_SM), Ctx(_Ctx), Out(_Out), TargetParser(0),
+ SectionUniquingMap(0) {}
+ ~AsmParser();
bool Run();
@@ -71,6 +77,13 @@
private:
MCSymbol *CreateSymbol(StringRef Name);
+ // FIXME: See comment on SectionUniquingMap.
+ const MCSection *getMachOSection(const StringRef &Segment,
+ const StringRef &Section,
+ unsigned TypeAndAttributes,
+ unsigned Reserved2,
+ SectionKind Kind) const;
+
bool ParseStatement();
bool TokError(const char *Msg);
Modified: llvm/trunk/tools/llvm-mc/llvm-mc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/llvm-mc.cpp?rev=80168&r1=80167&r2=80168&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/llvm-mc.cpp (original)
+++ llvm/trunk/tools/llvm-mc/llvm-mc.cpp Wed Aug 26 17:49:51 2009
@@ -248,12 +248,6 @@
Str.reset(createMachOStreamer(Ctx, *Out));
}
- // FIXME: Target hook & command line option for initial section.
- Str.get()->SwitchSection(MCSectionMachO::Create("__TEXT","__text",
- MCSectionMachO::S_ATTR_PURE_INSTRUCTIONS,
- 0, SectionKind::getText(),
- Ctx));
-
AsmParser Parser(SrcMgr, Ctx, *Str.get());
OwningPtr<TargetAsmParser> TAP(TheTarget->createAsmParser(Parser));
if (!TAP) {
More information about the llvm-commits
mailing list