Sane output from offset dumper

develop
Petr Mrázek 2010-08-28 12:47:33 +02:00
parent 1238235573
commit 2703d74fbd
2 changed files with 70 additions and 21 deletions

@ -81,7 +81,47 @@ namespace DFHack
uint32_t type_offset; // offset of type data for multiclass uint32_t type_offset; // offset of type data for multiclass
std::vector<t_type *> subs; std::vector<t_type *> subs;
}; };
class indentr
{
public:
friend std::basic_ostream<char>& operator <<(std::basic_ostream<char>&, const indentr &);
indentr(int ns = 0, int size = 4)
{
numspaces = ns;
step = size;
}
void indent ()
{
numspaces += step;
if (numspaces < 0) numspaces = 0;
}
void unindent ()
{
numspaces -= step;
if (numspaces < 0) numspaces = 0;
}
int get ()
{
return numspaces;
}
void set (int ns)
{
numspaces = ns;
if (numspaces < 0) numspaces = 0;
}
private:
int step;
int numspaces;
};
std::basic_ostream<char>& operator<< (std::basic_ostream<char>& os, const indentr & idtr)
{
for(int i = 0; i < idtr.numspaces ;i++)
{
os << ' ';
} }
return os;
}
};
/* /*
* Private data * Private data
@ -311,38 +351,41 @@ std::string OffsetGroup::getFullName()
return accum; return accum;
} }
std::string OffsetGroup::PrintOffsets() std::string OffsetGroup::PrintOffsets(int indentation)
{ {
uint32_Iter iter; uint32_Iter iter;
ostringstream ss; ostringstream ss;
indentr i(indentation);
for(iter = OGd->addresses.begin(); iter != OGd->addresses.end(); iter++) for(iter = OGd->addresses.begin(); iter != OGd->addresses.end(); iter++)
{ {
if((*iter).second.first) if((*iter).second.first)
ss << "<Address name=\"" << (*iter).first << "\" value=\"" << hex << "0x" << (*iter).second.second << "\" />" << endl; ss << i << "<Address name=\"" << (*iter).first << "\" value=\"" << hex << "0x" << (*iter).second.second << "\" />" << endl;
} }
int32_Iter iter2; int32_Iter iter2;
for(iter2 = OGd->offsets.begin(); iter2 != OGd->offsets.end(); iter2++) for(iter2 = OGd->offsets.begin(); iter2 != OGd->offsets.end(); iter2++)
{ {
if((*iter).second.first) if((*iter2).second.first)
ss << "<Offset name=\"" << (*iter2).first << "\" value=\"" << hex << "0x" << (*iter2).second.second <<"\" />" << endl; ss << i << "<Offset name=\"" << (*iter2).first << "\" value=\"" << hex << "0x" << (*iter2).second.second <<"\" />" << endl;
} }
for(iter = OGd->hexvals.begin(); iter != OGd->hexvals.end(); iter++) for(iter = OGd->hexvals.begin(); iter != OGd->hexvals.end(); iter++)
{ {
if((*iter).second.first) if((*iter).second.first)
ss << "<HexValue name=\"" << (*iter).first << "\" value=\"" << hex << "0x" << (*iter).second.second <<"\" />" << endl; ss << i << "<HexValue name=\"" << (*iter).first << "\" value=\"" << hex << "0x" << (*iter).second.second <<"\" />" << endl;
} }
strings_Iter iter3; strings_Iter iter3;
for(iter3 = OGd->strings.begin(); iter3 != OGd->strings.end(); iter3++) for(iter3 = OGd->strings.begin(); iter3 != OGd->strings.end(); iter3++)
{ {
if((*iter3).second.first) if((*iter3).second.first)
ss << "<String name=\"" << (*iter3).first << "\" value=\"" << (*iter3).second.second <<"\" />" << endl; ss << i << "<String name=\"" << (*iter3).first << "\" value=\"" << (*iter3).second.second <<"\" />" << endl;
} }
groups_Iter iter4; groups_Iter iter4;
for(iter4 = OGd->groups.begin(); iter4 != OGd->groups.end(); iter4++) for(iter4 = OGd->groups.begin(); iter4 != OGd->groups.end(); iter4++)
{ {
ss << "<Group name=\"" << (*iter4).first << "\">" << endl; ss << i << "<Group name=\"" << (*iter4).first << "\">" << endl;
ss <<(*iter4).second->PrintOffsets(); i.indent();
ss << "</Group>" << endl; ss <<(*iter4).second->PrintOffsets(i.get());
i.unindent();
ss << i << "</Group>" << endl;
} }
return ss.str(); return ss.str();
} }
@ -959,26 +1002,31 @@ std::string VersionInfo::getMood(const uint32_t moodID)
throw Error::MissingMemoryDefinition("Mood", moodID); throw Error::MissingMemoryDefinition("Mood", moodID);
} }
std::string VersionInfo::PrintOffsets() std::string VersionInfo::PrintOffsets()
{ {
ostringstream ss; ostringstream ss;
ss << "<Version name=\"" << getVersion() << "\">" << endl; indentr i;
ss << i << "<Version name=\"" << getVersion() << "\">" << endl;
i.indent();
switch (getOS()) switch (getOS())
{ {
case OS_LINUX: case OS_LINUX:
ss << "<MD5 value=\"" << getMD5() << "\" />" << endl; ss << i << "<MD5 value=\"" << getMD5() << "\" />" << endl;
break; break;
case OS_WINDOWS: case OS_WINDOWS:
ss << "<PETimeStamp value=\"" << hex << "0x" << getPE() << "\" />" << endl; ss << i << "<PETimeStamp value=\"" << hex << "0x" << getPE() << "\" />" << endl;
ss << "<MD5 value=\"" << getMD5() << "\" />" << endl; ss << i << "<MD5 value=\"" << getMD5() << "\" />" << endl;
break; break;
default: default:
ss << " UNKNOWN" << endl; ss << i << " UNKNOWN" << endl;
} }
ss << "<Offsets>" << endl; ss << i << "<Offsets>" << endl;
ss << OffsetGroup::PrintOffsets(); i.indent();
ss << "</Offsets>" << endl; ss << OffsetGroup::PrintOffsets(i.get());
ss << "</Version>" << endl; i.unindent();
ss << i << "</Offsets>" << endl;
i.unindent();
ss << i << "</Version>" << endl;
ss << endl;
return ss.str(); return ss.str();
} }

@ -36,6 +36,7 @@ namespace DFHack
* Stubs * Stubs
*/ */
class Process; class Process;
class XMLPP;
struct t_class; struct t_class;
class VersionInfoPrivate; class VersionInfoPrivate;
class OffsetGroupPrivate; class OffsetGroupPrivate;
@ -71,7 +72,7 @@ namespace DFHack
void setAddress (const std::string & key, const std::string & value); void setAddress (const std::string & key, const std::string & value);
void setHexValue (const std::string & key, const std::string & value); void setHexValue (const std::string & key, const std::string & value);
void setString (const std::string & key, const std::string & value); void setString (const std::string & key, const std::string & value);
std::string PrintOffsets(); std::string PrintOffsets(int indentation);
std::string getName(); std::string getName();
std::string getFullName(); std::string getFullName();
OffsetGroup * getParent(); OffsetGroup * getParent();