projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More to-do.
[pintos-anon]
/
src
/
threads
/
switch.S
diff --git
a/src/threads/switch.S
b/src/threads/switch.S
index 374da9e4a11cfd64a79816c3d358a177b224ff09..f58c4a8931a15c8908b8d2264608e1b8ace344d6 100644
(file)
--- a/
src/threads/switch.S
+++ b/
src/threads/switch.S
@@
-12,52
+12,58
@@
#### restore the registers. As part of switching stacks we record the
#### current stack pointer in CUR's thread structure.
#### restore the registers. As part of switching stacks we record the
#### current stack pointer in CUR's thread structure.
-.globl switch_threads
+.intel_syntax noprefix
+
+.globl switch_threads
+.func switch_threads
switch_threads:
# Save caller's register state.
#
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
+ # Note that the SVR4 ABI allows us to destroy
eax, ecx,
edx,
+ # but requires us to preserve
ebx, ebp, esi,
edi. See
# [SysV-ABI-386] pages 3-11 and 3-12 for details.
#
# This stack frame must match the one set up by thread_create().
# [SysV-ABI-386] pages 3-11 and 3-12 for details.
#
# This stack frame must match the one set up by thread_create().
- push
l %
ebx
- push
l %
ebp
- push
l %
esi
- push
l %
edi
+ push
ebx
+ push
ebp
+ push
esi
+ push
edi
# Get offsetof (struct thread, stack).
.globl thread_stack_ofs
# Get offsetof (struct thread, stack).
.globl thread_stack_ofs
- mov
thread_stack_ofs, %edx
+ mov
edx, thread_stack_ofs
# Save current stack pointer to old thread's stack, if any.
# Save current stack pointer to old thread's stack, if any.
- mov
l SWITCH_CUR(%esp), %eax
- test
%eax, %
eax
+ mov
eax, SWITCH_CUR[esp]
+ test
eax,
eax
jz 1f
jz 1f
- mov
l %esp, (%eax,%edx,1)
+ mov
[eax + edx], esp
1:
# Restore stack pointer from new thread's stack.
1:
# Restore stack pointer from new thread's stack.
- mov
l SWITCH_NEXT(%esp), %ecx
- mov
l (%ecx,%edx,1), %esp
+ mov
ecx, SWITCH_NEXT[esp]
+ mov
esp, [ecx + edx]
# Restore caller's register state.
# Restore caller's register state.
- pop
l %
edi
- pop
l %
esi
- pop
l %
ebp
- pop
l %
ebx
+ pop
edi
+ pop
esi
+ pop
ebp
+ pop
ebx
ret
ret
+.endfunc
.globl switch_entry
.globl switch_entry
+.func switch_entry
switch_entry:
# Discard switch_threads() arguments.
switch_entry:
# Discard switch_threads() arguments.
- add
l $8, %esp
+ add
esp, 8
# Call schedule_tail(prev).
# Call schedule_tail(prev).
- push
l %
eax
+ push
eax
.globl schedule_tail
call schedule_tail
.globl schedule_tail
call schedule_tail
- add
l $4, %esp
+ add
esp, 4
# Start thread proper.
ret
# Start thread proper.
ret
+.endfunc