Added main elf to context

3 files changed, 11 insertions, 3 deletions

diff --git a/src/box64context.c b/src/box64context.c
index 21768fb2..84362565 100755
--- a/src/box64context.c
+++ b/src/box64context.c
@@ -8,6 +8,7 @@
 
 #include "box64context.h"
 #include "debug.h"
+#include "elfloader.h"
 
 
 EXPORTDYN
@@ -146,7 +147,7 @@ void FreeBox64Context(box64context_t** context)
 
     free(ctx);
 }
-/*
+
 int AddElfHeader(box64context_t* ctx, elfheader_t* head) {
     int idx = ctx->elfsize;
     if(idx==ctx->elfcap) {
@@ -159,7 +160,7 @@ int AddElfHeader(box64context_t* ctx, elfheader_t* head) {
     printf_log(LOG_DEBUG, "Adding \"%s\" as #%d in elf collection\n", ElfName(head), idx);
     return idx;
 }
-*/
+
 int AddTLSPartition(box64context_t* context, int tlssize) {
     int oldsize = context->tlssize;
     context->tlssize += tlssize;
diff --git a/src/include/box64context.h b/src/include/box64context.h
index 0697e16a..3ee5f927 100755
--- a/src/include/box64context.h
+++ b/src/include/box64context.h
@@ -74,7 +74,14 @@ extern box64context_t *my_context; // global context
 box64context_t *NewBox64Context(int argc);
 void FreeBox64Context(box64context_t** context);
 
+// return the index of the added header
+int AddElfHeader(box64context_t* ctx, elfheader_t* head);
+
 // return the tlsbase (negative) for the new TLS partition created (no partition index is stored in the context)
 int AddTLSPartition(box64context_t* context, int tlssize);
 
+// defined in fact in threads.c
+//void thread_set_emu(x64emu_t* emu);
+//x64emu_t* thread_get_emu();
+
 #endif //__BOX64CONTEXT_H_
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 3d4e4741..f5bbf9d6 100755
--- a/src/main.c
+++ b/src/main.c
@@ -731,6 +731,6 @@ int main(int argc, const char **argv, const char **env) {
         FreeCollection(&ld_preload);
         return execvp(argv[1], (char * const*)(argv+1));
     }
-    /*AddElfHeader(my_context, elf_header);*/
+    AddElfHeader(my_context, elf_header);
     return 0;
 }