MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tomprince/dfhack

develop
Petr Mrázek 2011-03-03 16:56:38 +01:00
parent 552180d430 f28a29d29d
commit 680fe2981e
15 changed files with 64 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/DFProcess-linux-SHM.cpp
Unescape Escape View File

@ -268,7 +268,7 @@ void SHMProcess::getMemRanges( vector<t_memrange> & ranges )
char buffer[1024];
char permissions[5]; // r/-, w/-, x/-, p/s, 0
sprintf(buffer, "/proc/%lu/maps", d->process_ID);
sprintf(buffer, "/proc/%lu/maps", (long unsigned)d->process_ID);
FILE *mapFile = ::fopen(buffer, "r");
uint64_t offset, device1, device2, node;
@ -276,7 +276,7 @@ void SHMProcess::getMemRanges( vector<t_memrange> & ranges )
{
t_memrange temp;
temp.name[0] = 0;
sscanf(buffer, "%llx-%llx %s %llx %2llu:%2llu %llu %s",
sscanf(buffer, "%zx-%zx %s %zx %2zu:%2zu %zu %s",
&temp.start,
&temp.end,
(char*)&permissions,

4
library/DFProcess-linux-base.cpp
Unescape Escape View File

@ -81,7 +81,7 @@ void LinuxProcessBase::getMemRanges( vector<t_memrange> & ranges )
char buffer[1024];
char permissions[5]; // r/-, w/-, x/-, p/s, 0
sprintf(buffer, "/proc/%lu/maps", my_pid);
sprintf(buffer, "/proc/%lu/maps", (long unsigned)my_pid);
FILE *mapFile = ::fopen(buffer, "r");
uint64_t offset, device1, device2, node;
@ -89,7 +89,7 @@ void LinuxProcessBase::getMemRanges( vector<t_memrange> & ranges )
{
t_memrange temp;
temp.name[0] = 0;
sscanf(buffer, "%llx-%llx %s %llx %2llu:%2llu %llu %s",
sscanf(buffer, "%zx-%zx %s %zx %2zu:%2zu %zu %s",
&temp.start,
&temp.end,
(char*)&permissions,

21
library/include/dfhack/DFMiscUtils.h
Unescape Escape View File

@ -145,61 +145,42 @@ std::string PrintSplatterType (int16_t mat1, int32_t mat2, vector<DFHack::t_matg
{
case 0:
return "Rock";
break;
case 1:
return "Amber";
break;
case 2:
return "Coral";
break;
case 3:
return "Green Glass";
break;
case 4:
return "Clear Glass";
break;
case 5:
return "Crystal Glass";
break;
case 6:
return "Ice";
break;
case 7:
return "Coal";
break;
case 8:
return "Potash";
break;
case 9:
return "Ash";
break;
case 10:
return "Pearlash";
break;
case 11:
return "Lye";
break;
case 12:
return "Mud";
break;
case 13:
return "Vomit";
break;
case 14:
return "Salt";
break;
case 15:
return "Filth";
break;
case 16:
return "Frozen? Filth";
break;
case 18:
return "Grime";
break;
case 0xF2:
return "Very Specific Blood (references a named creature)";
break;
case 0x2A:
case 0x2B:
if(mat2 != -1)
@ -209,10 +190,8 @@ std::string PrintSplatterType (int16_t mat1, int32_t mat2, vector<DFHack::t_matg
}
ret += "Blood";
return ret;
break;
default:
return "Unknown";
break;
}
}
#endif

8
library/include/dfhack/modules/Maps.h
Unescape Escape View File

@ -23,13 +23,7 @@ namespace DFHack
feature_Hell_Temple
};
static const char * sa_feature[]=
{
(char*)"Other",
(char*)"Adamantine Tube",
(char*)"Underworld",
(char*)"Hell Temple"
};
extern const char * sa_feature[];
/// used as a key for the local feature map. combines X an Y coords.
union planecoord

10
library/modules/Maps.cpp
Unescape Escape View File

@ -41,6 +41,14 @@ distribution.
#define MAPS_GUARD if(!d->Started) throw DFHack::Error::ModuleNotInitialized();
using namespace DFHack;
const char * sa_feature[]=
{
"Other",
"Adamantine Tube",
"Underworld",
"Hell Temple"
};
struct Maps::Private
{
uint32_t * block;
@ -945,4 +953,4 @@ bool Maps::ReadVegetation(uint32_t x, uint32_t y, uint32_t z, std::vector<t_tree
}
if(plants->empty()) return false;
return true;
}
}

18
tools/supported/SegmentedFinder.h
Unescape Escape View File

@ -95,21 +95,21 @@ class SegmentedFinder
SegmentedFinder(vector <DFHack::t_memrange>& ranges, DFHack::Context * DF)
{
_DF = DF;
for(int i = 0; i < ranges.size(); i++)
for(size_t i = 0; i < ranges.size(); i++)
{
segments.push_back(new SegmentFinder(ranges[i], DF, this));
}
}
~SegmentedFinder()
{
for(int i = 0; i < segments.size(); i++)
for(size_t i = 0; i < segments.size(); i++)
{
delete segments[i];
}
}
SegmentFinder * getSegmentForAddress (uint64_t addr)
{
for(int i = 0; i < segments.size(); i++)
for(size_t i = 0; i < segments.size(); i++)
{
if(segments[i]->mr_.isInRange(addr))
{
@ -122,7 +122,7 @@ class SegmentedFinder
bool Find (const needleType needle, const uint8_t increment, vector <uint64_t> &found, comparator oper)
{
found.clear();
for(int i = 0; i < segments.size(); i++)
for(size_t i = 0; i < segments.size(); i++)
{
segments[i]->Find<needleType,hayType,comparator>(needle, increment, found, oper);
}
@ -144,7 +144,7 @@ class SegmentedFinder
bool Filter (const needleType needle, vector <uint64_t> &found, comparator oper)
{
vector <uint64_t> newfound;
for(int i = 0; i < segments.size(); i++)
for(size_t i = 0; i < segments.size(); i++)
{
segments[i]->Filter<needleType,hayType,comparator>(needle, found, newfound, oper);
}
@ -169,7 +169,7 @@ class SegmentedFinder
template <typename T>
T * Translate(uint64_t address)
{
for(int i = 0; i < segments.size(); i++)
for(size_t i = 0; i < segments.size(); i++)
{
if(segments[i]->mr_.isInRange(address))
{
@ -227,7 +227,6 @@ bool vectorLength (SegmentedFinder* s, vecTriplet *x, Needle &y)
bool vectorString (SegmentedFinder* s, vecTriplet *x, const char *y)
{
uint32_t object_ptr;
uint32_t idx = x->start;
// iterate over vector of pointers
for(uint32_t idx = x->start; idx < x->finish; idx += sizeof(uint32_t))
{
@ -287,7 +286,6 @@ bool vectorAddrWithin (SegmentedFinder* s, vecTriplet *x, uint32_t address)
bool vectorOfPtrWithin (SegmentedFinder* s, vecTriplet *x, uint32_t address)
{
uint32_t object_ptr;
uint32_t idx = x->start;
for(uint32_t idx = x->start; idx < x->finish; idx += sizeof(uint32_t))
{
if(!s->Read(idx,object_ptr))
@ -405,7 +403,7 @@ std::ostream& operator<< ( std::ostream& out, Bytestream& bs )
if(bs.d->object)
{
out << "bytestream " << dec << bs.d->length << "/" << bs.d->allocated << " bytes" << endl;
for(int i = 0; i < bs.d->length; i++)
for(size_t i = 0; i < bs.d->length; i++)
{
out << hex << (int) ((uint8_t *) bs.d->object)[i] << " ";
}
@ -535,4 +533,4 @@ bool findStrBuffer (SegmentedFinder* s, uint32_t *addr, const char * compare )
return false;
}
#endif // SEGMENTED_FINDER_H
#endif // SEGMENTED_FINDER_H

14
tools/supported/autosearch.cpp
Unescape Escape View File

@ -235,7 +235,7 @@ public:
virtual bool LoadData(SegmentedFinder* s)
{
bool OK = true;
for(int i = 0; i < members.size() && OK; i++)
for(size_t i = 0; i < members.size() && OK; i++)
OK &= members[i]->LoadData(s);
return OK;
};
@ -333,7 +333,7 @@ bool getRanges(DFHack::Process * p, vector <DFHack::t_memrange>& selected_ranges
selected_ranges.clear();
p->getMemRanges(ranges);
cout << "Which range to search? (default is 1-4)" << endl;
for(int i = 0; i< ranges.size();i++)
for(size_t i = 0; i< ranges.size();i++)
{
cout << dec << "(" << i << ") ";
printRange(&(ranges[i]));
@ -452,7 +452,7 @@ struct tilecolors
void printFound(vector <uint64_t> &found, const char * what)
{
cout << what << ":" << endl;
for(int i = 0; i < found.size();i++)
for(size_t i = 0; i < found.size();i++)
{
cout << hex << "0x" << found[i] << endl;
}
@ -461,7 +461,7 @@ void printFound(vector <uint64_t> &found, const char * what)
void printFoundStrVec(vector <uint64_t> &found, const char * what, SegmentedFinder & s)
{
cout << what << ":" << endl;
for(int i = 0; i < found.size();i++)
for(size_t i = 0; i < found.size();i++)
{
cout << hex << "0x" << found[i] << endl;
cout << "--------------------------" << endl;
@ -534,8 +534,9 @@ String * TokenFactory::Build()
case DFHack::OS_LINUX:
case DFHack::OS_APPLE:
return new LinuxString();
case DFHack::OS_BAD:
return 0;
}
return 0;
};
template <>
String * TokenFactory::Build(uint64_t offset)
@ -547,8 +548,9 @@ String * TokenFactory::Build(uint64_t offset)
case DFHack::OS_LINUX:
case DFHack::OS_APPLE:
return new LinuxString(offset);
case DFHack::OS_BAD:
return 0;
}
return 0;
};
void autoSearch(DFHack::Context * DF, vector <DFHack::t_memrange>& ranges, DFHack::OSType platform)

4
tools/supported/cleanmap.cpp
Unescape Escape View File

@ -22,8 +22,6 @@ int main (int argc, char** argv)
}
uint32_t x_max,y_max,z_max;
uint32_t num_blocks = 0;
uint32_t bytes_read = 0;
vector<DFHack::t_spattervein> splatter;
DFHack::ContextManager DFMgr("Memory.xml");
@ -54,7 +52,7 @@ int main (int argc, char** argv)
Mapz->getSize(x_max,y_max,z_max);
uint8_t zeroes [16][16] = {0};
uint8_t zeroes [16][16] = {{0}};
DFHack::occupancies40d occ;
// walk the map

3
tools/supported/cleartask.cpp
Unescape Escape View File

@ -32,7 +32,6 @@ int main ()
return 1;
}
DFHack::VersionInfo * mem = DF->getMemoryInfo();
p = DF->getProcess();
uint32_t item_vec_offset = 0;
try
@ -70,4 +69,4 @@ int main ()
cin.ignore();
#endif
return 0;
}
}

23
tools/supported/incrementalsearch.cpp
Unescape Escape View File

@ -33,7 +33,7 @@ bool getRanges(DFHack::Process * p, vector <DFHack::t_memrange>& selected_ranges
selected_ranges.clear();
p->getMemRanges(ranges);
cout << "Which range to search? (default is 1-4)" << endl;
for(int i = 0; i< ranges.size();i++)
for(size_t i = 0; i< ranges.size();i++)
{
cout << dec << "(" << i << ") ";
printRange(&(ranges[i]));
@ -161,10 +161,10 @@ bool Incremental ( vector <uint64_t> &found, const char * what, T& output,
cout << ">>";
std::getline(cin, select);
size_t num = 0;
if( sscanf(select.c_str(),"p %d", &num) && num > 0)
if( sscanf(select.c_str(),"p %zd", &num) && num > 0)
{
cout << "Found "<< plural <<":" << endl;
for(int i = 0; i < min(found.size(), num);i++)
for(size_t i = 0; i < min(found.size(), num);i++)
{
cout << hex << "0x" << found[i] << endl;
}
@ -173,7 +173,7 @@ bool Incremental ( vector <uint64_t> &found, const char * what, T& output,
else if(select == "p")
{
cout << "Found "<< plural <<":" << endl;
for(int i = 0; i < found.size();i++)
for(size_t i = 0; i < found.size();i++)
{
cout << hex << "0x" << found[i] << endl;
}
@ -424,10 +424,10 @@ bool TriggerIncremental ( vector <uint64_t> &found )
cout << ">>";
std::getline(cin, select);
size_t num = 0;
if( sscanf(select.c_str(),"p %d", &num) && num > 0)
if( sscanf(select.c_str(),"p %zd", &num) && num > 0)
{
cout << "Found coords:" << endl;
for(int i = 0; i < min(found.size(), num);i++)
for(size_t i = 0; i < min(found.size(), num);i++)
{
cout << hex << "0x" << found[i] << endl;
}
@ -436,7 +436,7 @@ bool TriggerIncremental ( vector <uint64_t> &found )
else if(select == "p")
{
cout << "Found coords:" << endl;
for(int i = 0; i < found.size();i++)
for(size_t i = 0; i < found.size();i++)
{
cout << hex << "0x" << found[i] << endl;
}
@ -606,7 +606,7 @@ void DataPtrTrace(DFHack::ContextManager & DFMgr, vector <DFHack::t_memrange>& r
void printFound(vector <uint64_t> &found, const char * what)
{
cout << what << ":" << endl;
for(int i = 0; i < found.size();i++)
for(size_t i = 0; i < found.size();i++)
{
cout << hex << "0x" << found[i] << endl;
}
@ -615,7 +615,7 @@ void printFound(vector <uint64_t> &found, const char * what)
void printFoundStrVec(vector <uint64_t> &found, const char * what, SegmentedFinder & s)
{
cout << what << ":" << endl;
for(int i = 0; i < found.size();i++)
for(size_t i = 0; i < found.size();i++)
{
cout << hex << "0x" << found[i] << endl;
cout << "--------------------------" << endl;
@ -719,7 +719,7 @@ void autoSearch(DFHack::Context * DF, vector <DFHack::t_memrange>& ranges)
sf.Filter<const char * ,vecTriplet>("DWARF",to_filter, vectorStringFirst);
// verify
for(int i = 0; i < to_filter.size(); i++)
for(size_t i = 0; i < to_filter.size(); i++)
{
vecTriplet * vec = sf.Translate<vecTriplet>(to_filter[i]);
if(((vec->finish - vec->start) / 4) == 4) // verified
@ -909,9 +909,6 @@ int main (void)
vector <DFHack::t_memrange> selected_ranges;
getRanges(p,selected_ranges);
DFHack::VersionInfo *minfo = DF->getMemoryInfo();
DFHack::OSType os = minfo->getOS();
string prompt =
"Select search type: 1=number(default), 2=vector by length, 3=vector>object>string,\n"
" 4=string, 5=automated offset search, 6=vector by address in its array,\n"

19
tools/supported/probe.cpp
Unescape Escape View File

@ -18,7 +18,9 @@ int main (int numargs, const char ** args)
DFHack::ContextManager DFMgr("Memory.xml");
DFHack::Context *DF = DFMgr.getSingleContext();
BEGIN_PROBE:
#ifndef LINUX_BUILD
BEGIN_PROBE:
#endif
try
{
DF->Attach();
@ -39,17 +41,13 @@ int main (int numargs, const char ** args)
DFHack::Process * p = DF->getProcess();
OffsetGroup *mapsg = mem->getGroup("Maps");
OffsetGroup *mapblockg = mapsg->getGroup("block");
OffsetGroup *localfeatg = mapsg->getGroup("features")->getGroup("local");
uint32_t region_x_offset = mapsg->getAddress("region_x");
uint32_t region_y_offset = mapsg->getAddress("region_y");
uint32_t region_z_offset = mapsg->getAddress("region_z");
uint32_t designatus = mapblockg->getOffset("designation");
uint32_t block_feature1 = mapblockg->getOffset("feature_local");
uint32_t block_feature2 = mapblockg->getOffset("feature_global");
uint32_t feature1_start_ptr = localfeatg->getAddress("start_ptr");
int32_t regionX, regionY, regionZ;
// read position of the region inside DF world
@ -80,7 +78,6 @@ int main (int numargs, const char ** args)
printf("block addr: 0x%x\n", block.origin);
int16_t tiletype = block.tiletypes[tileX][tileY];
naked_designation &des = block.designation[tileX][tileY].bits;
uint32_t &desw = block.designation[tileX][tileY].whole;
print_bits<uint32_t>(block.designation[tileX][tileY].whole,std::cout);
std::cout << endl;
print_bits<uint32_t>(block.occupancy[tileX][tileY].whole,std::cout);
@ -91,11 +88,11 @@ int main (int numargs, const char ** args)
if(tileTypeTable[tiletype].name)
std::cout << " = " << tileTypeTable[tiletype].name << std::endl;
printf("%-10s: %4d %s\n","Class",tileTypeTable[tiletype].c,TileClassString[ tileTypeTable[tiletype].c ] , 0);
printf("%-10s: %4d %s\n","Material",tileTypeTable[tiletype].c,TileMaterialString[ tileTypeTable[tiletype].m ] , 0);
printf("%-10s: %4d %s\n","Special",tileTypeTable[tiletype].c,TileSpecialString[ tileTypeTable[tiletype].s ] , 0);
printf("%-10s: %4d\n","Variant",tileTypeTable[tiletype].v , 0);
printf("%-10s: %s\n","Direction",tileTypeTable[tiletype].d.getStr() , 0);
printf("%-10s: %4d %s\n","Class",tileTypeTable[tiletype].c,TileClassString[ tileTypeTable[tiletype].c ]);
printf("%-10s: %4d %s\n","Material",tileTypeTable[tiletype].c,TileMaterialString[ tileTypeTable[tiletype].m ]);
printf("%-10s: %4d %s\n","Special",tileTypeTable[tiletype].c,TileSpecialString[ tileTypeTable[tiletype].s ]);
printf("%-10s: %4d\n","Variant",tileTypeTable[tiletype].v);
printf("%-10s: %s\n","Direction",tileTypeTable[tiletype].d.getStr());
std::cout << std::endl;

2
tools/supported/prospector.cpp
Unescape Escape View File

@ -309,7 +309,7 @@ int main (int argc, const char* argv[])
}
}
std::sort(matss.begin(), matss.end(), compare_pair_second<>());
for(int i = 0; i < matss.size();i++)
for(size_t i = 0; i < matss.size();i++)
{
if(matss[i].first >= Mats->inorganic.size())
{

2
tools/supported/reveal.cpp
Unescape Escape View File

@ -119,7 +119,7 @@ int main (void)
DF->Attach();
Maps = DF->getMaps();
Maps->Start();
for(int i = 0; i < hidesaved.size();i++)
for(size_t i = 0; i < hidesaved.size();i++)
{
hideblock & hb = hidesaved[i];
Maps->ReadDesignations(hb.x,hb.y,hb.z, &designations);

1
tools/supported/vdig.cpp
Unescape Escape View File

@ -306,7 +306,6 @@ int main (int argc, char* argv[])
uint32_t x_max,y_max,z_max;
DFHack::Maps * Maps = DF->getMaps();
DFHack::Materials * Mats = DF->getMaterials();
DFHack::Position * Pos = DF->getPosition();
// init the map

29
tools/supported/veinlook.cpp
Unescape Escape View File

@ -50,13 +50,13 @@ int gotoxy(int x, int y)
return 0;
}
int putch(int x, int y, int znak, int color)
void putch(int x, int y, int znak, int color)
{
attron(COLOR_PAIR(color));
mvwaddch(stdscr, y, x, znak);
attroff(COLOR_PAIR(color));
}
int putwch(int x, int y, int znak, int color)
void putwch(int x, int y, int znak, int color)
{
attron(COLOR_PAIR(color));
mvwaddch(stdscr, y, x, znak);
@ -88,7 +88,7 @@ int putwch(int x, int y, int znak, int color)
PEBBLES
};*/
int puttile(int x, int y, int tiletype, int color)
void puttile(int x, int y, int tiletype, int color)
{
unsigned int znak;
switch(tileTypeTable[tiletype].c)
@ -102,7 +102,7 @@ int puttile(int x, int y, int tiletype, int color)
mvwaddwstr(stdscr, y, x, L"\u2593");
attroff(COLOR_PAIR(color));
//znak = ;
return 0;
return;
case FORTIFICATION:
znak = '#';
break;
@ -119,12 +119,12 @@ int puttile(int x, int y, int tiletype, int color)
attron(COLOR_PAIR(color));
mvwaddwstr(stdscr, y, x, L"\u25B2");
attroff(COLOR_PAIR(color));
return 0;
return;
case RAMP_TOP:
attron(COLOR_PAIR(color));
mvwaddwstr(stdscr, y, x, L"\u25BC");
attroff(COLOR_PAIR(color));
return 0;
return;
case FLOOR:
znak = '.';
break;
@ -133,19 +133,19 @@ int puttile(int x, int y, int tiletype, int color)
attron(COLOR_PAIR(color));
mvwaddwstr(stdscr, y, x, L"\u2663");
attroff(COLOR_PAIR(color));
return 0;
return;
case SAPLING_DEAD:
case SAPLING_OK:
attron(COLOR_PAIR(color));
mvwaddwstr(stdscr, y, x, L"\u03C4");
attroff(COLOR_PAIR(color));
return 0;
return;
case SHRUB_DEAD:
case SHRUB_OK:
attron(COLOR_PAIR(color));
mvwaddwstr(stdscr, y, x, L"\u2666");
attroff(COLOR_PAIR(color));
return 0;
return;
case BOULDER:
case PEBBLES:
znak= '*';
@ -249,7 +249,7 @@ void hexdump (DFHack::Context* DF, uint32_t address, uint32_t length, int filenu
myfile.open (name.c_str());
DF->ReadRaw(address, reallength, (uint8_t *) buf);
for (int i = 0; i < lines; i++)
for (size_t i = 0; i < lines; i++)
{
// leading offset
myfile << "0x" << hex << setw(4) << i*16 << " ";
@ -483,7 +483,7 @@ void do_features(Context* DF, mapblock40d * block, uint32_t blockX, uint32_t blo
}
}
main(int argc, char *argv[])
int main(int argc, char *argv[])
{
/* initialize your non-curses data structures here */
@ -495,8 +495,6 @@ main(int argc, char *argv[])
cbreak(); /* take input chars one at a time, no wait for \n */
noecho(); /* don't echo input */
//nodelay(stdscr, true);
int wxMax = getmaxx(stdscr);
int wyMax = getmaxy(stdscr);
keypad(stdscr, TRUE);
scrollok(stdscr, TRUE);
@ -571,7 +569,6 @@ main(int argc, char *argv[])
hasmats = false;
}
Process* p = DF->getProcess();
// init the map
if(!Maps->Start())
{
@ -761,7 +758,6 @@ main(int argc, char *argv[])
Mats->ReadCreatureTypes();
}
}
uint32_t effectnum;
/*
if(DF.InitReadEffects(effectnum))
{
@ -950,7 +946,6 @@ main(int argc, char *argv[])
else if(vein < mineralsize + icesize + splattersize)
{
realvein = vein - mineralsize - icesize;
t_spattervein &bloodmud = splatter[realvein];
for(uint32_t yyy = 0; yyy < 16; yyy++)
{
for(uint32_t xxx = 0; xxx < 16; xxx++)
@ -1127,4 +1122,4 @@ static void finish(int sig)
cerr << error << endl;
}
exit(0);
}
}