X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Fld-acess_src%2Fmain.c;h=8f24db8ace48f759c3368d000eef4e348e8f4e8b;hb=8b72370eae1a3cfa8916136fd8ffc1460e9291ba;hp=852b3981e1b0ac1035314bf244ef5c647e4cdc29;hpb=7f80ab30017689efe0aaaab18abc7ceda689d859;p=tpg%2Facess2.git

diff --git a/AcessNative/ld-acess_src/main.c b/AcessNative/ld-acess_src/main.c
index 852b3981..8f24db8a 100644
--- a/AcessNative/ld-acess_src/main.c
+++ b/AcessNative/ld-acess_src/main.c
@@ -6,6 +6,19 @@
 #include <stdarg.h>
 #include <string.h>
 
+// === IMPORTS ===
+extern int	gSocket;
+extern int	giSyscall_ClientID;
+extern int	gbSyscallDebugEnabled;
+extern void	acess__exit(int Status);
+extern void	Request_Preinit(void);
+
+// === PROTOTYPES ===
+void	CallUser(void *Entry, int argc, char *argv[], char **envp) __attribute__((noreturn));
+
+// === GLOBALS ===
+char	**gEnvP;
+
 // === CODE ===
 int main(int argc, char *argv[], char **envp)
 {
@@ -15,13 +28,23 @@ int main(int argc, char *argv[], char **envp)
 	char	*appPath = NULL;
 	 int	(*appMain)(int, char *[], char **);
 	void	*base;
+	 int	rv;
+
+	gEnvP = envp;
 	
-	 int	syscall_handle = -1;
+	Request_Preinit();
+
+//	 int	syscall_handle = -1;
 	
 	for( i = 1; i < argc; i ++ )
 	{
 		if(strcmp(argv[i], "--key") == 0) {
-			syscall_handle = atoi(argv[++i]);
+			giSyscall_ClientID = atoi(argv[++i]);
+			continue ;
+		}
+
+		if(strcmp(argv[i], "--socket") == 0) {
+			gSocket = atoi(argv[++i]);
 			continue ;
 		}
 		
@@ -31,18 +54,28 @@ int main(int argc, char *argv[], char **envp)
 		}
 		
 		if(strcmp(argv[i], "--open") == 0) {
-			if( acess_open(argv[++i], 6) == -1 ) {	// Read/Write
+			if( acess__SysOpen(argv[++i], 6) == -1 ) {	// Read/Write
 				fprintf(stderr, "Unable to open '%s'\n", argv[i]);
 				exit(1);
 			}
 			continue ;
 		}
+		if( strcmp(argv[i], "--trace") == 0 ) {
+			gbSyscallDebugEnabled = 1;
+			continue ;
+		}
 		
 		if( argv[i][0] != '-' )	break;
 	}
 
 	if( i >= argc ) {
-		fprintf(stderr, "Usage: ld-acess <executable> [arguments ...]\n");
+		fprintf(stderr,
+			"Usage: ld-acess <executable> [arguments ...]\n"
+			"\n"
+			"--key\t(internal) used to pass the system call handle when run with execve\n"
+			"--binary\tLoad a local binary directly\n"
+			"--open\tOpen a file before executing\n"
+			);
 		return 1;
 	}
 	
@@ -52,30 +85,47 @@ int main(int argc, char *argv[], char **envp)
 	appArgc = argc - i;
 	appArgv = &argv[i];
 
-	printf("Exectutable Path: '%s'\n", appPath);
-	printf("Executable argc = %i\n", appArgc);
+//	printf("Exectutable Path: '%s'\n", appPath);
+//	printf("Executable argc = %i\n", appArgc);
 
 	base = Binary_Load(appPath, (uintptr_t*)&appMain);
-	printf("base = %p\n", base);
-	if( !base )	return 127;
+	printf("[DEBUG %i] base = %p\n", giSyscall_ClientID, base);
+	if( !base )	{
+		*((char*)NULL) = 0;
+		return 127;
+	}
 	
 	printf("==============================\n");
+	printf("[DEBUG %i] %i ", giSyscall_ClientID, appArgc);
 	for(i = 0; i < appArgc; i ++)
 		printf("\"%s\" ", appArgv[i]);
 	printf("\n");
+	printf("[DEBUG %i] appMain = %p\n", giSyscall_ClientID, appMain);
+//	CallUser(appMain, appArgc, appArgv, envp);
+	rv = appMain(appArgc, appArgv, envp);
+	acess__exit(rv);
+	return rv;
+}
+
+void CallUser(void *Entry, int argc, char *argv[], char **envp)
+{
+	#if 0
 	__asm__ __volatile__ (
-		"push %0;\n\t"
-		"push %1;\n\t"
+		"push %3;\n\t"
 		"push %2;\n\t"
-		"jmp *%3;\n\t"
-		: : "r" (envp), "r" (appArgv), "r" (appArgc), "r" (appMain) );
-	return -1;
+		"push %1;\n\t"
+		"call *%0"
+		: : "r" (Entry), "r" (argc), "r" (argv), "r" (envp)
+		);
+	#else
+	#endif
+	for(;;);
 }
 
 void Warning(const char *Format, ...)
 {
 	va_list	args;
-	printf("Warning: ");
+	printf("[WARN   %i] ", giSyscall_ClientID);
 	va_start(args, Format);
 	vprintf(Format, args);
 	va_end(args);
@@ -85,7 +135,18 @@ void Warning(const char *Format, ...)
 void Notice(const char *Format, ...)
 {
 	va_list	args;
-	printf("Notice: ");
+	printf("[NOTICE %i] ", giSyscall_ClientID);
+	va_start(args, Format);
+	vprintf(Format, args);
+	va_end(args);
+	printf("\n");
+}
+
+void Debug(const char *Format, ...)
+{
+	va_list	args;
+	printf("[DEBUG ");
+	printf("%2i] ", giSyscall_ClientID);
 	va_start(args, Format);
 	vprintf(Format, args);
 	va_end(args);