Changeset 4003861 in mainline for kernel/arch/ia32/src

Timestamp:

2010-07-14T13:11:59Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

074c9bd, aa0d227

Parents:

6b1a85c (diff), f77e591d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/upa

Location:

kernel/arch/ia32/src

Files:

• asm.S (modified) (4 diffs)
• interrupt.c (modified) (1 diff)
• proc/scheduler.c (modified) (2 diffs)

kernel/arch/ia32/src/asm.S

@@ -175 +175 @@
 
 /*
- * Size of the entire istate structure including the error word and the
- * hardware-saved part.
- */
-#define ISTATE_REAL_SIZE  (ISTATE_SOFT_SIZE + 24)
-
-/*
  * The SYSENTER syscall mechanism can be used for syscalls with
  * four or fewer arguments. To pass these four arguments, we
@@ -191 +185 @@
 .global sysenter_handler
 sysenter_handler:
-        subl $(ISTATE_REAL_SIZE), %esp
+
+        /*
+         * Note that the space needed for the istate structure has been
+         * preallocated on the stack by before_thread_runs_arch().
+         */
 
         /*
@@ -260 +258 @@
         movl ISTATE_OFFSET_ESP(%esp), %ecx
 
-        addl $(ISTATE_REAL_SIZE), %esp
-        
         sysexit   /* return to userspace */
 
@@ -353 +349 @@
 #define ERROR_WORD_INTERRUPT_LIST  0x00027d00
 
-/** Declare interrupt handlers
- *
- * Declare interrupt handlers for n interrupt
- * vectors starting at vector i.
- *
- */
 .macro handler i
 .global int_\i

kernel/arch/ia32/src/interrupt.c

@@ -65 +65 @@
 void istate_decode(istate_t *istate)
 {
-        printf("error_word=%p\n", istate->error_word);
-        printf("eflags=%p\n", istate->eflags);
-
-        printf("cs =%p\tds =%p\tes =%p\n", istate->cs, istate->ds, istate->es);
-        printf("fs =%p\tgs =%p", istate->fs, istate->gs);
+        printf("cs =%p\teip=%p\tefl=%p\terr=%p\n",
+            istate->cs, istate->eip, istate->eflags, istate->error_word);
+
+        printf("ds =%p\tes =%p\tfs =%p\tgs =%p\n",
+            istate->ds, istate->es, istate->fs, istate->gs);
         if (istate_from_uspace(istate))
-                printf("\tss =%p\n", istate->ss);
-        else
-                printf("\n");
-
-        printf("eax=%p\tebx=%p\tecx=%p\n", istate->eax, istate->ebx,
-            istate->ecx);
-        printf("edx=%p\tedi=%p\tesi=%p\n", istate->edx, istate->edi,
-            istate->esi);
-        printf("ebp=%p\tesp=%p\teip=%p\n", istate->ebp,
-            istate_from_uspace(istate) ? istate->esp : (uintptr_t) &istate->esp,
-            istate->eip);
+                printf("ss =%p\n", istate->ss);
+
+        printf("eax=%p\tebx=%p\tecx=%p\tedx=%p\n",
+            istate->eax, istate->ebx, istate->ecx, istate->edx);
+        printf("esi=%p\tedi=%p\tebp=%p\tesp=%p\n",
+            istate->esi, istate->edi, istate->ebp,
+            istate_from_uspace(istate) ? istate->esp : (uintptr_t)&istate->esp);
 }
 

kernel/arch/ia32/src/proc/scheduler.c

@@ -38 +38 @@
 #include <proc/thread.h>
 #include <arch.h>
-#include <arch/context.h>  /* SP_DELTA */
+#include <arch/interrupt.h>
 #include <arch/pm.h>
 #include <arch/asm.h>
@@ -58 +58 @@
 void before_thread_runs_arch(void)
 {
-        uintptr_t kstk = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE -
-            SP_DELTA];
+        uintptr_t kstk = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE];
         
         if (CPU->arch.fi.bits.sep) {
                 /* Set kernel stack for CP3 -> CPL0 switch via SYSENTER */
-                write_msr(IA32_MSR_SYSENTER_ESP, kstk);
+                write_msr(IA32_MSR_SYSENTER_ESP, kstk - sizeof(istate_t));
         }