diff options
author | bxing <bxing@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-04-13 08:19:54 +0000 |
---|---|---|
committer | bxing <bxing@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-04-13 08:19:54 +0000 |
commit | df13cebafa37f6b1e78157ad1b93de69fb0f34dd (patch) | |
tree | f718e8412b205d84e38f856df5700875bbe367d5 /Tools/CCode | |
parent | 7a743ae481bfaf8ec3a8ae3840835184f9a37fd9 (diff) | |
download | edk2-df13cebafa37f6b1e78157ad1b93de69fb0f34dd.tar.gz edk2-df13cebafa37f6b1e78157ad1b93de69fb0f34dd.tar.bz2 edk2-df13cebafa37f6b1e78157ad1b93de69fb0f34dd.zip |
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
Diffstat (limited to 'Tools/CCode')
-rw-r--r-- | Tools/CCode/Source/GenFvMap/GenFvMap.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Tools/CCode/Source/GenFvMap/GenFvMap.cpp b/Tools/CCode/Source/GenFvMap/GenFvMap.cpp index 8c8910cc82..27a2180b91 100644 --- 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;
istringstream is(strSymbol);
- is >> strAddress >> strName >> getUINT64(ullRva) >> strFrom;
+ is >> strAddress >> strName >> hex >> getUINT64(ullRva) >> strFrom;
if (strFrom == "f")
{
bFunction = true;
@@ -569,14 +569,14 @@ CFvMap::~CFvMap() delete *i;
}
-class CFvMapFormatter : public CObjRoot
+class CFvMapGenerator : public CObjRoot
{
public:
- CFvMapFormatter(const IFirmwareVolume *pFv) : m_pFv(pFv) {}
- CFvMapFormatter(const CFvMapFormatter& r) : m_pFv(r.m_pFv) {}
+ CFvMapGenerator(const IFirmwareVolume *pFv) : m_pFv(pFv) {}
+ CFvMapGenerator(const CFvMapGenerator& r) : m_pFv(r.m_pFv) {}
template <class _E, class _Tr>
- friend basic_ostream<_E, _Tr>& operator << (basic_ostream<_E, _Tr>&, CFvMapFormatter);
+ friend basic_ostream<_E, _Tr>& operator << (basic_ostream<_E, _Tr>&, CFvMapGenerator);
private:
static bool Less(const IModule*, const IModule*);
@@ -586,10 +586,10 @@ private: };
template <class _E, class _Tr>
-basic_ostream<_E, _Tr>& operator << (basic_ostream<_E, _Tr>& os, CFvMapFormatter fvMapFmt)
+basic_ostream<_E, _Tr>& operator << (basic_ostream<_E, _Tr>& os, CFvMapGenerator fvMapFmt)
{
vector<IModule*> rgMods(fvMapFmt.m_pFv->begin(), fvMapFmt.m_pFv->end());
- sort(rgMods.begin(), rgMods.end(), CFvMapFormatter::Less);
+ sort(rgMods.begin(), rgMods.end(), CFvMapGenerator::Less);
for (vector<IModule*>::iterator i = rgMods.begin(); i != rgMods.end(); i++)
{
os << (*i)->strName << hex << " (BaseAddress=" << putUINT64((*i)->BaseAddress());
@@ -611,7 +611,7 @@ basic_ostream<_E, _Tr>& operator << (basic_ostream<_E, _Tr>& os, CFvMapFormatter return os;
}
-bool CFvMapFormatter::Less(const IModule *pModL, const IModule *pModR)
+bool CFvMapGenerator::Less(const IModule *pModL, const IModule *pModR)
{
return pModL->BaseAddress() < pModR->BaseAddress();
}
@@ -641,7 +641,7 @@ int CApplication::Run(void) CMapFileSetFromInfFile mapSet(m_ppszArg[2]);
ofstream ofs(m_ppszArg[3]);
CFvMap fvMap(&ffsSet, &mapSet);
- ofs << CFvMapFormatter(&fvMap);
+ ofs << CFvMapGenerator(&fvMap);
return 0;
}
|