X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fcore%2FInformationManager.cxx;h=711d47a552cb466b78b5c69a49d86e0d89ec9741;hp=3eebc3422300cfde2f68323192d7f20b2a46f203;hb=cab6494b97d1626c7b9285b69df324d9c9953614;hpb=3493bceb6690f53900d2a4524401990c601b1464

diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index 3eebc34..711d47a 100644
--- a/src/core/InformationManager.cxx
+++ b/src/core/InformationManager.cxx
@@ -8,6 +8,16 @@
 #include <quazip/quazip.h>
 #include <quazip/quazipfile.h>
 
+#include <QTemporaryFile>
+
+InformationManager* current_information_manager;
+
+InformationManager::InformationManager()
+	: logger(log4cxx::Logger::getLogger("core.InformationManager"))
+{
+	current_information_manager = this;
+}
+
 InformationManager::~InformationManager() {
 	for (auto b : blocks)
 		delete b.second;
@@ -17,17 +27,69 @@ InformationManager::~InformationManager() {
 }
 
 void InformationManager::reset(const std::string& filename) {
+	this->filename = filename;
 	disassembler.reset(createLLVMDisassembler(filename, this));
 	if (disassembler.get() != NULL)
 		disassembler.get()->start();
 }
 
-void InformationManager::save(const QString& filename) {
-	QuaZip zip(filename);
+void InformationManager::load(const std::string& filename) {
+	QuaZip zip(filename.c_str());
+	QuaZipFile file(&zip);
+	QuaZipFileInfo info;
+
+	zip.open(QuaZip::mdUnzip);
+	tmpfile.reset(new QTemporaryFile());
+
+	{
+		LOG4CXX_INFO(logger, "Loading binary from archive");
+		zip.setCurrentFile("binary");
+		tmpfile->open();
+		file.open(QIODevice::ReadOnly);
+		QByteArray buffer;
+		while (!file.atEnd()) {
+			buffer = file.read(4096);
+			tmpfile->write(buffer);
+		}
+		tmpfile->flush();
+		file.close();
+		disassembler.reset(createLLVMDisassembler(tmpfile->fileName().toStdString(), this));
+	}
+
+	for (bool more = zip.goToFirstFile(); more; more = zip.goToNextFile()) {
+		zip.getCurrentFileInfo(&info);
+		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);
+		}
+		file.close();
+	}
+}
+
+void InformationManager::save(const std::string& filename) {
+	QuaZip zip(filename.c_str());
 	zip.open(QuaZip::mdCreate);
 	zip.setComment("FRIDA 0.0");
 	QuaZipFile outZipFile(&zip);
 
+	{
+		QFile binary(this->filename.c_str());
+		binary.open(QIODevice::ReadOnly);
+		QuaZipNewInfo zipinfo("binary");
+		zipinfo.setPermissions(static_cast<QFile::Permissions>(0x6444));
+		outZipFile.open(QIODevice::WriteOnly, zipinfo);
+		QByteArray buffer;
+		while (!binary.atEnd()) {
+			buffer = binary.read(4096);
+			outZipFile.write(buffer);
+		}
+		outZipFile.close();
+	}
+
 	for (auto funpair : functions) {
 		Function* fun = funpair.second;
 		QuaZipNewInfo zipinfo(fun->getName().c_str());
@@ -87,6 +149,7 @@ Comment* InformationManager::newLocalComment(uint64_t address, Function* f) {
 }
 
 void InformationManager::finishFunction(Function* fun) {
+	LOG4CXX_DEBUG(logger, "Finishing function " << fun->getName());
 	for (auto b : fun->blocks()) {
 		BasicBlock* bl = b.second;
 		blocks.insert(std::make_pair(bl->getStartAddress(), bl));