Update to use the new symbols file.

library/CMakeLists.txt

@@ -198,7 +198,7 @@ install(TARGETS dfhack
         LIBRARY DESTINATION ${DFHACK_LIBRARY_DESTINATION}
         RUNTIME DESTINATION ${DFHACK_LIBRARY_DESTINATION})
 #install the offset file
-install(FILES ${dfhack_SOURCE_DIR}/Memory.xml
+install(FILES xml/symbols.xml
         DESTINATION ${DFHACK_DATA_DESTINATION}) #linux: share/dfhack
 
 if(BUILD_DEVEL)

library/Core.cpp

@@ -594,9 +594,9 @@ bool Core::Init()
 
     // find out what we are...
     #ifdef LINUX_BUILD
-        const char * path = "hack/Memory.xml";
+        const char * path = "hack/symbols.xml";
     #else
-        const char * path = "hack\\Memory.xml";
+        const char * path = "hack\\symbols.xml";
     #endif
     vif = new DFHack::VersionInfoFactory();
     cerr << "Identifying DF version.\n";
@@ -607,7 +607,7 @@ bool Core::Init()
     catch(Error::All & err)
     {
         std::stringstream out;
-        out << "Error while reading Memory.xml:\n";
+        out << "Error while reading symbols.xml:\n";
         out << err.what() << std::endl;
         delete vif;
         vif = NULL;
@@ -849,7 +849,7 @@ bool Core::ncurses_wgetch(int in, int & out)
         if(df::global::ui && df::global::gview && g->df_menu_state)
         {
             df::viewscreen * ws = g->GetCurrentScreen();
-            // FIXME: put hardcoded values into memory.xml
+            // FIXME: USE ENUMS
             if(((t_virtual *)ws)->getClassName() == "viewscreen_dwarfmodest" && *g->df_menu_state == 0x23)
             {
                 out = in;

library/VersionInfoFactory.cpp

@@ -86,9 +86,9 @@ void VersionInfoFactory::ParseVersion (TiXmlElement* entry, VersionInfo* mem)
     if (!cstr_name)
         throw Error::MemoryXmlBadAttribute("name");
 
-    const char *cstr_os = entry->Attribute("os");
+    const char *cstr_os = entry->Attribute("os-type");
     if (!cstr_os)
-        throw Error::MemoryXmlBadAttribute("os");
+        throw Error::MemoryXmlBadAttribute("os-type");
 
     string os = cstr_os;
     mem->setVersion(cstr_name);
@@ -107,7 +107,7 @@ void VersionInfoFactory::ParseVersion (TiXmlElement* entry, VersionInfo* mem)
     }
     else
     {
-        throw Error::MemoryXmlBadAttribute("os");
+        throw Error::MemoryXmlBadAttribute("os-type");
     }
 
     // process additional entries
@@ -118,9 +118,9 @@ void VersionInfoFactory::ParseVersion (TiXmlElement* entry, VersionInfo* mem)
         string type, name, value;
         const char *cstr_type = pMemEntry->Value();
         type = cstr_type;
-        if(type == "Address")
+        if(type == "global-address")
         {
-            const char *cstr_key = pMemEntry->Attribute("key");
+            const char *cstr_key = pMemEntry->Attribute("name");
             if(!cstr_key)
                 throw Error::MemoryXmlUnderspecifiedEntry(cstr_name);
             const char *cstr_value = pMemEntry->Attribute("value");
@@ -128,14 +128,14 @@ void VersionInfoFactory::ParseVersion (TiXmlElement* entry, VersionInfo* mem)
                 throw Error::MemoryXmlUnderspecifiedEntry(cstr_name);
             mem->setAddress(cstr_key, strtol(cstr_value, 0, 0));
         }
-        else if (type == "MD5")
+        else if (type == "md5-hash")
         {
             const char *cstr_value = pMemEntry->Attribute("value");
             if(!cstr_value)
                 throw Error::MemoryXmlUnderspecifiedEntry(cstr_name);
             mem->addMD5(cstr_value);
         }
-        else if (type == "PETimeStamp")
+        else if (type == "binary-timestamp")
         {
             const char *cstr_value = pMemEntry->Attribute("value");
             if(!cstr_value)
@@ -176,7 +176,7 @@ bool VersionInfoFactory::loadFile(string path_to_xml)
             throw Error::MemoryXmlNoRoot();
         }
         string m_name=pElem->Value();
-        if(m_name != "DFHack")
+        if(m_name != "data-definition")
         {
             error = true;
             throw Error::MemoryXmlNoRoot();
@@ -188,8 +188,8 @@ bool VersionInfoFactory::loadFile(string path_to_xml)
     {
         clear();
         // For each version
-        TiXmlElement * pMemInfo=hRoot.FirstChild( "Version" ).Element();
-        for( ; pMemInfo; pMemInfo=pMemInfo->NextSiblingElement("Version"))
+        TiXmlElement * pMemInfo=hRoot.FirstChild( "symbol-table" ).Element();
+        for( ; pMemInfo; pMemInfo=pMemInfo->NextSiblingElement("symbol-table"))
         {
             const char *name = pMemInfo->Attribute("name");
             if(name)
@@ -201,6 +201,6 @@ bool VersionInfoFactory::loadFile(string path_to_xml)
         }
     }
     error = false;
-    std::cerr << "Loaded " << versions.size() << " DF versions." << std::endl;
+    std::cerr << "Loaded " << versions.size() << " DF symbol tables." << std::endl;
     return true;
 }

library/include/MemAccess.h

@@ -260,7 +260,7 @@ namespace DFHack
             {
                 return true;
             };
-            /// @return true if the process is identified -- has a Memory.xml entry
+            /// @return true if the process is identified -- has a symbol table extension
             bool isIdentified()
             {
                 return identified;
@@ -270,7 +270,7 @@ namespace DFHack
             /// get virtual memory ranges of the process (what is mapped where)
             void getMemRanges(std::vector<t_memrange> & ranges );
 
-            /// get the flattened Memory.xml entry of this process
+            /// get the symbol table extension of this process
             VersionInfo *getDescriptor()
             {
                 return my_descriptor;

library/xml

@@ -1 +1 @@
-Subproject commit 3b20ecfbfcb7b801dbe83b1c22f183ca6085af9e
+Subproject commit b3534e853f99129b1664766f09f461d54be6cbfe