X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fmain.cxx;h=24ddf7a2ad24aca695601d0d6b8d0906b4a5350e;hp=ebb85e87924d457a80c388a32a62f35a56b26fb6;hb=fd85e36ca37c93139dc7bf8d06cf71bc5a225321;hpb=ade1d271328d2153876eb208d10a4525c962951b

diff --git a/src/main.cxx b/src/main.cxx
index ebb85e8..24ddf7a 100644
--- a/src/main.cxx
+++ b/src/main.cxx
@@ -1,6 +1,5 @@
-#include "include_llvm.hxx"
+#include "disassembler/llvm/include_llvm.hxx"
 
-#include <iostream>
 #include <climits>
 
 #include <QApplication>
@@ -17,39 +16,66 @@
 #include "log4cxx/basicconfigurator.h"
 
 #include "gui/Mainwindow.hxx"
-
-using std::cout;
-using std::cin;
-using std::cerr;
+#include "core/InformationManager.hxx"
+#include "disassembler/llvm/LLVMDisassembler.hxx"
+#include "Config.hxx"
 
 int main(int argc, char** argv)
 {
 	QApplication app(argc, argv);
 
-    log4cxx::BasicConfigurator::configure();
-    log4cxx::LoggerPtr _logger(log4cxx::Logger::getLogger("main"));
+	log4cxx::BasicConfigurator::configure();
+	log4cxx::LoggerPtr _logger(log4cxx::Logger::getLogger("main"));
 
 #ifdef ARGPARSE
 	QCommandLineParser parser;
 #endif
 
 	QApplication::setApplicationName("frida");
+	QApplication::setApplicationVersion("0.0");
+	QApplication::addLibraryPath(CONFIG_LIBDIR "/frida/plugins/Interpreter");
 #ifdef ARGPARSE
 	parser.addHelpOption();
 	parser.addVersionOption();
-	parser.addPositionalArgument("filename", QCoreApplication::translate("main", "File to disassemble."));
 
+	QCommandLineOption loglevelOption("loglevel", "Control verbosity of logging", "FATAL|ERROR|WARN|INFO|DEBUG|TRACE");
+	loglevelOption.setDefaultValue("INFO");
+	parser.addOption(loglevelOption);
+
+	parser.addPositionalArgument("filename", QCoreApplication::translate("main", "File to disassemble."));
 
 	parser.process(app);
 #endif
 
-    LOG4CXX_DEBUG(_logger, "Initializing LLVM");
-    llvm::InitializeAllTargetInfos();
-    llvm::InitializeAllTargetMCs();
-    llvm::InitializeAllAsmParsers();
-    llvm::InitializeAllDisassemblers();
+	log4cxx::LevelPtr level = log4cxx::Level::getInfo();
+#ifdef ARGPARSE
+	if (parser.value(loglevelOption) != "") {
+		std::string levelstring = parser.value(loglevelOption).toStdString();
+		if (levelstring == "FATAL")
+			level = log4cxx::Level::getFatal();
+		if (levelstring == "ERROR")
+			level = log4cxx::Level::getError();
+		if (levelstring == "WARN")
+			level = log4cxx::Level::getWarn();
+		if (levelstring == "INFO")
+			level = log4cxx::Level::getInfo();
+		if (levelstring == "DEBUG")
+			level = log4cxx::Level::getDebug();
+		if (levelstring == "TRACE")
+			level = log4cxx::Level::getTrace();
+	}
+#endif
+	log4cxx::Logger::getRootLogger()->setLevel(level);
+
+	InformationManager iman;
+
+	LOG4CXX_DEBUG(_logger, "Initializing LLVM");
+	llvm::InitializeAllTargetInfos();
+	llvm::InitializeAllTargetMCs();
+	llvm::InitializeAllAsmParsers();
+	llvm::InitializeAllDisassemblers();
 
-    LOG4CXX_DEBUG(_logger, "Initializing Qt");
+	LOG4CXX_DEBUG(_logger, "Initializing Qt");
 
 	std::string filename = "";
 #ifdef ARGPARSE
@@ -58,7 +84,8 @@ int main(int argc, char** argv)
 	}
 #endif
 
-	Mainwindow m(filename);
+	Mainwindow m(&iman);
 	m.show();
+	iman.reset(filename);
 	return app.exec();
 }