Improve debuggability by adding .func/.endfunc around functions.

diff --git a/grading/userprog/null.S b/grading/userprog/null.S
index e4f7e3af016d2d7638a131dbcd4b891335d8fa0d..ded0e5954935a595cfd12fc64217ea0d9f0f2766 100644 (file)
--- a/grading/userprog/null.S
+++ b/grading/userprog/null.S
@@ -1,3 +1,5 @@
-       .globl _start
+.globl _start
+.func _start
 _start:                
        int $0x30
+.endfunc

diff --git a/src/threads/start.S b/src/threads/start.S
index df63f8595abec0bdfe08835706ce64f4ad695d5d..5a495c4651fecd6bf3d920130123f47f55f6588e 100644 (file)
--- a/src/threads/start.S
+++ b/src/threads/start.S
@@ -4,10 +4,13 @@
 #### so that this module appears at the very beginning of the kernel
 #### image, and then using that as the entry point.
 
-.globl start
 .section .start
-
+       
+.globl start
+.func start
+       # Call main.
 start: call main
 
-       # If main returns, spin.
+       # main() should not return, but if it does, spin.
 1:     jmp 1b
+.endfunc

diff --git a/src/threads/switch.S b/src/threads/switch.S
index 4f0d412c7266e3117d6fa33bdb2e9f598dbb63e8..f58c4a8931a15c8908b8d2264608e1b8ace344d6 100644 (file)
--- a/src/threads/switch.S
+++ b/src/threads/switch.S
@@ -12,9 +12,10 @@
 #### restore the registers.  As part of switching stacks we record the
 #### current stack pointer in CUR's thread structure.
 
-       .intel_syntax noprefix
+.intel_syntax noprefix
 
-.globl switch_threads 
+.globl switch_threads
+.func switch_threads
 switch_threads:
        # Save caller's register state.
        #
@@ -49,8 +50,10 @@ switch_threads:
        pop ebp
        pop ebx
         ret
+.endfunc
 
 .globl switch_entry
+.func switch_entry
 switch_entry:
        # Discard switch_threads() arguments.
        add esp, 8
@@ -63,3 +66,4 @@ switch_entry:
 
        # Start thread proper.
        ret
+.endfunc