Revert Intel-style assembly back to AT&T-style.

[pintos-anon] / src / threads / switch.S

diff --git a/src/threads/switch.S b/src/threads/switch.S
index c077e46d590202ef5156ab0d9084d1ea28e6afe2..6cb70aa86e38b8ad85c930376e260ce7ef43cf1d 100644 (file)
--- a/src/threads/switch.S
+++ b/src/threads/switch.S
@@ -1,9 +1,26 @@
-#include "switch.h"
+#include "threads/switch.h"
 
-.globl switch_threads 
+#### struct thread *switch_threads (struct thread *cur, struct thread *next);
+####
+#### Switches from CUR, which must be the running thread, to NEXT,
+#### which must also be running switch_threads(), returning CUR in
+#### NEXT's context.
+####
+#### This function works by assuming that the thread we're switching
+#### into is also running switch_threads().  Thus, all it has to do is
+#### preserve a few registers on the stack, then switch stacks and
+#### restore the registers.  As part of switching stacks we record the
+#### current stack pointer in CUR's thread structure.
+
+.globl switch_threads
+.func switch_threads
 switch_threads:
        # Save caller's register state.
-       # Note that the SVR4 ABI allows us to destroy %eax, %ecx, %edx.
+       #
+       # Note that the SVR4 ABI allows us to destroy %eax, %ecx, %edx,
+       # but requires us to preserve %ebx, %ebp, %esi, %edi.  See
+       # [SysV-ABI-386] pages 3-11 and 3-12 for details.
+       #
        # This stack frame must match the one set up by thread_create().
        pushl %ebx
        pushl %ebp
@@ -31,10 +48,12 @@ switch_threads:
        popl %ebp
        popl %ebx
         ret
+.endfunc
 
 .globl switch_entry
+.func switch_entry
 switch_entry:
-       # Discard thread_switch() arguments.
+       # Discard switch_threads() arguments.
        addl $8, %esp
 
        # Call schedule_tail(prev).
@@ -45,3 +64,4 @@ switch_entry:
 
        # Start thread proper.
        ret
+.endfunc