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

diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index a274c41..711d47a 100644
--- a/src/core/InformationManager.cxx
+++ b/src/core/InformationManager.cxx
@@ -2,11 +2,22 @@
 #include "disassembler/llvm/LLVMDisassembler.hxx"
 #include "core/Function.hxx"
 #include "core/BasicBlock.hxx"
+#include "core/Comment.hxx"
 
 #include "gui/qt.hxx"
 #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;
@@ -16,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());
@@ -36,23 +99,9 @@ void InformationManager::save(const QString& filename) {
 		stream.setAutoFormatting(true);
 		stream.setAutoFormattingIndent(-1);
 		stream.writeStartDocument();
-		stream.writeStartElement("function");
-		stream.writeAttribute("name", fun->getName().c_str());
-		stream.writeAttribute("entry", QString::number(fun->getStartAddress(), 16));
-
-		for (auto& blockentry : fun->blocks()) {
-			stream.writeStartElement("block");
-			stream.writeAttribute("id", blockentry.second->getName().c_str());
-			stream.writeTextElement("start", QString::number(blockentry.second->getStartAddress(), 16));
-			stream.writeTextElement("end", QString::number(blockentry.second->getEndAddress(), 16));
-			if (0 != blockentry.second->getNextBlock(0))
-				stream.writeTextElement("next", QString::number(blockentry.second->getNextBlock(0), 16));
-			if (0 != blockentry.second->getNextBlock(1))
-				stream.writeTextElement("next", QString::number(blockentry.second->getNextBlock(1), 16));
-			stream.writeEndElement(); // "block"
-		}
 
-		stream.writeEndElement(); // "function"
+		fun->serialize(stream);
+
 		stream.writeEndDocument();
 		outZipFile.close();
 	}
@@ -61,10 +110,69 @@ void InformationManager::save(const QString& filename) {
 }
 
 void InformationManager::signal_new_function(Function* fun) {
-	functions.insert(std::make_pair(fun->getStartAddress(), fun));
+}
+
+Function* InformationManager::getFunction(uint64_t address) {
+	auto it = functions.find(address);
+	if (it != functions.end())
+		return it->second;
+	else
+		return NULL;
+}
+
+BasicBlock* InformationManager::getBasicBlock(uint64_t address) {
+	auto it = blocks.find(address);
+	if (it != blocks.end())
+		return it->second;
+	else
+		return NULL;
+}
+
+Function* InformationManager::newFunction(uint64_t address) {
+	Function* fun = new Function(address, this);
+	functions.insert(std::make_pair(address, fun));
+	return fun;
+}
+
+BasicBlock* InformationManager::newBasicBlock(uint64_t address) {
+	BasicBlock* block = new BasicBlock(address, this);
+	blocks.insert(std::make_pair(address, block));
+	return block;
+}
+
+Comment* InformationManager::newGlobalComment(uint64_t address) {
+	return NULL;
+}
+
+Comment* InformationManager::newLocalComment(uint64_t address, Function* f) {
+	return NULL;
+}
+
+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));
 	}
 	new_function_signal(fun);
 }
+
+void InformationManager::finishBasicBlock(BasicBlock* b) {
+}
+
+void InformationManager::finnishComment(Comment* c) {
+}
+
+void InformationManager::deleteFunction(Function* f) {
+	functions.erase(f->getStartAddress());
+	delete f;
+}
+
+void InformationManager::deleteBasicBlock(BasicBlock* b) {
+	blocks.erase(b->getStartAddress());
+	delete b;
+}
+
+void InformationManager::deleteComment(Comment* c) {
+	delete c;
+}