[lld] r200512 - Replace magic numbers with enums.

[Rui Ueyama]

Author: ruiu
Date: Thu Jan 30 22:57:03 2014
New Revision: 200512

URL: http://llvm.org/viewvc/llvm-project?rev=200512&view=rev
Log:
Replace magic numbers with enums.

Modified:
    lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h
    lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp

Modified: lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h?rev=200512&r1=200511&r2=200512&view=diff
==============================================================================
--- lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h (original)
+++ lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h Thu Jan 30 22:57:03 2014
@@ -250,7 +250,11 @@ protected:
   virtual std::unique_ptr<File> createUndefinedSymbolFile() const;
 
 private:
-  enum { invalidBaseAddress = UINT64_MAX };
+  enum {
+    invalidBaseAddress = UINT64_MAX,
+    pe32DefaultBaseAddress = 0x400000UL,
+    pe32PlusDefaultBaseAddress = 0x140000000UL
+ };
 
   // The start address for the program. The default value for the executable is
   // 0x400000, but can be altered using /base command line option.

Modified: lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp?rev=200512&r1=200511&r2=200512&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp Thu Jan 30 22:57:03 2014
@@ -203,7 +203,7 @@ StringRef PECOFFLinkingContext::undecora
 
 uint64_t PECOFFLinkingContext::getBaseAddress() const {
   if (_baseAddress == invalidBaseAddress)
-    return is64Bit() ? 0x140000000UL : 0x400000UL;
+    return is64Bit() ? pe32PlusDefaultBaseAddress : pe32DefaultBaseAddress;
   return _baseAddress;
 }