2 files changed, 64 insertions, 5 deletions

diff --git a/src/tools/callback.c b/src/tools/callback.c
index 0d9b0c5d..d3d5101e 100755
--- a/src/tools/callback.c
+++ b/src/tools/callback.c
@@ -56,6 +56,68 @@ uint64_t RunFunction(box64context_t *context, uintptr_t fnc, int nargs, ...)
 }
 
 EXPORTDYN
+uint64_t RunSafeFunction(box64context_t *context, uintptr_t fnc, int nargs, ...)
+{
+    (void)context;
+
+    x64emu_t *emu = thread_get_emu();
+    int align = (nargs>6)?(((nargs-6)&1)):0;
+    int stackn = align + ((nargs>6)?(nargs-6):0);
+
+    Push64(emu, R_RBP); // push rbp
+    uintptr_t old_rbp = R_RBP = R_RSP;      // mov rbp, rsp
+
+    Push64(emu, R_RDI);
+    Push64(emu, R_RSI);
+    Push64(emu, R_RDX);
+    Push64(emu, R_RCX);
+    Push64(emu, R_R8);
+    Push64(emu, R_R9);
+    Push64(emu, R_R10);
+    Push64(emu, R_R11);
+    Push64(emu, R_RAX);
+
+    R_RSP -= stackn*sizeof(void*);   // need to push in reverse order
+
+    uint64_t *p = (uint64_t*)R_RSP;
+
+    va_list va;
+    va_start (va, nargs);
+    for (int i=0; i<nargs; ++i) {
+        if(i<6) {
+            int nn[] = {_DI, _SI, _DX, _CX, _R8, _R9};
+            emu->regs[nn[i]].q[0] = va_arg(va, uint64_t);
+        } else {
+            *p = va_arg(va, uint64_t);
+            p++;
+        }
+    }
+    va_end (va);
+
+    uintptr_t oldip = R_RIP;
+    DynaCall(emu, fnc);
+
+    uint64_t ret = R_RAX;
+    R_RIP = oldip;
+
+    R_RAX = Pop64(emu);
+    R_R11 = Pop64(emu);
+    R_R10 = Pop64(emu);
+    R_R9 = Pop64(emu);
+    R_R8 = Pop64(emu);
+    R_RCX = Pop64(emu);
+    R_RDX = Pop64(emu);
+    R_RSI = Pop64(emu);
+    R_RDI = Pop64(emu);
+
+    R_RSP = old_rbp;          // mov rsp, rbp
+    R_RBP = Pop64(emu);     // pop rbp
+    
+
+    return ret;
+}
+
+EXPORTDYN
 uint64_t RunFunctionWithEmu(x64emu_t *emu, int QuitOnLongJump, uintptr_t fnc, int nargs, ...)
 {
     int align = (nargs>6)?(((nargs-6)&1)):0;
diff --git a/src/tools/fileutils.c b/src/tools/fileutils.c
index 67e8c652..04905c04 100755
--- a/src/tools/fileutils.c
+++ b/src/tools/fileutils.c
@@ -57,11 +57,8 @@ char* ResolveFile(const char* filename, path_collection_t* paths)
         } else
             strcpy(p, paths->paths[i]);
         strcat(p, filename);
-        if(FileExist(p, IS_FILE)) {
-            char p2[MAX_PATH];
-            realpath(p, p2);
-            return box_strdup(p2);
-        }
+        if(FileExist(p, IS_FILE))
+            return box_realpath(p, NULL);
     }
 
     return box_strdup(filename); //NULL;