Changeset 2085 for Whitix/branches/netchannel/arch/i386/kernel/ints.c

Timestamp:

05/20/10 16:05:25 (2 years ago)

Author:

mwhitworth

Message:

Add to TCP/IP stack.

Files:

• Whitix/branches/netchannel/arch/i386/kernel/ints.c (modified) (4 diffs)

Whitix/branches/netchannel/arch/i386/kernel/ints.c

@@ -268 +268 @@
 }
 
+void IrqDoEvent(struct Context* curr)
+{
+        if (curr->cs != 0x08)
+        {
+                PreemptDisable();
+
+                DWORD* esp;
+
+                currThread->oldEip = curr->eip;
+                currThread->esp3 = curr->esp3;
+                curr->esp3 = currThread->eventStack;
+                curr->eip = (DWORD)currThread->eventFunc;
+
+                /* Push onto stack */
+                esp = (DWORD*)curr->esp3;
+
+                extern DWORD retFromEvent;
+                *--esp = (DWORD)currThread->eventData;
+                *--esp = retFromEvent;
+
+                curr->esp3 = (DWORD)esp;
+                currThread->eventFunc = NULL;
+                currThread->eventData = NULL;
+                
+                PreemptFastEnable();
+        }
+}
+
 /***********************************************************************
  *
@@ -284 +312 @@
         DWORD irq=curr.irq;
 
+        /* FIXME: Unreliable, since we can be interrupted. */
         if (currThread)
                 currThread->currContext=&curr;
@@ -298 +327 @@
 
                 case 0x30:
-                        curr.eax=IrqSysCall(curr.eax,curr.edx,curr.ecx);
+                        curr.eax = IrqSysCall(curr.eax,curr.edx,curr.ecx);
                         break;
 
@@ -307 +336 @@
         if (thrNeedSchedule && PreemptCanSchedule())
                 ThrSchedule();
-}
-
+
+        if (currThread && (currThread->flags & THR_NEED_RESTORE))
+        {
+                curr.eip = currThread->oldEip;
+                curr.esp3 = currThread->esp3;
+                currThread->flags &= ~(THR_NEED_RESTORE);
+        }
+
+        if (currThread && currThread->eventFunc)
+                IrqDoEvent(&curr);
+}
+