maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Rename NotFlags -> NegFlags. 

Negative flags are still bit flags, so I think "not flag" is a very good name.

llvm-svn: 293143
This commit is contained in:
Rui Ueyama 2017-01-26 02:58:59 +00:00
parent 481ac9967b
commit 8a8a953e99
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lld/ELF/LinkerScript.cpp
View File

@ -547,7 +547,7 @@ MemoryRegion *LinkerScript<ELFT>::findMemoryRegion(OutputSectionCommand *Cmd,
// See if a region can be found by matching section flags.
for (auto &MRI : Opt.MemoryRegions) {
MemoryRegion &MR = MRI.second;
if ((MR.Flags & Sec->Flags) != 0 && (MR.NotFlags & Sec->Flags) == 0)
if ((MR.Flags & Sec->Flags) != 0 && (MR.NegFlags & Sec->Flags) == 0)
return &MR;
}
@ -2027,9 +2027,9 @@ void ScriptParser::readMemory() {
StringRef Name = next();
uint32_t Flags = 0;
uint32_t NotFlags = 0;
uint32_t NegFlags = 0;
if (consume("(")) {
std::tie(Flags, NotFlags) = readMemoryAttributes();
std::tie(Flags, NegFlags) = readMemoryAttributes();
expect(")");
}
expect(":");
@ -2043,7 +2043,7 @@ void ScriptParser::readMemory() {
if (It != Opt.MemoryRegions.end())
setError("region '" + Name + "' already defined");
else
Opt.MemoryRegions[Name] = {Name, Origin, Length, Origin, Flags, NotFlags};
Opt.MemoryRegions[Name] = {Name, Origin, Length, Origin, Flags, NegFlags};
}
}
@ -2052,7 +2052,7 @@ void ScriptParser::readMemory() {
// are only used when an explicit memory region name is not used.
std::pair<uint32_t, uint32_t> ScriptParser::readMemoryAttributes() {
uint32_t Flags = 0;
uint32_t NotFlags = 0;
uint32_t NegFlags = 0;
bool Invert = false;
for (char C : next().lower()) {
@ -2069,11 +2069,11 @@ std::pair<uint32_t, uint32_t> ScriptParser::readMemoryAttributes() {
setError("invalid memory region attribute");
if (Invert)
NotFlags |= Flag;
NegFlags |= Flag;
else
Flags |= Flag;
}
return {Flags, NotFlags};
return {Flags, NegFlags};
}
void elf::readLinkerScript(MemoryBufferRef MB) {

2
lld/ELF/LinkerScript.h
View File

@ -198,7 +198,7 @@ struct MemoryRegion {
uint64_t Length;
uint64_t Offset;
uint32_t Flags;
uint32_t NotFlags;
uint32_t NegFlags;
};
class LinkerScriptBase {