Merge branch "preempt" in "trunk".

[bertos.git] / bertos / emul / switch_i386.S

diff --git a/bertos/emul/switch_i386.S b/bertos/emul/switch_i386.S
index 0b2f0937e07c2fed3251a32fc4d5c723aa7a249e..b605c15edde69ee29af960b6f9ce9bdcf4f76fe2 100644 (file)
--- a/bertos/emul/switch_i386.S
+++ b/bertos/emul/switch_i386.S
@@ -26,9 +26,8 @@
  * invalidate any other reasons why the executable file might be covered by
  * the GNU General Public License.
  *
- * Copyright 2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2004, 2008 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999, 2000, 2001 Bernie Innocenti <bernie@codewiz.org>
- * This file is part of DevLib - See devlib/README for information.
  * -->
  *
  * \version $Id$
@@ -37,43 +36,26 @@
  * \brief i386 context switch
  */
 
-
-
 #ifdef __APPLE__
-    //This workaround is necessary to compile under OS X assembler.
+    // This workaround is necessary to compile under OS X assembler.
     #define SWITCH_CONTEXT _asm_switch_context
-    #define SWITCH_VERSION _asm_switch_version
 #else
     #define SWITCH_CONTEXT asm_switch_context
-    #define SWITCH_VERSION asm_switch_version
 #endif
 
-/* void asm_switch_context(void ** new_sp, void ** save_sp) */
+/* void asm_switch_context(void ** new_sp [sp+4], void ** save_sp [sp+8]) */
 .globl SWITCH_CONTEXT
 SWITCH_CONTEXT:
-       pushl   %eax
-       pushl   %ebx
-       pushl   %ecx
-       pushl   %edx
-       pushl   %esi
-       pushl   %edi
        pushl   %ebp
+       pushl   %edi
+       pushl   %esi
+       pushl   %ebx
        movl    0x24(%esp),%ebp         /* ebp = save_sp */
        movl    %esp,(%ebp)             /* *save_sp = esp */
        movl    0x20(%esp),%ebp         /* ebp = new_sp */
        movl    (%ebp),%esp             /* esp = *new_sp */
-       popl    %ebp
-       popl    %edi
-       popl    %esi
-       popl    %edx
-       popl    %ecx
        popl    %ebx
-       popl    %eax
-       ret
-
-/* int asm_switch_version(void) */
-.globl SWITCH_VERSION
-SWITCH_VERSION:
-       mov     $1,%eax
+       popl    %esi
+       popl    %edi
+       popl    %ebp
        ret
-