X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fswitch.S;h=6cb70aa86e38b8ad85c930376e260ce7ef43cf1d;hb=441c95fdb9ead6e5575c3e720b47df6c20e179d2;hp=16c95180c2d36ec4ebe95bc02d775af26c8a0d4c;hpb=e97cef78cf98920695a3d4620f5ef623508950f4;p=pintos-anon diff --git a/src/threads/switch.S b/src/threads/switch.S index 16c9518..6cb70aa 100644 --- a/src/threads/switch.S +++ b/src/threads/switch.S @@ -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