X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fswitch.S;h=feca86cd16d02e3d6f31d1dde25cff379c0861a4;hb=fd2a5afa946474ba0839de0e9da238dbaecbd6a5;hp=a7c27fb03eb8fc3cb73ccee19f07ef21438d61ea;hpb=750d21936d284127e265d050ccbce76fca1ece1a;p=pintos-anon

diff --git a/src/threads/switch.S b/src/threads/switch.S
index a7c27fb..feca86c 100644
--- a/src/threads/switch.S
+++ b/src/threads/switch.S
@@ -1,31 +1,43 @@
-#### 0(%esp) - old registers
-#### 16(%esp) - return address
-#### 20(%esp) - current thread
-#### 24(%esp) - new thread
+#include "threads/switch.h"
 
-        .globl thread_switch 
-thread_switch:
+#### 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.
-	# This stack frame must match the one set up by thread_create().
+	#
+	# 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()
+	# in size.
 	pushl %ebx
 	pushl %ebp
 	pushl %esi
 	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.
-	movl 20(%esp), %eax
-	test %eax, %eax
-	jz 1f
+	movl SWITCH_CUR(%esp), %eax
 	movl %esp, (%eax,%edx,1)
-1:
 
 	# Restore stack pointer from new thread's stack.
-	movl 24(%esp), %ecx
+	movl SWITCH_NEXT(%esp), %ecx
 	movl (%ecx,%edx,1), %esp
 
 	# Restore caller's register state.
@@ -34,3 +46,20 @@ thread_switch:
 	popl %ebp
 	popl %ebx
         ret
+.endfunc
+
+.globl switch_entry
+.func switch_entry
+switch_entry:
+	# Discard switch_threads() arguments.
+	addl $8, %esp
+
+	# Call thread_schedule_tail(prev).
+	pushl %eax
+.globl thread_schedule_tail
+	call thread_schedule_tail
+	addl $4, %esp
+
+	# Start thread proper.
+	ret
+.endfunc