#include "core/BasicBlock.hxx"
#include "core/Comment.hxx"
#include "core/events/NewFunctionEvent.hxx"
+#include "core/events/ChangeCommentEvent.hxx"
#include "gui/qt.hxx"
#include <quazip/quazip.h>
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());
{
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();
}
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();
}
return blocks.end();
}
+/* *********************************
+ * Accessors for the Comments map
+ */
+std::pair<
+ std::multimap<uint64_t, Comment*>::const_iterator,
+ std::multimap<uint64_t, Comment*>::const_iterator>
+InformationManager::getComments(uint64_t address) {
+ return comments.equal_range(address);
+}
+
+std::multimap<uint64_t, Comment*>::const_iterator InformationManager::beginComments() {
+ return comments.begin();
+}
+std::multimap<uint64_t, Comment*>::const_iterator InformationManager::endComments() {
+ return comments.end();
+}
/* *********************************
* Accessors for the Interpreter map
}
Comment* InformationManager::newLocalComment(uint64_t address, Function* f) {
- Comment* comment = new Comment(address, this);
+ Comment* comment = new Comment(address, f, this);
comments.insert(std::make_pair(address, comment));
return comment;
}
void InformationManager::finishBasicBlock(BasicBlock*) {
}
-void InformationManager::finnishComment(Comment* c) {
+void InformationManager::finishComment(Comment* c) {
+ LOG4CXX_DEBUG(logger, "Finishing comment " << c->getAddress());
+ ChangeCommentEvent event(c->getAddress(), c->getLocation(), c);
+ dispatch(&event);
}
void InformationManager::deleteFunction(Function* f) {