Fixed bug of incorrect processing of hexadecimal numbers.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2567 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/CCode/Source/GenFvMap/GenFvMap.cpp b/Tools/CCode/Source/GenFvMap/GenFvMap.cpp
index 8c8910cc820767a6b10a25101c46d6c3589f0d8b..27a2180b91fd6812d46e5bc65481727a0930034f 100644 (file)
--- a/Tools/CCode/Source/GenFvMap/GenFvMap.cpp
+++ b/Tools/CCode/Source/GenFvMap/GenFvMap.cpp
@@ -427,7 +427,7 @@ CSymbolFromString::CSymbolFromString(const string& strSymbol, bool b)
     bStatic = b;\r
 \r
     istringstream is(strSymbol);\r
-    is >> strAddress >> strName >> getUINT64(ullRva) >> strFrom;\r
+    is >> strAddress >> strName >> hex >> getUINT64(ullRva) >> strFrom;\r
     if (strFrom == "f")\r
     {\r
         bFunction = true;\r
@@ -569,14 +569,14 @@ CFvMap::~CFvMap()
         delete *i;\r
 }\r
 \r
-class CFvMapFormatter : public CObjRoot\r
+class CFvMapGenerator : public CObjRoot\r
 {\r
 public:\r
-    CFvMapFormatter(const IFirmwareVolume *pFv) : m_pFv(pFv) {}\r
-    CFvMapFormatter(const CFvMapFormatter& r) : m_pFv(r.m_pFv) {}\r
+    CFvMapGenerator(const IFirmwareVolume *pFv) : m_pFv(pFv) {}\r
+    CFvMapGenerator(const CFvMapGenerator& r) : m_pFv(r.m_pFv) {}\r
 \r
     template <class _E, class _Tr>\r
-    friend basic_ostream<_E, _Tr>& operator << (basic_ostream<_E, _Tr>&, CFvMapFormatter);\r
+    friend basic_ostream<_E, _Tr>& operator << (basic_ostream<_E, _Tr>&, CFvMapGenerator);\r
 \r
 private:\r
     static bool Less(const IModule*, const IModule*);\r
@@ -586,10 +586,10 @@ private:
 };\r
 \r
 template <class _E, class _Tr>\r
-basic_ostream<_E, _Tr>& operator << (basic_ostream<_E, _Tr>& os, CFvMapFormatter fvMapFmt)\r
+basic_ostream<_E, _Tr>& operator << (basic_ostream<_E, _Tr>& os, CFvMapGenerator fvMapFmt)\r
 {\r
     vector<IModule*> rgMods(fvMapFmt.m_pFv->begin(), fvMapFmt.m_pFv->end());\r
-    sort(rgMods.begin(), rgMods.end(), CFvMapFormatter::Less);\r
+    sort(rgMods.begin(), rgMods.end(), CFvMapGenerator::Less);\r
     for (vector<IModule*>::iterator i = rgMods.begin(); i != rgMods.end(); i++)\r
     {\r
         os << (*i)->strName << hex << " (BaseAddress=" << putUINT64((*i)->BaseAddress());\r
@@ -611,7 +611,7 @@ basic_ostream<_E, _Tr>& operator << (basic_ostream<_E, _Tr>& os, CFvMapFormatter
     return os;\r
 }\r
 \r
-bool CFvMapFormatter::Less(const IModule *pModL, const IModule *pModR)\r
+bool CFvMapGenerator::Less(const IModule *pModL, const IModule *pModR)\r
 {\r
     return pModL->BaseAddress() < pModR->BaseAddress();\r
 }\r
@@ -641,7 +641,7 @@ int CApplication::Run(void)
     CMapFileSetFromInfFile mapSet(m_ppszArg[2]);\r
     ofstream ofs(m_ppszArg[3]);\r
     CFvMap fvMap(&ffsSet, &mapSet);\r
-    ofs << CFvMapFormatter(&fvMap);\r
+    ofs << CFvMapGenerator(&fvMap);\r
     return 0;\r
 }\r
 \r