Merge branch 'master' of git+ssh://am.lcs/home/am0/6.828/xv6

This commit is contained in:
Austin Clements 2009-10-24 21:31:08 -04:00
commit d6cd7d0804

4
proc.h
View file

@ -15,7 +15,9 @@
// x86 convention is that the caller has saved them. // x86 convention is that the caller has saved them.
// Contexts are stored at the bottom of the stack they // Contexts are stored at the bottom of the stack they
// describe; the stack pointer is the address of the context. // describe; the stack pointer is the address of the context.
// The layout of the context must match the code in swtch.S. // The layout of the context matches the layout of the stack in swtch.S
// at "Switch stacks" comment. Switch itself doesn't save eip explicitly,
// but it is on the stack and allocproc() manipulates it.
struct context { struct context {
uint edi; uint edi;
uint esi; uint esi;