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
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
};\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
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
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