Changeset 2727

Timestamp:

Jul 18, 2006, 1:26:14 AM (19 years ago)

Author:

bird

Message:

Nt panic.

Location:

trunk/libc

Files:

• Makefile.kmk (modified) (3 diffs)
• include/klibc/nt/fib.h (modified) (3 diffs)
• include/klibc/nt/nt.h (modified) (1 diff)
• src/kNIX.nt/Makefile.kmk (added)
• src/kNIX.nt/b_panic.c (copied) (copied from trunk/libc/src/kNIX.os2/b_panic.c ) (16 diffs)

trunk/libc/Makefile.kmk

@@ -56 +56 @@
         $(TARGET_libc_libsyslog) \
         $(TARGET_libc_libc_sys)
+libc_SOURCES.win32 = $(TARGET_kNIX.nt)
 
 ifdef CFG_LIBC_LOGSTRICT_LIBS
@@ -69 +70 @@
         $(TARGET_libc_libsyslog_l) \
         $(TARGET_libc_libc_sys_l)
+libc_SOURCES.win32 = $(TARGET_kNIX.nt_l)
 endif
 
@@ -83 +85 @@
         $(TARGET_libc_libsyslog_p)
         $(TARGET_libc_libc_p)
+libc_SOURCES.win32 = $(TARGET_kNIX.nt_p)
 endif
 

trunk/libc/include/klibc/nt/fib.h

@@ -132 +132 @@
     } u1;                                                           /*  10   20  */
     void                               *ArbitraryUserPointer;       /*  14   28  */
-    struct _NT_TIB                     *Self;                       /*  18   30  */
+    struct __LIBC_TEB                  *Self;                       /*  18   30  */
     void                               *EnvironmentPointer;         /*  1c   38  */
     struct
@@ -323 +323 @@
 
 /**
+ * Gets the pointer to the thread information block.
+ */
+#define fibGetTEB()                 ((__LIBC_PTEB)__libc_fibGetTEB_PV(Self))
+
+/**
  * Gets the pointer to the process information block.
  */
@@ -390 +395 @@
 }
 
+/**
+ * Checks if we're being debugged.
+ */
+#define fibIsBeingDebugged()    (fibGetPEB()->BeingDebugged)
 
 __END_DECLS

trunk/libc/include/klibc/nt/nt.h

@@ -33 +33 @@
 #undef PAGE_SHIFT
 
+NTOSAPI
+NTSTATUS NTAPI RtlQueryEnvironmentVariable_U(
+    IN PVOID Environment OPTIONAL,
+    IN PUNICODE_STRING VariableName,
+    OUT PUNICODE_STRING VariableValue);
+
 #endif
 

trunk/libc/src/kNIX.nt/b_panic.c

@@ -4 +4 @@
  * LIBC SYS Backend - panic.
  *
- * Copyright (c) 2005 knut st. osmundsen <bird@anduin.net>
- *
- *
- * This file is part of InnoTek LIBC.
- *
- * InnoTek LIBC is free software; you can redistribute it and/or modify
+ * Copyright (c) 2005-2006 knut st. osmundsen <bird@anduin.net>
+ *
+ *
+ * This file is part of kLIBC.
+ *
+ * kLIBC is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * InnoTek LIBC is distributed in the hope that it will be useful,
+ * kLIBC is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -20 +20 @@
  *
  * You should have received a copy of the GNU General Public License
- * along with InnoTek LIBC; if not, write to the Free Software
+ * along with kLIBC; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
@@ -31 +31 @@
 *******************************************************************************/
 #define __LIBC_LOG_GROUP __LIBC_LOG_GRP_NOGROUP
-#define INCL_BASE
-#define INCL_ERRORS
-#define INCL_FSMACROS
-#define INCL_DOSUNDOCUEMENTED
 #define _GNU_SOURCE
+#include <klibc/nt/nt.h>
+#include <klibc/fib.h>
 #include <string.h>
 #include <InnotekLIBC/backend.h>
 #include <InnotekLIBC/sharedpm.h>
 #include <InnotekLIBC/logstrict.h>
-#include <os2emx.h>
-
-
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
-/** OS/2 default standard error handle. */
-#define HFILE_STDERR    ((HFILE)2)
 
 
@@ -63 +53 @@
 }
 
+
+
 /**
  * Compare and advance if found.
@@ -69 +61 @@
  * @returns 0 if no match.
  */
