Cut down on debug, fixed tabs, made process tree be killed when root is killed

[tpg/acess2.git] / Kernel / binary.c

diff --git a/Kernel/binary.c b/Kernel/binary.c
index 7175799..04dfed2 100644 (file)
--- a/Kernel/binary.c
+++ b/Kernel/binary.c
@@ -2,21 +2,10 @@
  * Acess2\r
  * Common Binary Loader\r
  */\r
+#define DEBUG  0\r
 #include <common.h>\r
 #include <binary.h>\r
 \r
-#define DEBUG  1\r
-\r
-#if DEBUG\r
-#else\r
-# undef ENTER\r
-# undef LOG\r
-# undef LEAVE\r
-# define ENTER(...)\r
-# define LOG(...)\r
-# define LEAVE(...)\r
-#endif\r
-\r
 // === CONSTANTS ===\r
 #define BIN_LOWEST     MM_USER_MIN             // 1MiB\r
 #define BIN_GRANUALITY 0x10000         // 64KiB\r
@@ -34,9 +23,9 @@ typedef struct sKernelBin {
 \r
 // === IMPORTS ===\r
 extern int     Proc_Clone(Uint *Err, Uint Flags);\r
-extern void    Proc_SetThreadName(char *Name);\r
+extern void    Threads_SetName(char *Name);\r
 extern Uint    MM_ClearUser();\r
-extern void    Proc_Exit();\r
+extern void    Threads_Exit();\r
 extern void    Proc_StartUser(Uint Entrypoint, Uint *Bases, int ArgC, char **ArgV, char **EnvP, int DataSize);\r
 extern tKernelSymbol   gKernelSymbols[];\r
 extern void            gKernelSymbolsEnd;\r
@@ -146,7 +135,7 @@ int Proc_Execve(char *File, char **ArgV, char **EnvP)
        strcpy(savedFile, File);\r
        \r
        // --- Set Process Name\r
-       Proc_SetThreadName(File);\r
+       Threads_SetName(File);\r
        \r
        // --- Clear User Address space\r
        MM_ClearUser();\r
@@ -157,7 +146,7 @@ int Proc_Execve(char *File, char **ArgV, char **EnvP)
        if(bases[0] == 0)\r
        {\r
                Warning("Proc_Execve - Unable to load '%s'", File);\r
-               Proc_Exit();\r
+               Threads_Exit();\r
                for(;;);\r
        }\r
        \r