Formatting.

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

diff --git a/src/threads/switch.S b/src/threads/switch.S
index ba699988de02005bbe8aef62d6e40b723f4c7956..6cb70aa86e38b8ad85c930376e260ce7ef43cf1d 100644 (file)
--- a/src/threads/switch.S
+++ b/src/threads/switch.S
@@ -1,9 +1,9 @@
-#include "switch.h"
+#include "threads/switch.h"
 
 #### 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,13 +12,14 @@
 #### 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().
        pushl %ebx
@@ -47,8 +48,10 @@ switch_threads:
        popl %ebp
        popl %ebx
         ret
+.endfunc
 
 .globl switch_entry
+.func switch_entry
 switch_entry:
        # Discard switch_threads() arguments.
        addl $8, %esp
@@ -61,3 +64,4 @@ switch_entry:
 
        # Start thread proper.
        ret
+.endfunc