<div dir="ltr">I wrote one. Will submit after submitting <a href="http://llvm-reviews.chandlerc.com/D1719">http://llvm-reviews.chandlerc.com/D1719</a>.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Sun, Sep 15, 2013 at 7:24 PM, Shankar Easwaran <span dir="ltr"><<a href="mailto:shankare@codeaurora.org" target="_blank">shankare@codeaurora.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">testcase ?<div class="HOEnZb"><div class="h5"><br>
<br>
On 9/15/2013 5:33 PM, Rui Ueyama wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: ruiu<br>
Date: Sun Sep 15 17:33:15 2013<br>
New Revision: 190772<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=190772&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=190772&view=rev</a><br>
Log:<br>
[PECOFF] Use a dummy file as an "input file" for Idata atoms.<br>
<br>
Modified:<br>
lld/trunk/lib/ReaderWriter/<u></u>PECOFF/IdataPass.h<br>
lld/trunk/lib/ReaderWriter/<u></u>PECOFF/PECOFFLinkingContext.<u></u>cpp<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/<u></u>PECOFF/IdataPass.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/IdataPass.h?rev=190772&r1=190771&r2=190772&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/lld/trunk/lib/<u></u>ReaderWriter/PECOFF/IdataPass.<u></u>h?rev=190772&r1=190771&r2=<u></u>190772&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- lld/trunk/lib/ReaderWriter/<u></u>PECOFF/IdataPass.h (original)<br>
+++ lld/trunk/lib/ReaderWriter/<u></u>PECOFF/IdataPass.h Sun Sep 15 17:33:15 2013<br>
@@ -23,8 +23,9 @@<br>
#include "lld/Core/File.h"<br>
#include "lld/Core/Pass.h"<br>
-#include "llvm/Support/Debug.h"<br>
+#include "lld/ReaderWriter/Simple.h"<br>
#include "llvm/Support/COFF.h"<br>
+#include "llvm/Support/Debug.h"<br>
#include "llvm/Support/Endian.h"<br>
#include <algorithm><br>
@@ -58,9 +59,10 @@ void addDir32NBReloc(<u></u>COFFBaseDefinedAtom<br>
// A state object of this pass.<br>
struct Context {<br>
- explicit Context(MutableFile &f) : file(f) {}<br>
+ explicit Context(MutableFile &f, File &g) : file(f), dummyFile(g) {}<br>
MutableFile &file;<br>
+ File &dummyFile;<br>
// The object to accumulate idata atoms. Idata atoms need to be grouped by<br>
// type and be continuous in the output file. To force such layout, we<br>
@@ -82,9 +84,9 @@ public:<br>
virtual ContentPermissions permissions() const { return permR__; }<br>
protected:<br>
- IdataAtom(MutableFile &file, vector<uint8_t> data)<br>
- : COFFLinkerInternalAtom(file, data) {<br>
- file.addAtom(*this);<br>
+ IdataAtom(Context &context, vector<uint8_t> data)<br>
+ : COFFLinkerInternalAtom(<u></u>context.dummyFile, data) {<br>
+ context.file.addAtom(*this);<br>
}<br>
};<br>
@@ -93,7 +95,7 @@ protected:<br>
class DLLNameAtom : public IdataAtom {<br>
public:<br>
DLLNameAtom(Context &context, StringRef name)<br>
- : IdataAtom(context.file, stringRefToVector(name)) {<br>
+ : IdataAtom(context, stringRefToVector(name)) {<br>
context.dllNameAtoms.push_<u></u>back(this);<br>
}<br>
@@ -117,7 +119,7 @@ private:<br>
class HintNameAtom : public IdataAtom {<br>
public:<br>
HintNameAtom(Context &context, uint16_t hint, StringRef importName)<br>
- : IdataAtom(context.file, assembleRawContent(hint, importName)),<br>
+ : IdataAtom(context, assembleRawContent(hint, importName)),<br>
_importName(importName) {<br>
context.hintNameAtoms.push_<u></u>back(this);<br>
}<br>
@@ -144,7 +146,7 @@ private:<br>
class ImportTableEntryAtom : public IdataAtom {<br>
public:<br>
explicit ImportTableEntryAtom(Context &context, uint32_t contents)<br>
- : IdataAtom(context.file, assembleRawContent(contents)) {}<br>
+ : IdataAtom(context, assembleRawContent(contents)) {}<br>
private:<br>
vector<uint8_t> assembleRawContent(uint32_t contents) {<br>
@@ -162,7 +164,7 @@ class ImportDirectoryAtom : public Idata<br>
public:<br>
ImportDirectoryAtom(Context &context, StringRef loadName,<br>
const vector<COFFSharedLibraryAtom *> &sharedAtoms)<br>
- : IdataAtom(context.file, vector<uint8_t>(20, 0)) {<br>
+ : IdataAtom(context, vector<uint8_t>(20, 0)) {<br>
addRelocations(context, loadName, sharedAtoms);<br>
context.importDirectories.<u></u>push_back(this);<br>
}<br>
@@ -229,20 +231,30 @@ private:<br>
class NullImportDirectoryAtom : public IdataAtom {<br>
public:<br>
explicit NullImportDirectoryAtom(<u></u>Context &context)<br>
- : IdataAtom(context.file, vector<uint8_t>(20, 0)) {<br>
+ : IdataAtom(context, vector<uint8_t>(20, 0)) {<br>
context.importDirectories.<u></u>push_back(this);<br>
}<br>
};<br>
} // anonymous namespace<br>
+// An instance of this class represents "input file" for atoms created in this<br>
+// pass. Only one instance of this class is created as a field of IdataPass.<br>
+class IdataPassFile : public SimpleFile {<br>
+public:<br>
+ IdataPassFile(const LinkingContext &ctx)<br>
+ : SimpleFile(ctx, "<idata-pass-file>") {}<br>
+};<br>
+<br>
class IdataPass : public lld::Pass {<br>
public:<br>
+ IdataPass(const LinkingContext &ctx) : _dummyFile(ctx) {}<br>
+<br>
virtual void perform(MutableFile &file) {<br>
if (file.sharedLibrary().size() == 0)<br>
return;<br>
- Context context(file);<br>
+ Context context(file, _dummyFile);<br>
map<StringRef, vector<COFFSharedLibraryAtom *> > sharedAtoms =<br>
groupByLoadName(file);<br>
for (auto i : sharedAtoms) {<br>
@@ -291,14 +303,14 @@ private:<br>
/// will be set by the writer.<br>
void createDataDirectoryAtoms(<u></u>Context &context) {<br>
auto *dir = new (_alloc) coff::COFFDataDirectoryAtom(<br>
- context.file, llvm::COFF::<u></u>DataDirectoryIndex::IMPORT_<u></u>TABLE,<br>
+ context.dummyFile, llvm::COFF::<u></u>DataDirectoryIndex::IMPORT_<u></u>TABLE,<br>
context.importDirectories.<u></u>size() *<br>
context.importDirectories[0]-><u></u>size());<br>
addDir32NBReloc(dir, context.importDirectories[0]);<br>
context.file.addAtom(*dir);<br>
auto *iat = new (_alloc) coff::COFFDataDirectoryAtom(<br>
- context.file, llvm::COFF::<u></u>DataDirectoryIndex::IAT,<br>
+ context.dummyFile, llvm::COFF::<u></u>DataDirectoryIndex::IAT,<br>
context.importAddressTables.<u></u>size() *<br>
context.importAddressTables[0]<u></u>->size());<br>
addDir32NBReloc(iat, context.importAddressTables[0]<u></u>);<br>
@@ -320,6 +332,11 @@ private:<br>
}<br>
}<br>
+ // A dummy file with which all the atoms created in the pass will be<br>
+ // associated. Atoms need to be associated to an input file even if it's not<br>
+ // read from a file, so we use this object.<br>
+ IdataPassFile _dummyFile;<br>
+<br>
llvm::BumpPtrAllocator _alloc;<br>
};<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/<u></u>PECOFF/PECOFFLinkingContext.<u></u>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp?rev=190772&r1=190771&r2=190772&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/lld/trunk/lib/<u></u>ReaderWriter/PECOFF/<u></u>PECOFFLinkingContext.cpp?rev=<u></u>190772&r1=190771&r2=190772&<u></u>view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- lld/trunk/lib/ReaderWriter/<u></u>PECOFF/PECOFFLinkingContext.<u></u>cpp (original)<br>
+++ lld/trunk/lib/ReaderWriter/<u></u>PECOFF/PECOFFLinkingContext.<u></u>cpp Sun Sep 15 17:33:15 2013<br>
@@ -122,7 +122,7 @@ PECOFFLinkingContext::<u></u>stringFromRelocKin<br>
void PECOFFLinkingContext::<u></u>addPasses(PassManager &pm) const {<br>
pm.add(std::unique_ptr<Pass>(<u></u>new pecoff::GroupedSectionsPass())<u></u>);<br>
- pm.add(std::unique_ptr<Pass>(<u></u>new pecoff::IdataPass()));<br>
+ pm.add(std::unique_ptr<Pass>(<u></u>new pecoff::IdataPass(*this)));<br>
pm.add(std::unique_ptr<Pass>(<u></u>new LayoutPass()));<br>
}<br>
} // end namespace lld<br>
<br>
<br>
______________________________<u></u>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/<u></u>mailman/listinfo/llvm-commits</a><br>
<br>
<br>
</blockquote>
<br>
<br></div></div><span class="HOEnZb"><font color="#888888">
-- <br>
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by the Linux Foundation<br>
<br>
</font></span></blockquote></div><br></div>