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

0.31.06-SDL, needs testing

develop
Petr Mrázek 2010-06-10 10:30:56 +02:00
parent 9d143d8afb
commit 7885eb8e74
5 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
Unescape Escape View File

@ -1,3 +1,4 @@
INCLUDE(CPack)
# main project file. use it from a build sub-folder, see COMPILE for details # main project file. use it from a build sub-folder, see COMPILE for details
PROJECT (dfhack) PROJECT (dfhack)
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)

2
library/include/dfhack/DFContextManager.h
Unescape Escape View File

@ -126,6 +126,8 @@ namespace DFHack
*/ */
bool Contains(Process* p); bool Contains(Process* p);
// TODO: Add excise(Context *) method
/** /**
* Get the number of tracked invalid contexts. * Get the number of tracked invalid contexts.
* @return Number of tracked invalid contexts * @return Number of tracked invalid contexts

2
library/private/DFMemInfoManager.h
Unescape Escape View File

@ -40,8 +40,8 @@ namespace DFHack
// memory info entries loaded from a file // memory info entries loaded from a file
bool loadFile( string path_to_xml); bool loadFile( string path_to_xml);
bool isInErrorState() const {return error;}; bool isInErrorState() const {return error;};
private:
std::vector<memory_info*> meminfo; std::vector<memory_info*> meminfo;
private:
void ParseVTable(TiXmlElement* vtable, memory_info* mem); void ParseVTable(TiXmlElement* vtable, memory_info* mem);
void ParseEntry (TiXmlElement* entry, memory_info* mem, map <string ,TiXmlElement *>& knownEntries); void ParseEntry (TiXmlElement* entry, memory_info* mem, map <string ,TiXmlElement *>& knownEntries);
bool error; bool error;

28
output/Memory.xml
Unescape Escape View File

@ -1603,6 +1603,13 @@ map_data_1b60_offset 0x1B9c
<!--<Address name="creature_vector">0x1678704</Address> CHMOD--> <!--<Address name="creature_vector">0x1678704</Address> CHMOD-->
<Address name="dwarf_race_index">0x014abee4</Address> CHMOD <Address name="dwarf_race_index">0x014abee4</Address> CHMOD
<Address name="dwarf_civ_id">0x1471FB0</Address> BOGUS! <Address name="dwarf_civ_id">0x1471FB0</Address> BOGUS!
<Address name="window_dims">0x180b10c</Address> LOOKS O.K.
<Address name="window_x">0xe6c0dc</Address> VERIFIED
<Address name="window_y">0xe9a1b0</Address> VERIFIED
<Address name="window_z">0xe9a18c</Address> VERIFIED
<Address name="cursor_xyz">0xaf12cc</Address> VERIFIED
<Address name="current_tick">0xE80780</Address> LOOKS O.K.
<Address name="current_year">0xEB2878</Address> LOOKS O.K.
<!-- <!--
<Address name="mat_inorganics">0x16BD0B0</Address> <Address name="mat_inorganics">0x16BD0B0</Address>
<Address name="mat_organics_all">0x16BD0C8</Address> <Address name="mat_organics_all">0x16BD0C8</Address>
@ -1622,8 +1629,6 @@ map_data_1b60_offset 0x1B9c
<Address name="language_vector">0x016c539c</Address> CHMOD <Address name="language_vector">0x016c539c</Address> CHMOD
<Address name="translation_vector">0x016c53cc</Address> CHMOD <Address name="translation_vector">0x016c53cc</Address> CHMOD
--> -->
<Address name="current_tick">0xE80780</Address> LOOKS O.K.
<Address name="current_year">0xEB2878</Address> LOOKS O.K.
<!-- <!--
<Address name="map_data">0x16c2ad4</Address> old 0x016BAAC4 <Address name="map_data">0x16c2ad4</Address> old 0x016BAAC4
<Address name="x_count_block">0x16c2af4</Address> old 0x016BAAE4 <Address name="x_count_block">0x16c2af4</Address> old 0x016BAAE4
@ -1647,14 +1652,18 @@ map_data_1b60_offset 0x1B9c
<Address name="buildings_vector">0x16793e8</Address> <Address name="buildings_vector">0x16793e8</Address>
<Address name="items_vector">0x1678800</Address> <Address name="items_vector">0x1678800</Address>
--> -->
<Address name="window_dims">0x180b10c</Address> LOOKS O.K.
<Address name="window_x">0xe6c0dc</Address> VERIFIED
<Address name="window_y">0xe9a1b0</Address> VERIFIED
<Address name="window_z">0xe9a18c</Address> VERIFIED
<Address name="cursor_xyz">0xaf12cc</Address> VERIFIED
<Offset name="item_type_accessor">0x0</Offset> Why do i have to redefine this ??? <Offset name="item_type_accessor">0x0</Offset> Why do i have to redefine this ???
... what? ... what?
</Entry>
<Entry version="v0.31.06" os="windows" id="0.31.06" base="0.31.05" rebase="0x10">
<String name="md5">c4b7e37dafa2716e31d29110968ac64e</String>
<HexValue name="pe_timestamp">0x4c0f83d5</HexValue>
<Address name="cursor_xyz">0xaf12d0</Address>
[addresses]
translation_vector = 0x016c53dc
language_vector = 0x016c53ac
creature_vector = 0x0168071c
dwarf_race_index = 0x014abef4
</Entry> </Entry>
.-"""-. .-"""-.
@ -2117,6 +2126,9 @@ map_data_1b60_offset 0x1B9c
WORLD + 0x54E80 WORLD + 0x54E80
<Address name="translation_vector">0x931b00c</Address> <Address name="translation_vector">0x931b00c</Address>
</Entry> </Entry>
<Entry version="v0.31.06" os="linux" id="30_06lin" base="linux-offsets-2010">
<String name="md5">13a1c19e8f59b74e307e094e2a0f28c3</String>
</Entry>
</MemoryDescriptors> </MemoryDescriptors>
</DFExtractor> </DFExtractor>

5
tools/playground/incrementalsearch.cpp
Unescape Escape View File

@ -463,7 +463,7 @@ void automatedLangtables(DFHack::Context * DF, vector <DFHack::t_memrange>& rang
SegmentedFinder sf(ranges, DF); SegmentedFinder sf(ranges, DF);
cout << "looking for vectors..." << endl; cout << "looking for vectors..." << endl;
sf.Find<int ,vecTriplet>(0,4,allVectors, vectorAll); sf.Find<int ,vecTriplet>(0,4,allVectors, vectorAll);
/*
// trim vectors. anything with > 10000 entries is not interesting // trim vectors. anything with > 10000 entries is not interesting
for(uint64_t i = 0; i < allVectors.size();i++) for(uint64_t i = 0; i < allVectors.size();i++)
{ {
@ -477,7 +477,8 @@ void automatedLangtables(DFHack::Context * DF, vector <DFHack::t_memrange>& rang
} }
} }
} }
*/
filtVectors = allVectors;
cout << "-------------------" << endl; cout << "-------------------" << endl;
cout << "!!LANGUAGE TABLES!!" << endl; cout << "!!LANGUAGE TABLES!!" << endl;
cout << "-------------------" << endl; cout << "-------------------" << endl;