Changeset 2038 for Whitix

Timestamp:

04/03/09 19:01:48 (3 years ago)

Author:

mwhitworth

Message:

No need to disable interrupts in ThrArchSwitch (already disabled in ThrSchedule), only try to trace stack once.

Files:

• Whitix/trunk/arch/i386/kernel/process.c (modified) (11 diffs)

Whitix/trunk/arch/i386/kernel/process.c

@@ -36 +36 @@
 struct TSS* tss=(struct TSS*)TSS_ADDR;
 
+/* Interrupts are already disabled when calling this function */
+
 struct Thread* ThrArchSwitch(struct Thread* prev, struct Thread* next)
 {
-        DWORD flags;
-
         if (lastMathThread != next)
                 SetCr0(GetCr0() | 8);
-
-        IrqSaveFlags(flags);
 
         /* Copy over the new TLS for the thread. See boot/multiboot.S for the
@@ -50 +48 @@
         
         tss->esp0=(next->currStack & ~(ARCH_STACK_SIZE-1))+ARCH_STACK_SIZE;
-        i386ContextSwitch(prev,next);
-
-        IrqRestoreFlags(flags);
+        
+        i386ContextSwitch(prev, next);
 
         return prev;
@@ -75 +72 @@
 }
 
-/* 512k stack. */
-#define I386_STACK_LENGTH 512*1024
+/* 256k stack. */
+#define I386_STACK_LENGTH 256*1024
 
 void ThrArchSetupUserStack(struct Thread* ret, DWORD* stackP, void* argument)
@@ -85 +82 @@
         if (!*stackP)
                 /* Allocate own user stack. Used for when it doesn't really matter. */
-                *stackP=MMapDo(ret->parent, NULL, 0, I386_STACK_LENGTH, PAGE_RW | PAGE_PRESENT | PAGE_USER, 0, MMAP_PRIVATE, NULL)+I386_STACK_LENGTH;
+                *stackP=MMapDo(ret->parent, NULL, 0, I386_STACK_LENGTH, PAGE_RW | PAGE_PRESENT | PAGE_USER, 0, MMAP_PRIVATE, NULL) + I386_STACK_LENGTH;
 
         ret->esp3=*stackP; /* User stack */
 
         IrqSaveFlags(flags);
+
         VirtSetCurrent(ret->parent->memManager);
 
@@ -113 +111 @@
         /* Allocate the kernel stack. */
         ret->currStack=(DWORD)MemAlloc(ARCH_STACK_SIZE);
-        ret->currStack+=ARCH_STACK_SIZE;
+        ret->currStack += ARCH_STACK_SIZE;
         
         ret->entry=entry; /* eip */
@@ -133 +131 @@
         *--currP=(user) ? (DWORD)ThrArchEnterUser : entry;
 
+        /* EFLAGS, important for kernel threads. */
+        *--currP = 0x202;
+
         /* Zero all the general purpose registers - simulate a pusha. */
         for (i=0; i<8; i++)
@@ -157 +158 @@
 #define PROCESS_STACK_LENGTH    100
 
-void ThrArchPrintStack(DWORD* esp)
+struct StackFrame
+{
+        struct StackFrame* nextFrame;
+        DWORD retAddr;
+};
+
+void ThrArchPrintStack(DWORD* ebp)
 {
         int i;
+        struct StackFrame* curr = (struct StackFrame*)ebp;
         
         KePrint(KERN_ERROR "Stack trace:\n");
-        for (i=0; i< PROCESS_STACK_LENGTH; i++,esp++)
+        for (i=0; i<10; i++)
         {
-                if (*esp > (DWORD)code && *esp < (DWORD)endCode)
-                {
-                        SymbolPrint(*esp);
-                }else if (*esp > 0xD8000000 && *esp < 0xE0000000)
-                        ModuleSymbolPrint(*esp);
+                DWORD retAddr = curr->retAddr;
+                                
+                curr = curr->nextFrame;
+                
+                if (!curr)
+                        break;
+                
+                if (retAddr > (DWORD)code && retAddr < (DWORD)endCode)
+                        SymbolPrint(retAddr);
+                else if (retAddr > 0xD8000000 && retAddr < 0xE0000000)
+                        ModuleSymbolPrint(retAddr);
         }
 }
@@ -174 +188 @@
 void ThrArchPrintCurrStack()
 {
-        DWORD* currEsp;
-        
-        asm volatile("mov %%esp, %%eax" : "=a"(currEsp));
-        
-        ThrArchPrintStack(currEsp);
+        DWORD* currEbp;
+        
+        asm volatile("mov %%ebp, %%eax" : "=a"(currEbp));
+        
+        ThrArchPrintStack(currEbp);
 }
 
 SYMBOL_EXPORT(ThrArchPrintCurrStack);
+
+static int crashing = 0;
 
 void ThrArchPrintContext(struct Context* curr)
@@ -187 +203 @@
         DWORD flags;
         DWORD* esp;
+
+        if (crashing)
+                MachineHalt();
 
         IrqSaveFlags(flags);
@@ -193 +212 @@
                 esp=(DWORD*)curr->esp3;
         else
+        {
+                crashing = 1;
                 esp=(DWORD*)curr->esp0;
+        }
 
         KePrint("Thread context:\n");
@@ -204 +226 @@
         if (current)
                 KePrint("process id = %u process name = %s\n",current->pid,ThrGetProcName(current->pid));
-
+        
         if (!(curr->cs & 0x3))
                 ThrArchPrintStack(esp);