X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fcore%2FInformationManager.cxx;h=500f79f1406f661c2a4ac53747fa053898ff0db6;hp=8834a7a39f479b49a0d9b9dad115eaf7269d33cc;hb=f9d8bd4a0312a92a1ec3493e83996c0a99d8d1bf;hpb=d1b23c7274d6430ccc70bf2baf616437db9f5706

diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index 8834a7a..500f79f 100644
--- a/src/core/InformationManager.cxx
+++ b/src/core/InformationManager.cxx
@@ -4,10 +4,9 @@
 #include "core/Function.hxx"
 #include "core/BasicBlock.hxx"
 #include "core/Comment.hxx"
-#include "core/events/NewFunctionEvent.hxx"
 #include "core/events/ChangeCommentEvent.hxx"
 
-#include "gui/qt.hxx"
+#include "qt.hxx"
 #include <quazip/quazip.h>
 #include <quazip/quazipfile.h>
 
@@ -19,6 +18,7 @@ InformationManager::InformationManager()
 	: logger(log4cxx::Logger::getLogger("core.InformationManager"))
 {
 	current_information_manager = this;
+	qRegisterMetaType<NewFunctionEvent>("NewFunctionEvent");
 
 	QPluginLoader* loader = new QPluginLoader("libguilePlugin", NULL);
 	if (!loader->load())
@@ -41,6 +41,7 @@ InformationManager::~InformationManager() {
 void InformationManager::reset(const std::string& filename) {
 	this->filename = filename;
 	disassembler.reset(createLLVMDisassembler(filename, this));
+	emit resetEvent();
 	if (disassembler.get() != NULL)
 		disassembler.get()->start();
 }
@@ -50,7 +51,10 @@ void InformationManager::load(const std::string& filename) {
 	QuaZipFile file(&zip);
 	QuaZipFileInfo info;
 
-	zip.open(QuaZip::mdUnzip);
+	if (!zip.open(QuaZip::mdUnzip)) {
+		LOG4CXX_ERROR(logger, "Failed to open archive " << filename);
+		return;
+	}
 	tmpfile.reset(new QTemporaryFile());
 
 	{
@@ -73,10 +77,21 @@ void InformationManager::load(const std::string& filename) {
 		file.open(QIODevice::ReadOnly);
 
 		if(info.name != "binary") {
-			QXmlStreamReader reader(&file);
-			assert(QXmlStreamReader::StartDocument == reader.readNext());
-			assert(QXmlStreamReader::StartElement == reader.readNext());
-			Function * fun = Function::deserialize(reader, this);
+			if (info.name.startsWith("comment:")) {
+				QXmlStreamReader reader(&file);
+				auto starttoken = reader.readNext();
+				auto elementtoken = reader.readNext();
+				assert(QXmlStreamReader::StartDocument == starttoken);
+				assert(QXmlStreamReader::StartElement == elementtoken);
+				Comment::deserialize(reader, this);
+			} else {
+				QXmlStreamReader reader(&file);
+				auto starttoken = reader.readNext();
+				auto elementtoken = reader.readNext();
+				assert(QXmlStreamReader::StartDocument == starttoken);
+				assert(QXmlStreamReader::StartElement == elementtoken);
+				Function::deserialize(reader, this);
+			}
 		}
 		file.close();
 	}
@@ -117,6 +132,23 @@ void InformationManager::save(const std::string& filename) {
 		stream.writeEndDocument();
 		outZipFile.close();
 	}
+	for (auto commentpair : comments) {
+		Comment* comment = commentpair.second;
+		if (!comment->isLocal()) {
+			QuaZipNewInfo zipinfo(QString("comment:%1").arg(comment->getAddress(), 0, 16));
+			zipinfo.setPermissions(static_cast<QFile::Permissions>(0x6444));
+			outZipFile.open(QIODevice::WriteOnly, zipinfo);
+			QXmlStreamWriter stream(&outZipFile);
+			stream.setAutoFormatting(true);
+			stream.setAutoFormattingIndent(-1);
+			stream.writeStartDocument();
+
+			comment->serialize(stream);
+
+			stream.writeEndDocument();
+			outZipFile.close();
+		}
+	}
 
 	zip.close();
 }
@@ -239,7 +271,7 @@ void InformationManager::finishFunction(Function* fun) {
 		blocks.insert(std::make_pair(bl->getStartAddress(), bl));
 	}
 	NewFunctionEvent event(fun->getStartAddress(), fun);
-	dispatch(&event);
+	emit newFunctionEvent(event);
 }
 
 void InformationManager::finishBasicBlock(BasicBlock*) {
@@ -248,7 +280,7 @@ void InformationManager::finishBasicBlock(BasicBlock*) {
 void InformationManager::finishComment(Comment* c) {
 	LOG4CXX_DEBUG(logger, "Finishing comment " << c->getAddress());
 	ChangeCommentEvent event(c->getAddress(), c->getLocation(), c);
-	dispatch(&event);
+	emit changeCommentEvent(&event);
 }
 
 void InformationManager::deleteFunction(Function* f) {