diff options
| author | dim <dim@FreeBSD.org> | 2014-03-21 17:53:59 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-03-21 17:53:59 +0000 |
| commit | 9cedb8bb69b89b0f0c529937247a6a80cabdbaec (patch) | |
| tree | c978f0e9ec1ab92dc8123783f30b08a7fd1e2a39 /contrib/llvm/lib/MC/MCAtom.cpp | |
| parent | 03fdc2934eb61c44c049a02b02aa974cfdd8a0eb (diff) | |
| download | FreeBSD-src-9cedb8bb69b89b0f0c529937247a6a80cabdbaec.zip FreeBSD-src-9cedb8bb69b89b0f0c529937247a6a80cabdbaec.tar.gz | |
MFC 261991:
Upgrade our copy of llvm/clang to 3.4 release. This version supports
all of the features in the current working draft of the upcoming C++
standard, provisionally named C++1y.
The code generator's performance is greatly increased, and the loop
auto-vectorizer is now enabled at -Os and -O2 in addition to -O3. The
PowerPC backend has made several major improvements to code generation
quality and compile time, and the X86, SPARC, ARM32, Aarch64 and SystemZ
backends have all seen major feature work.
Release notes for llvm and clang can be found here:
<http://llvm.org/releases/3.4/docs/ReleaseNotes.html>
<http://llvm.org/releases/3.4/tools/clang/docs/ReleaseNotes.html>
MFC 262121 (by emaste):
Update lldb for clang/llvm 3.4 import
This commit largely restores the lldb source to the upstream r196259
snapshot with the addition of threaded inferior support and a few bug
fixes.
Specific upstream lldb revisions restored include:
SVN git
181387 779e6ac
181703 7bef4e2
182099 b31044e
182650 f2dcf35
182683 0d91b80
183862 15c1774
183929 99447a6
184177 0b2934b
184948 4dc3761
184954 007e7bc
186990 eebd175
Sponsored by: DARPA, AFRL
MFC 262186 (by emaste):
Fix mismerge in r262121
A break statement was lost in the merge. The error had no functional
impact, but restore it to reduce the diff against upstream.
MFC 262303:
Pull in r197521 from upstream clang trunk (by rdivacky):
Use the integrated assembler by default on FreeBSD/ppc and ppc64.
Requested by: jhibbits
MFC 262611:
Pull in r196874 from upstream llvm trunk:
Fix a crash that occurs when PWD is invalid.
MCJIT needs to be able to run in hostile environments, even when PWD
is invalid. There's no need to crash MCJIT in this case.
The obvious fix is to simply leave MCContext's CompilationDir empty
when PWD can't be determined. This way, MCJIT clients,
and other clients that link with LLVM don't need a valid working directory.
If we do want to guarantee valid CompilationDir, that should be done
only for clients of getCompilationDir(). This is as simple as checking
for an empty string.
The only current use of getCompilationDir is EmitGenDwarfInfo, which
won't conceivably run with an invalid working dir. However, in the
purely hypothetically and untestable case that this happens, the
AT_comp_dir will be omitted from the compilation_unit DIE.
This should help fix assertions occurring with ports-mgmt/tinderbox,
when it is using jails, and sometimes invalidates clang's current
working directory.
Reported by: decke
MFC 262809:
Pull in r203007 from upstream clang trunk:
Don't produce an alias between destructors with different calling conventions.
Fixes pr19007.
(Please note that is an LLVM PR identifier, not a FreeBSD one.)
This should fix Firefox and/or libxul crashes (due to problems with
regparm/stdcall calling conventions) on i386.
Reported by: multiple users on freebsd-current
PR: bin/187103
MFC 263048:
Repair recognition of "CC" as an alias for the C++ compiler, since it
was silently broken by upstream for a Windows-specific use-case.
Apparently some versions of CMake still rely on this archaic feature...
Reported by: rakuco
MFC 263049:
Garbage collect the old way of adding the libstdc++ include directories
in clang's InitHeaderSearch.cpp. This has been superseded by David
Chisnall's commit in r255321.
Moreover, if libc++ is used, the libstdc++ include directories should
not be in the search path at all. These directories are now only used
if you pass -stdlib=libstdc++.
Diffstat (limited to 'contrib/llvm/lib/MC/MCAtom.cpp')
| -rw-r--r-- | contrib/llvm/lib/MC/MCAtom.cpp | 123 |
1 files changed, 70 insertions, 53 deletions
diff --git a/contrib/llvm/lib/MC/MCAtom.cpp b/contrib/llvm/lib/MC/MCAtom.cpp index d714443..bc353cd 100644 --- a/contrib/llvm/lib/MC/MCAtom.cpp +++ b/contrib/llvm/lib/MC/MCAtom.cpp @@ -10,88 +10,105 @@ #include "llvm/MC/MCAtom.h" #include "llvm/MC/MCModule.h" #include "llvm/Support/ErrorHandling.h" +#include <iterator> using namespace llvm; -void MCAtom::addInst(const MCInst &I, uint64_t Address, unsigned Size) { - assert(Type == TextAtom && "Trying to add MCInst to a non-text atom!"); +// Pin the vtable to this file. +void MCAtom::anchor() {} - assert(Address < End+Size && - "Instruction not contiguous with end of atom!"); - if (Address > End) - Parent->remap(this, Begin, End+Size); - - Text.push_back(std::make_pair(Address, I)); +void MCAtom::remap(uint64_t NewBegin, uint64_t NewEnd) { + Parent->remap(this, NewBegin, NewEnd); } -void MCAtom::addData(const MCData &D) { - assert(Type == DataAtom && "Trying to add MCData to a non-data atom!"); - Parent->remap(this, Begin, End+1); - - Data.push_back(D); +void MCAtom::remapForTruncate(uint64_t TruncPt) { + assert((TruncPt >= Begin && TruncPt < End) && + "Truncation point not contained in atom!"); + remap(Begin, TruncPt); } -MCAtom *MCAtom::split(uint64_t SplitPt) { +void MCAtom::remapForSplit(uint64_t SplitPt, + uint64_t &LBegin, uint64_t &LEnd, + uint64_t &RBegin, uint64_t &REnd) { assert((SplitPt > Begin && SplitPt <= End) && "Splitting at point not contained in atom!"); // Compute the new begin/end points. - uint64_t LeftBegin = Begin; - uint64_t LeftEnd = SplitPt - 1; - uint64_t RightBegin = SplitPt; - uint64_t RightEnd = End; + LBegin = Begin; + LEnd = SplitPt - 1; + RBegin = SplitPt; + REnd = End; // Remap this atom to become the lower of the two new ones. - Parent->remap(this, LeftBegin, LeftEnd); + remap(LBegin, LEnd); +} - // Create a new atom for the higher atom. - MCAtom *RightAtom = Parent->createAtom(Type, RightBegin, RightEnd); +// MCDataAtom - // Split the contents of the original atom between it and the new one. The - // precise method depends on whether this is a data or a text atom. - if (isDataAtom()) { - std::vector<MCData>::iterator I = Data.begin() + (RightBegin - LeftBegin); +void MCDataAtom::addData(const MCData &D) { + Data.push_back(D); + if (Data.size() > End + 1 - Begin) + remap(Begin, End + 1); +} - assert(I != Data.end() && "Split point not found in range!"); +void MCDataAtom::truncate(uint64_t TruncPt) { + remapForTruncate(TruncPt); - std::copy(I, Data.end(), RightAtom->Data.end()); - Data.erase(I, Data.end()); - } else if (isTextAtom()) { - std::vector<std::pair<uint64_t, MCInst> >::iterator I = Text.begin(); + Data.resize(TruncPt - Begin + 1); +} - while (I != Text.end() && I->first < SplitPt) ++I; +MCDataAtom *MCDataAtom::split(uint64_t SplitPt) { + uint64_t LBegin, LEnd, RBegin, REnd; + remapForSplit(SplitPt, LBegin, LEnd, RBegin, REnd); - assert(I != Text.end() && "Split point not found in disassembly!"); - assert(I->first == SplitPt && - "Split point does not fall on instruction boundary!"); + MCDataAtom *RightAtom = Parent->createDataAtom(RBegin, REnd); + RightAtom->setName(getName()); - std::copy(I, Text.end(), RightAtom->Text.end()); - Text.erase(I, Text.end()); - } else - llvm_unreachable("Unknown atom type!"); + std::vector<MCData>::iterator I = Data.begin() + (RBegin - LBegin); + assert(I != Data.end() && "Split point not found in range!"); + std::copy(I, Data.end(), std::back_inserter(RightAtom->Data)); + Data.erase(I, Data.end()); return RightAtom; } -void MCAtom::truncate(uint64_t TruncPt) { - assert((TruncPt >= Begin && TruncPt < End) && - "Truncation point not contained in atom!"); +// MCTextAtom - Parent->remap(this, Begin, TruncPt); +void MCTextAtom::addInst(const MCInst &I, uint64_t Size) { + if (NextInstAddress + Size - 1 > End) + remap(Begin, NextInstAddress + Size - 1); + Insts.push_back(MCDecodedInst(I, NextInstAddress, Size)); + NextInstAddress += Size; +} - if (isDataAtom()) { - Data.resize(TruncPt - Begin + 1); - } else if (isTextAtom()) { - std::vector<std::pair<uint64_t, MCInst> >::iterator I = Text.begin(); +void MCTextAtom::truncate(uint64_t TruncPt) { + remapForTruncate(TruncPt); - while (I != Text.end() && I->first <= TruncPt) ++I; + InstListTy::iterator I = Insts.begin(); + while (I != Insts.end() && I->Address <= TruncPt) ++I; - assert(I != Text.end() && "Truncation point not found in disassembly!"); - assert(I->first == TruncPt+1 && - "Truncation point does not fall on instruction boundary"); + assert(I != Insts.end() && "Truncation point not found in disassembly!"); + assert(I->Address == TruncPt + 1 && + "Truncation point does not fall on instruction boundary"); - Text.erase(I, Text.end()); - } else - llvm_unreachable("Unknown atom type!"); + Insts.erase(I, Insts.end()); } +MCTextAtom *MCTextAtom::split(uint64_t SplitPt) { + uint64_t LBegin, LEnd, RBegin, REnd; + remapForSplit(SplitPt, LBegin, LEnd, RBegin, REnd); + + MCTextAtom *RightAtom = Parent->createTextAtom(RBegin, REnd); + RightAtom->setName(getName()); + + InstListTy::iterator I = Insts.begin(); + while (I != Insts.end() && I->Address < SplitPt) ++I; + assert(I != Insts.end() && "Split point not found in disassembly!"); + assert(I->Address == SplitPt && + "Split point does not fall on instruction boundary!"); + + std::copy(I, Insts.end(), std::back_inserter(RightAtom->Insts)); + Insts.erase(I, Insts.end()); + Parent->splitBasicBlocksForAtom(this, RightAtom); + return RightAtom; +} |