-static int panicStrICmp(const char **ppsz, const char *pszLower, const char *pszUpper)
-{
-    const char *psz = *ppsz;
-    while (*psz == *pszLower || *psz == *pszUpper)
-    {
-        psz++;
+static int panicStrICmp(const WCHAR **ppwsz, const char *pszLower, const char *pszUpper)
+{
+    const WCHAR *pwsz = *ppwsz;
+    while (*pwsz == *pszLower || *pwsz == *pszUpper)
+    {
+        pwsz++;
         pszUpper++;
         if (!*pszUpper)
         {
-            *ppsz = psz;
+            *ppwsz = pwsz;
             return 1;
         }
@@ -137 +129 @@
 
 /**
+ * Write panic text to the panic message / log.
+ *
+ * @param   psz     The text.
+ * @param   cch     The length.
+ */
+static void panicWrite(const char *psz, unsigned cch)
+{
+    /** @todo find somewhere to write the panic! */
+}
+
+
+/**
  * Print a panic message and dump/kill the process.
  *
@@ -168 +172 @@
      * First, terminate the exception handler chain to avoid recursive trouble.
      */
-    FS_VAR();
-    FS_SAVE_LOAD();
-    PTIB pTib;
-    PPIB pPib;
-    DosGetInfoBlocks(&pTib, &pPib);
-    pTib->tib_pexchain = END_OF_CHAIN;
+    __LIBC_PTEB pTeb = fibGetTEB();
+    pTeb->ExceptionList = (void *)-1;
 
     /*
      * Set the exit reason in SPM.
      */
-    if (!(fFlags & __LIBC_PANIC_NO_SPM_TERM))
-        __libc_spmTerm(__LIBC_EXIT_REASON_KILL, 127);
+//later    if (!(fFlags & __LIBC_PANIC_NO_SPM_TERM))
+//later        __libc_spmTerm(__LIBC_EXIT_REASON_KILL, 127);
 
     /*
@@ -186 +186 @@
     BOOL fQuiet = FALSE;
     BOOL fVerbose = TRUE;
-    BOOL fBreakpoint = DosSysCtl(DOSSYSCTL_AM_I_DEBUGGED, NULL) == TRUE;
+    BOOL fBreakpoint = fibIsBeingDebugged();
     BOOL fDumpProcess = TRUE;
-    const char *pszPanicCfg = NULL;
-    int rc = DosScanEnv((PCSZ)"LIBC_PANIC", (PSZ *)(void *)&pszPanicCfg);
-    if (!rc && pszPanicCfg && strnlen(pszPanicCfg, 512) < 512)
-    {
-        int c = 512;
-        while (c-- > 0 && *pszPanicCfg)
+    /* the variable name */
+    static WCHAR s_wszEnvVar[] = { 'L','I','B','C','_','P','A','N','I','C','\0' };
+    UNICODE_STRING s_EnvVar =
+    {
+        .Length = sizeof(s_wszEnvVar) - 2,
+        .MaximumLength = sizeof(s_wszEnvVar),
+        .Buffer = (PWSTR)&s_wszEnvVar[0]
+    };
+    /* the value buffer. */
+    static WCHAR s_wszEnvValue[512];
+    UNICODE_STRING EnvValue;
+    EnvValue.Length = EnvValue.MaximumLength = sizeof(s_wszEnvValue);
+    EnvValue.Buffer = &s_wszEnvValue[0];
+    /* do the query. */
+    NTSTATUS rc = RtlQueryEnvironmentVariable_U(NULL, &s_EnvVar, &EnvValue);
+    if (NT_SUCCESS(rc))
+    {
+        int c = EnvValue.Length;
+        const WCHAR *pwszPanicCfg = EnvValue.Buffer;
+        while (c-- > 0)
         {
-            if (panicStrICmp(&pszPanicCfg, "quiet", "QUIET"))
+            if (panicStrICmp(&pwszPanicCfg, "quiet", "QUIET"))
                 fQuiet = TRUE;
-            //else if (panicStrICmp(&pszPanicCfg, "noquiet", "NOQUIET"))
+            //else if (panicStrICmp(&pwszPanicCfg, "noquiet", "NOQUIET"))
             //    fQuiet = FALSE;
-            else if (panicStrICmp(&pszPanicCfg, "terse", "TERSE"))
+            else if (panicStrICmp(&pwszPanicCfg, "terse", "TERSE"))
                 fVerbose = FALSE;
-            //else if (panicStrICmp(&pszPanicCfg, "verbose", "VERBOSE"))
+            //else if (panicStrICmp(&pwszPanicCfg, "verbose", "VERBOSE"))
             //    fVerbose = TRUE;
-            else if (panicStrICmp(&pszPanicCfg, "breakpoint", "BREAKPOINT"))
+            else if (panicStrICmp(&pwszPanicCfg, "breakpoint", "BREAKPOINT"))
                 fBreakpoint = TRUE;
-            else if (panicStrICmp(&pszPanicCfg, "nobreakpoint", "NOBREAKPOINT"))
+            else if (panicStrICmp(&pwszPanicCfg, "nobreakpoint", "NOBREAKPOINT"))
                 fBreakpoint = FALSE;
-            //else if (panicStrICmp(&pszPanicCfg, "dump", "DUMP"))
+            //else if (panicStrICmp(&pwszPanicCfg, "dump", "DUMP"))
             //    fDumpProcess = TRUE;
-            else if (panicStrICmp(&pszPanicCfg, "nodump", "NODUMP"))
+            else if (panicStrICmp(&pwszPanicCfg, "nodump", "NODUMP"))
                 fDumpProcess = FALSE;
             else
-                pszPanicCfg++;
+                pwszPanicCfg++;
         }
     }
@@ -223 +237 @@
          * Write user message to stderr.
          */
-#define PRINT_CHAR(ch)  DosWrite(HFILE_STDERR, &ch,      1,                                    &cb)
-#define PRINT_C(msg)    DosWrite(HFILE_STDERR, msg,      sizeof(msg) - 1,                      &cb)
-#define PRINT_P(msg)    DosWrite(HFILE_STDERR, msg,      panicStrLen(msg),           &cb)
-#define PRINT_H(hex)    DosWrite(HFILE_STDERR, szHexNum, panicHex(szHexNum, hex, 0), &cb)
-#define PRINT_H16(hex)  DosWrite(HFILE_STDERR, szHexNum, panicHex(szHexNum, hex, 4), &cb)
-#define PRINT_H32(hex)  DosWrite(HFILE_STDERR, szHexNum, panicHex(szHexNum, hex, 8), &cb)
+#define PRINT_CHAR(ch)  panicWrite(&ch,      1)
+#define PRINT_C(msg)    panicWrite(msg,      sizeof(msg) - 1)
+#define PRINT_P(msg)    panicWrite(msg,      panicStrLen(msg))
+#define PRINT_H(hex)    panicWrite(szHexNum, panicHex(szHexNum, hex, 0))
+#define PRINT_H16(hex)  panicWrite(szHexNum, panicHex(szHexNum, hex, 4))
+#define PRINT_H32(hex)  panicWrite(szHexNum, panicHex(szHexNum, hex, 8))
         if (!(fFlags & __LIBC_PANIC_SIGNAL) && fVerbose)
             PRINT_C("\r\nLIBC PANIC!!\r\n");
@@ -312 +326 @@
 
             /* pid, tid and stuff */
-            PRINT_C("pid=0x");   PRINT_H16(pPib->pib_ulpid);
-            PRINT_C(" ppid=0x"); PRINT_H16(pPib->pib_ulppid);
-            PRINT_C(" tid=0x");  PRINT_H16(pTib->tib_ptib2->tib2_ultid);
-            PRINT_C(" slot=0x"); PRINT_H16(pTib->tib_ordinal);
-            PRINT_C(" pri=0x");  PRINT_H16(pTib->tib_ptib2->tib2_ulpri);
-            PRINT_C(" mc=0x");   PRINT_H16(pTib->tib_ptib2->tib2_usMCCount);
-
+            PRINT_C("pid=0x");   PRINT_H16((uintptr_t)pTeb->ClientId.UniqueProcess);
+            PRINT_C(" tid=0x");  PRINT_H16((uintptr_t)pTeb->ClientId.UniqueThread);
+
+#if 0
             /* executable name. */
             static char szExeName[CCHMAXPATH];
@@ -327 +338 @@
                 PRINT_P(szExeName);
             }
+#endif
 
             /*
@@ -333 +345 @@
             if (pvCtx)
             {
-                PCONTEXTRECORD pCtx = (PCONTEXTRECORD)pvCtx;
-
+                PCONTEXT pCtx = (PCONTEXT)pvCtx;
+
+#if 0
                 /* the module name */
-                if (pCtx->ctx_RegEip >= 0x10000)
+                if (pCtx->Eip >= 0x10000)
                 {
                     HMODULE hmod;
                     ULONG iObj = 0;
                     ULONG offObj = 0;
-                    if (!DosQueryModFromEIP(&hmod, &iObj, sizeof(szExeName), szExeName, &offObj, pCtx->ctx_RegEip))
+                    if (!DosQueryModFromEIP(&hmod, &iObj, sizeof(szExeName), szExeName, &offObj, pCtx->Eip))
                     {
                         PRINT_C("\r\n");
@@ -352 +365 @@
                     }
                 }
+#endif
 
                 /* registers */
                 PRINT_C("\r\ncs:eip=");
-                PRINT_H16(pCtx->ctx_SegCs);
+                PRINT_H16(pCtx->SegCs);
                 PRINT_C(":");
-                PRINT_H32(pCtx->ctx_RegEip);
+                PRINT_H32(pCtx->Eip);
 
                 PRINT_C("      ss:esp=");
-                PRINT_H16(pCtx->ctx_SegSs);
+                PRINT_H16(pCtx->SegSs);
                 PRINT_C(":");
-                PRINT_H32(pCtx->ctx_RegEsp);
+                PRINT_H32(pCtx->Esp);
 
                 PRINT_C("      ebp=");
-                PRINT_H32(pCtx->ctx_RegEbp);
+                PRINT_H32(pCtx->Ebp);
 
                 PRINT_C("\r\n ds=");
-                PRINT_H16(pCtx->ctx_SegDs);
+                PRINT_H16(pCtx->SegDs);
                 PRINT_C("      es=");
-                PRINT_H16(pCtx->ctx_SegEs);
+                PRINT_H16(pCtx->SegEs);
                 PRINT_C("      fs=");
-                PRINT_H16(pCtx->ctx_SegFs);
+                PRINT_H16(pCtx->SegFs);
                 PRINT_C("      gs=");
-                PRINT_H16(pCtx->ctx_SegGs);
+                PRINT_H16(pCtx->SegGs);
                 PRINT_C("     efl=");
-                PRINT_H32(pCtx->ctx_EFlags);
+                PRINT_H32(pCtx->EFlags);
 
                 PRINT_C("\r\neax=");
-                PRINT_H32(pCtx->ctx_RegEax);
+                PRINT_H32(pCtx->Eax);
                 PRINT_C(" ebx=");
-                PRINT_H32(pCtx->ctx_RegEbx);
+                PRINT_H32(pCtx->Ebx);
                 PRINT_C(" ecx=");
-                PRINT_H32(pCtx->ctx_RegEcx);
+                PRINT_H32(pCtx->Ecx);
                 PRINT_C(" edx=");
-                PRINT_H32(pCtx->ctx_RegEdx);
+                PRINT_H32(pCtx->Edx);
                 PRINT_C(" edi=");
-                PRINT_H32(pCtx->ctx_RegEdi);
+                PRINT_H32(pCtx->Edi);
                 PRINT_C(" esi=");
-                PRINT_H32(pCtx->ctx_RegEsi);
+                PRINT_H32(pCtx->Esi);
                 /** @todo fpu */
             }
@@ -408 +422 @@
     }
 
+#if 0
     /*
      * Attempt dumping the process.
@@ -413 +428 @@
     if (fDumpProcess)
     {
+        /// @todo Use MiniDumpWriteDump() if we're in a process which support dbghelp and such.
         LIBCLOG_MSG("Calling DosDumpProcess()\n");
         rc = DosDumpProcess(DDP_PERFORMPROCDUMP, 0, 0);
@@ -429 +445 @@
         }
     }
+#endif
 
     /*
      * Terminate the process.
      */
-    LIBCLOG_MSG("Calling DosKillProcess()\n");
+    LIBCLOG_MSG("Calling ZwTerminateProcess()\n");
     for (;;)
     {
-        DosKillProcess(DKP_PROCESS, pPib->pib_ulpid);
-        DosExit(EXIT_PROCESS, 127);
-    }
-}
-
+        ZwTerminateProcess(NtCurrentProcess(), 127);
+        ZwYieldExecution();
+    }
+}
+