<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Mar 31, 2015 at 12:33 PM, Rui Ueyama <span dir="ltr"><<a href="mailto:ruiu@google.com" target="_blank">ruiu@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ruiu<br>
Date: Tue Mar 31 14:33:25 2015<br>
New Revision: 233737<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=233737&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=233737&view=rev</a><br>
Log:<br>
Rename identifiers starting with an underscore and a uppercase letter.<br>
<br>
Identifiers starting with _[A-Z] is reserved for the language.<br>
User programs shouldn't use such identifiers.<br></blockquote><div><br>*thumbs up* I did a few of these a few weeks ago - good stuff.<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.cpp<br>
lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp<br>
lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.cpp?rev=233737&r1=233736&r2=233737&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.cpp?rev=233737&r1=233736&r2=233737&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.cpp (original)<br>
+++ lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.cpp Tue Mar 31 14:33:25 2015<br>
@@ -245,7 +245,7 @@ protected:<br>
<br>
public:<br>
AArch64RelocationPass(const ELFLinkingContext &ctx)<br>
- : _file(ctx), _ctx(ctx), _null(nullptr), _PLT0(nullptr), _got0(nullptr),<br>
+ : _file(ctx), _ctx(ctx), _null(nullptr), _plt0(nullptr), _got0(nullptr),<br>
_got1(nullptr) {}<br>
<br>
/// \brief Do the pass.<br>
@@ -289,9 +289,9 @@ public:<br>
<br>
// Add all created atoms to the link.<br>
uint64_t ordinal = 0;<br>
- if (_PLT0) {<br>
- _PLT0->setOrdinal(ordinal++);<br>
- mf->addAtom(*_PLT0);<br>
+ if (_plt0) {<br>
+ _plt0->setOrdinal(ordinal++);<br>
+ mf->addAtom(*_plt0);<br>
}<br>
for (auto &plt : _pltVector) {<br>
plt->setOrdinal(ordinal++);<br>
@@ -301,7 +301,7 @@ public:<br>
_null->setOrdinal(ordinal++);<br>
mf->addAtom(*_null);<br>
}<br>
- if (_PLT0) {<br>
+ if (_plt0) {<br>
_got0->setOrdinal(ordinal++);<br>
_got1->setOrdinal(ordinal++);<br>
mf->addAtom(*_got0);<br>
@@ -342,7 +342,7 @@ protected:<br>
/// \brief The got and plt entries for .PLT0. This is used to call into the<br>
/// dynamic linker for symbol resolution.<br>
/// @{<br>
- PLT0Atom *_PLT0;<br>
+ PLT0Atom *_plt0;<br>
GOTAtom *_got0;<br>
GOTAtom *_got1;<br>
/// @}<br>
@@ -394,22 +394,22 @@ public:<br>
: AArch64RelocationPass(ctx) {}<br>
<br>
const PLT0Atom *getPLT0() {<br>
- if (_PLT0)<br>
- return _PLT0;<br>
+ if (_plt0)<br>
+ return _plt0;<br>
// Fill in the null entry.<br>
getNullGOT();<br>
- _PLT0 = new (_file._alloc) AArch64PLT0Atom(_file);<br>
+ _plt0 = new (_file._alloc) AArch64PLT0Atom(_file);<br>
_got0 = new (_file._alloc) AArch64GOTAtom(_file, ".got.plt");<br>
_got1 = new (_file._alloc) AArch64GOTAtom(_file, ".got.plt");<br>
- _PLT0->addReferenceELF_AArch64(R_AARCH64_ADR_GOT_PAGE, 4, _got0, 0);<br>
- _PLT0->addReferenceELF_AArch64(R_AARCH64_LD64_GOT_LO12_NC, 8, _got1, 0);<br>
- _PLT0->addReferenceELF_AArch64(ADD_AARCH64_GOTRELINDEX, 12, _got1, 0);<br>
+ _plt0->addReferenceELF_AArch64(R_AARCH64_ADR_GOT_PAGE, 4, _got0, 0);<br>
+ _plt0->addReferenceELF_AArch64(R_AARCH64_LD64_GOT_LO12_NC, 8, _got1, 0);<br>
+ _plt0->addReferenceELF_AArch64(ADD_AARCH64_GOTRELINDEX, 12, _got1, 0);<br>
#ifndef NDEBUG<br>
- _PLT0->_name = "__PLT0";<br>
+ _plt0->_name = "__PLT0";<br>
_got0->_name = "__got0";<br>
_got1->_name = "__got1";<br>
#endif<br>
- return _PLT0;<br>
+ return _plt0;<br>
}<br>
<br>
const PLTAtom *getPLTEntry(const Atom *a) {<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp?rev=233737&r1=233736&r2=233737&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp?rev=233737&r1=233736&r2=233737&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp (original)<br>
+++ lld/trunk/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.cpp Tue Mar 31 14:33:25 2015<br>
@@ -164,7 +164,7 @@ protected:<br>
<br>
public:<br>
GOTPLTPass(const ELFLinkingContext &ctx)<br>
- : _file(ctx), _null(nullptr), _PLT0(nullptr), _got0(nullptr) {}<br>
+ : _file(ctx), _null(nullptr), _plt0(nullptr), _got0(nullptr) {}<br>
<br>
/// \brief Do the pass.<br>
///<br>
@@ -182,9 +182,9 @@ public:<br>
<br>
// Add all created atoms to the link.<br>
uint64_t ordinal = 0;<br>
- if (_PLT0) {<br>
- _PLT0->setOrdinal(ordinal++);<br>
- mf->addAtom(*_PLT0);<br>
+ if (_plt0) {<br>
+ _plt0->setOrdinal(ordinal++);<br>
+ mf->addAtom(*_plt0);<br>
}<br>
for (auto &plt : _pltVector) {<br>
plt->setOrdinal(ordinal++);<br>
@@ -224,7 +224,7 @@ protected:<br>
/// \brief The got and plt entries for .PLT0. This is used to call into the<br>
/// dynamic linker for symbol resolution.<br>
/// @{<br>
- PLT0Atom *_PLT0;<br>
+ PLT0Atom *_plt0;<br>
GOTAtom *_got0;<br>
/// @}<br>
};<br>
@@ -239,14 +239,14 @@ public:<br>
}<br>
<br>
const PLT0Atom *getPLT0() {<br>
- if (_PLT0)<br>
- return _PLT0;<br>
- _PLT0 = new (_file._alloc) HexagonPLT0Atom(_file);<br>
- _PLT0->addReferenceELF_Hexagon(R_HEX_B32_PCREL_X, 0, _got0, 0);<br>
- _PLT0->addReferenceELF_Hexagon(R_HEX_6_PCREL_X, 4, _got0, 4);<br>
+ if (_plt0)<br>
+ return _plt0;<br>
+ _plt0 = new (_file._alloc) HexagonPLT0Atom(_file);<br>
+ _plt0->addReferenceELF_Hexagon(R_HEX_B32_PCREL_X, 0, _got0, 0);<br>
+ _plt0->addReferenceELF_Hexagon(R_HEX_6_PCREL_X, 4, _got0, 4);<br>
DEBUG_WITH_TYPE("PLT", llvm::dbgs() << "[ PLT0/GOT0 ] "<br>
<< "Adding plt0/got0 \n");<br>
- return _PLT0;<br>
+ return _plt0;<br>
}<br>
<br>
const PLTAtom *getPLTEntry(const Atom *a) {<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp?rev=233737&r1=233736&r2=233737&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp?rev=233737&r1=233736&r2=233737&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp (original)<br>
+++ lld/trunk/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.cpp Tue Mar 31 14:33:25 2015<br>
@@ -244,7 +244,7 @@ protected:<br>
<br>
public:<br>
RelocationPass(const ELFLinkingContext &ctx)<br>
- : _file(ctx), _ctx(ctx), _null(nullptr), _PLT0(nullptr), _got0(nullptr),<br>
+ : _file(ctx), _ctx(ctx), _null(nullptr), _plt0(nullptr), _got0(nullptr),<br>
_got1(nullptr) {}<br>
<br>
/// \brief Do the pass.<br>
@@ -264,9 +264,9 @@ public:<br>
<br>
// Add all created atoms to the link.<br>
uint64_t ordinal = 0;<br>
- if (_PLT0) {<br>
- _PLT0->setOrdinal(ordinal++);<br>
- mf->addAtom(*_PLT0);<br>
+ if (_plt0) {<br>
+ _plt0->setOrdinal(ordinal++);<br>
+ mf->addAtom(*_plt0);<br>
}<br>
for (auto &plt : _pltVector) {<br>
plt->setOrdinal(ordinal++);<br>
@@ -276,7 +276,7 @@ public:<br>
_null->setOrdinal(ordinal++);<br>
mf->addAtom(*_null);<br>
}<br>
- if (_PLT0) {<br>
+ if (_plt0) {<br>
_got0->setOrdinal(ordinal++);<br>
_got1->setOrdinal(ordinal++);<br>
mf->addAtom(*_got0);<br>
@@ -327,7 +327,7 @@ protected:<br>
/// \brief The got and plt entries for .PLT0. This is used to call into the<br>
/// dynamic linker for symbol resolution.<br>
/// @{<br>
- PLT0Atom *_PLT0;<br>
+ PLT0Atom *_plt0;<br>
GOTAtom *_got0;<br>
GOTAtom *_got1;<br>
/// @}<br>
@@ -379,20 +379,20 @@ public:<br>
: RelocationPass(ctx) {}<br>
<br>
const PLT0Atom *getPLT0() {<br>
- if (_PLT0)<br>
- return _PLT0;<br>
+ if (_plt0)<br>
+ return _plt0;<br>
// Fill in the null entry.<br>
getNullGOT();<br>
- _PLT0 = new (_file._alloc) X86_64PLT0Atom(_file);<br>
+ _plt0 = new (_file._alloc) X86_64PLT0Atom(_file);<br>
_got0 = new (_file._alloc) X86_64GOTAtom(_file, ".got.plt");<br>
_got1 = new (_file._alloc) X86_64GOTAtom(_file, ".got.plt");<br>
- _PLT0->addReferenceELF_x86_64(R_X86_64_PC32, 2, _got0, -4);<br>
- _PLT0->addReferenceELF_x86_64(R_X86_64_PC32, 8, _got1, -4);<br>
+ _plt0->addReferenceELF_x86_64(R_X86_64_PC32, 2, _got0, -4);<br>
+ _plt0->addReferenceELF_x86_64(R_X86_64_PC32, 8, _got1, -4);<br>
#ifndef NDEBUG<br>
_got0->_name = "__got0";<br>
_got1->_name = "__got1";<br>
#endif<br>
- return _PLT0;<br>
+ return _plt0;<br>
}<br>
<br>
const PLTAtom *getPLTEntry(const Atom *a) {<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">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/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>