Changeset 4003861 in mainline for kernel/arch/ia32/src/asm.S

Timestamp:

2010-07-14T13:11:59Z (15 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

File:

• kernel/arch/ia32/src/asm.S (modified) (4 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