Rename printk() to printf().

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

diff --git a/src/threads/switch.S b/src/threads/switch.S
index 5b661ec1f1fd88924704dc95c2238987479dc6ab..5bb56b55ec1a84de04295b39f23032bd1ae94e2b 100644 (file)
--- a/src/threads/switch.S
+++ b/src/threads/switch.S
@@ -1,9 +1,25 @@
-#include "switch.h"
+#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 thread_switch(), 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 
+switch_threads:
        # Save caller's register state.
-       # Note that the SVR4 ABI allows us to destroy %eax, %ecx, %edx.
+       #
+       # 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.
+       #
        # This stack frame must match the one set up by thread_create().
        pushl %ebx
        pushl %ebp
@@ -11,7 +27,7 @@ thread_switch:
        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.
@@ -31,3 +47,17 @@ thread_switch:
        popl %ebp
        popl %ebx
         ret
+
+.globl switch_entry
+switch_entry:
+       # Discard switch_threads() arguments.
+       addl $8, %esp
+
+       # Call schedule_tail(prev).
+       pushl %eax
+.globl schedule_tail
+       call schedule_tail
+       addl $4, %esp
+
+       # Start thread proper.
+       ret