X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fbindings%2FGuile.cxx;h=863c9ccd23e43ecdbd3716d6b5ef9b9e6af387d7;hp=86ab6dd1338e2abafdd9b4c5b29f6762736bfd3c;hb=38f26697d6998845bacb1d44a92efe8f326a4820;hpb=c6e89377cd981f9be1f18a6be334fbcfebb0c16e

diff --git a/src/bindings/Guile.cxx b/src/bindings/Guile.cxx
index 86ab6dd..863c9cc 100644
--- a/src/bindings/Guile.cxx
+++ b/src/bindings/Guile.cxx
@@ -1,5 +1,6 @@
 #include "Guile.hxx"
 #include "Config.hxx"
+#include "core/Settings.hxx"
 
 namespace {
 	SCM handler (void*, SCM tag, SCM throw_args) {
@@ -8,28 +9,37 @@ namespace {
 	}
 }
 
-GuileInterpreter::GuileInterpreter() {
+GuileInterpreter::GuileInterpreter()
+	: logger(log4cxx::Logger::getLogger("bindings.Guile")) {
+
+	QString socketpath = Settings::get()->getRuntimeDirectory()->canonicalPath()
+		+ "/frida." + QString::number(QCoreApplication::applicationPid(), 16) + ".geiser.sock";
+
 	scm_init_guile();
 
+	SCM scm_socketpath = scm_from_locale_string(socketpath.toStdString().c_str());
 	scm_c_use_module("system repl server");
-	scm_call_0(scm_c_public_ref("system repl server", "spawn-server"));
-	scm_c_load_extension(CMAKE_INSTALL_FULL_LIBDIR "/frida/plugins/Interpreter/libguile-frida-binding",
+	SCM socket = scm_call_2(scm_c_public_ref("system repl server", "make-unix-domain-server-socket"),
+	                        scm_from_locale_keyword("path"), scm_socketpath);
+	scm_call_1(scm_c_public_ref("system repl server", "spawn-server"), socket);
+	scm_c_load_extension("libguile-frida-binding",
 	                     "scm_init_frida_module");
 
 	guile_output_port = scm_open_output_string();
 	guile_error_port = scm_open_output_string();
 	scm_set_current_output_port(guile_output_port);
 	scm_set_current_error_port(guile_error_port);
+	LOG4CXX_INFO(logger, "Initializing GUILE finished");
 }
 
-int GuileInterpreter::evaluate(const std::string& command,
-                               std::ostream& stdout,
-                               std::ostream& stderr,
-                               std::string& result) {
-
+int GuileInterpreter::evaluateWithErrorHandling(SCM (*fun)(void *),
+                                                void* data,
+                                                std::ostream& stdout,
+                                                std::ostream& stderr,
+                                                std::string& result) {
 	SCM result_obj = scm_internal_catch(SCM_BOOL_T,
-	                                    (SCM (*)(void *))scm_c_eval_string,
-	                                    (void*)command.c_str(),
+	                                    fun,
+	                                    data,
 	                                    handler, NULL);
 
 	SCM result_str = scm_object_to_string(result_obj, SCM_UNDEFINED);
@@ -44,13 +54,28 @@ int GuileInterpreter::evaluate(const std::string& command,
 
 	scm_truncate_file(guile_output_port, scm_from_uint16(0));
 	scm_truncate_file(guile_error_port, scm_from_uint16(0));
-
 	return 0;
 }
 
+int GuileInterpreter::evaluate(const std::string& command,
+                               std::ostream& stdout,
+                               std::ostream& stderr,
+                               std::string& result) {
+
+	return evaluateWithErrorHandling((SCM (*)(void *))scm_c_eval_string,
+	                                 (void*)command.c_str(),
+	                                 stdout, stderr, result);
+
+}
+
 int GuileInterpreter::loadFile(const std::string& filename,
                                std::ostream& stdout,
                                std::ostream& stderr,
                                std::string& result) {
-	scm_c_primitive_load(filename.c_str());
+	LOG4CXX_DEBUG(logger, "Loading file \"" << filename << "\"");
+	evaluateWithErrorHandling((SCM (*)(void *))scm_c_primitive_load,
+	                                 (void*)filename.c_str(),
+	                                 stdout, stderr, result);
+	LOG4CXX_DEBUG(logger, "Finished file \"" << filename << "\"");
+	return 0;
 }