X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fswitch.S;h=6cb70aa86e38b8ad85c930376e260ce7ef43cf1d;hb=745d62ba7e4bef2887ce158a3b2cfc5f24ebadef;hp=fddd821afc8ef296fb22d800768e743577be89c5;hpb=44d0fa6a2b24a84e5eb0d54959ed91c1d4f15343;p=pintos-anon

diff --git a/src/threads/switch.S b/src/threads/switch.S
index fddd821..6cb70aa 100644
--- 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
@@ -11,7 +28,7 @@ switch_threads:
 	pushl %edi
 
 	# Get offsetof (struct thread, stack).
-	.globl thread_stack_ofs
+.globl thread_stack_ofs
 	mov thread_stack_ofs, %edx
 
 	# Save current stack pointer to old thread's stack, if any.
@@ -31,17 +48,20 @@ switch_threads:
 	popl %ebp
 	popl %ebx
         ret
+.endfunc
 
-	.globl switch_entry
+.globl switch_entry
+.func switch_entry
 switch_entry:
-	# Discard thread_switch() arguments.
+	# Discard switch_threads() arguments.
 	addl $8, %esp
 
 	# Call schedule_tail(prev).
 	pushl %eax
-	.globl schedule_tail
+.globl schedule_tail
 	call schedule_tail
 	addl $4, %esp
 
 	# Start thread proper.
 	ret
+.endfunc