Rename schedule_tail() to thread_schedule_tail().

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

diff --git a/src/threads/switch.S b/src/threads/switch.S
index 5bb56b55ec1a84de04295b39f23032bd1ae94e2b..feca86cd16d02e3d6f31d1dde25cff379c0861a4 100644 (file)
--- a/src/threads/switch.S
+++ b/src/threads/switch.S
@@ -3,7 +3,7 @@
 #### 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 thread_switch(), returning CUR in
+#### which must also be running switch_threads(), returning CUR in
 #### NEXT's context.
 ####
 #### This function works by assuming that the thread we're switching
@@ -12,15 +12,17 @@
 #### restore the registers.  As part of switching stacks we record the
 #### current stack pointer in CUR's thread structure.
 
-.globl switch_threads 
+.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,
        # but requires us to preserve %ebx, %ebp, %esi, %edi.  See
-       # [SV-ABI-386] pages 3-11 and 3-12 for details.
+       # [SysV-ABI-386] pages 3-11 and 3-12 for details.
        #
-       # This stack frame must match the one set up by thread_create().
+       # This stack frame must match the one set up by thread_create()
+       # in size.
        pushl %ebx
        pushl %ebp
        pushl %esi
@@ -32,10 +34,7 @@ switch_threads:
 
        # Save current stack pointer to old thread's stack, if any.
        movl SWITCH_CUR(%esp), %eax
-       test %eax, %eax
-       jz 1f
        movl %esp, (%eax,%edx,1)
-1:
 
        # Restore stack pointer from new thread's stack.
        movl SWITCH_NEXT(%esp), %ecx
@@ -47,17 +46,20 @@ switch_threads:
        popl %ebp
        popl %ebx
         ret
+.endfunc
 
 .globl switch_entry
+.func switch_entry
 switch_entry:
        # Discard switch_threads() arguments.
        addl $8, %esp
 
-       # Call schedule_tail(prev).
+       # Call thread_schedule_tail(prev).
        pushl %eax
-.globl schedule_tail
-       call schedule_tail
+.globl thread_schedule_tail
+       call thread_schedule_tail
        addl $4, %esp
 
        # Start thread proper.
        ret
+.endfunc