Imagelibrary/riscv-operating-system-mooc
1
0
Fork 0
mirror of https://github.com/plctlab/riscv-operating-system-mooc.git synced 2025-12-05 15:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed issues I42AUE & I42BLV

Browse Source
This commit is contained in:
Wang Chen
2021-08-01 16:05:35 +08:00
parent 100cc9f1d9
commit 09ea96ffed
12 changed files with 133 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/os/03-contextswitch/entry.S
View File

@@ -33,7 +33,9 @@
sw t3, 108(\base) sw t3, 108(\base)
sw t4, 112(\base) sw t4, 112(\base)
sw t5, 116(\base) sw t5, 116(\base)
sw t6, 120(\base) # we don't save t6 here, due to we have used
# it as base, we have to save t6 in an extra step
# outside of reg_save
.endm .endm
# restore all General-Purpose(GP) registers from the context # restore all General-Purpose(GP) registers from the context
@@ -90,6 +92,12 @@ switch_to:
beqz t6, 1f # Notice: previous task may be NULL beqz t6, 1f # Notice: previous task may be NULL
reg_save t6 # save context of prev task reg_save t6 # save context of prev task
# Save the actual t6 register, which we swapped into
# mscratch
mv t5, t6 # t5 points to the context of current task
csrr t6, mscratch # read t6 back from mscratch
sw t6, 120(t5) # save t6 with t5 as base
1: 1:
# switch mscratch to point to the context of the next task # switch mscratch to point to the context of the next task
csrw mscratch, a0 csrw mscratch, a0
@@ -98,7 +106,7 @@ switch_to:
# Use t6 to point to the context of the new task # Use t6 to point to the context of the new task
mv t6, a0 mv t6, a0
reg_restore t6 reg_restore t6
# Do actual context switching. # Do actual context switching.
ret ret

12
code/os/04-multitask/entry.S
View File

@@ -33,7 +33,9 @@
sw t3, 108(\base) sw t3, 108(\base)
sw t4, 112(\base) sw t4, 112(\base)
sw t5, 116(\base) sw t5, 116(\base)
sw t6, 120(\base) # we don't save t6 here, due to we have used
# it as base, we have to save t6 in an extra step
# outside of reg_save
.endm .endm
# restore all General-Purpose(GP) registers from the context # restore all General-Purpose(GP) registers from the context
@@ -90,6 +92,12 @@ switch_to:
beqz t6, 1f # Notice: previous task may be NULL beqz t6, 1f # Notice: previous task may be NULL
reg_save t6 # save context of prev task reg_save t6 # save context of prev task
# Save the actual t6 register, which we swapped into
# mscratch
mv t5, t6 # t5 points to the context of current task
csrr t6, mscratch # read t6 back from mscratch
sw t6, 120(t5) # save t6 with t5 as base
1: 1:
# switch mscratch to point to the context of the next task # switch mscratch to point to the context of the next task
csrw mscratch, a0 csrw mscratch, a0
@@ -98,7 +106,7 @@ switch_to:
# Use t6 to point to the context of the new task # Use t6 to point to the context of the new task
mv t6, a0 mv t6, a0
reg_restore t6 reg_restore t6
# Do actual context switching. # Do actual context switching.
ret ret

22
code/os/05-traps/entry.S
View File

@@ -33,7 +33,9 @@
sw t3, 108(\base) sw t3, 108(\base)
sw t4, 112(\base) sw t4, 112(\base)
sw t5, 116(\base) sw t5, 116(\base)
sw t6, 120(\base) # we don't save t6 here, due to we have used
# it as base, we have to save t6 in an extra step
# outside of reg_save
.endm .endm
# restore all General-Purpose(GP) registers from the context # restore all General-Purpose(GP) registers from the context
@@ -89,7 +91,15 @@ trap_vector:
# save context(registers). # save context(registers).
csrrw t6, mscratch, t6 # swap t6 and mscratch csrrw t6, mscratch, t6 # swap t6 and mscratch
reg_save t6 reg_save t6
csrw mscratch, t6
# Save the actual t6 register, which we swapped into
# mscratch
mv t5, t6 # t5 points to the context of current task
csrr t6, mscratch # read t6 back from mscratch
sw t6, 120(t5) # save t6 with t5 as base
# Restore the context pointer into mscratch
csrw mscratch, t5
# call the C trap handler in trap.c # call the C trap handler in trap.c
csrr a0, mepc csrr a0, mepc
@@ -115,6 +125,12 @@ switch_to:
beqz t6, 1f # Notice: previous task may be NULL beqz t6, 1f # Notice: previous task may be NULL
reg_save t6 # save context of prev task reg_save t6 # save context of prev task
# Save the actual t6 register, which we swapped into
# mscratch
mv t5, t6 # t5 points to the context of current task
csrr t6, mscratch # read t6 back from mscratch
sw t6, 120(t5) # save t6 with t5 as base
1: 1:
# switch mscratch to point to the context of the next task # switch mscratch to point to the context of the next task
csrw mscratch, a0 csrw mscratch, a0
@@ -123,7 +139,7 @@ switch_to:
# Use t6 to point to the context of the new task # Use t6 to point to the context of the new task
mv t6, a0 mv t6, a0
reg_restore t6 reg_restore t6
# Do actual context switching. # Do actual context switching.
ret ret

22
code/os/06-interrupts/entry.S
View File

@@ -33,7 +33,9 @@
sw t3, 108(\base) sw t3, 108(\base)
sw t4, 112(\base) sw t4, 112(\base)
sw t5, 116(\base) sw t5, 116(\base)
sw t6, 120(\base) # we don't save t6 here, due to we have used
# it as base, we have to save t6 in an extra step
# outside of reg_save
.endm .endm
# restore all General-Purpose(GP) registers from the context # restore all General-Purpose(GP) registers from the context
@@ -89,7 +91,15 @@ trap_vector:
# save context(registers). # save context(registers).
csrrw t6, mscratch, t6 # swap t6 and mscratch csrrw t6, mscratch, t6 # swap t6 and mscratch
reg_save t6 reg_save t6
csrw mscratch, t6
# Save the actual t6 register, which we swapped into
# mscratch
mv t5, t6 # t5 points to the context of current task
csrr t6, mscratch # read t6 back from mscratch
sw t6, 120(t5) # save t6 with t5 as base
# Restore the context pointer into mscratch
csrw mscratch, t5
# call the C trap handler in trap.c # call the C trap handler in trap.c
csrr a0, mepc csrr a0, mepc
@@ -115,6 +125,12 @@ switch_to:
beqz t6, 1f # Notice: previous task may be NULL beqz t6, 1f # Notice: previous task may be NULL
reg_save t6 # save context of prev task reg_save t6 # save context of prev task
# Save the actual t6 register, which we swapped into
# mscratch
mv t5, t6 # t5 points to the context of current task
csrr t6, mscratch # read t6 back from mscratch
sw t6, 120(t5) # save t6 with t5 as base
1: 1:
# switch mscratch to point to the context of the next task # switch mscratch to point to the context of the next task
csrw mscratch, a0 csrw mscratch, a0
@@ -123,7 +139,7 @@ switch_to:
# Use t6 to point to the context of the new task # Use t6 to point to the context of the new task
mv t6, a0 mv t6, a0
reg_restore t6 reg_restore t6
# Do actual context switching. # Do actual context switching.
ret ret

22
code/os/07-hwtimer/entry.S
View File

@@ -33,7 +33,9 @@
sw t3, 108(\base) sw t3, 108(\base)
sw t4, 112(\base) sw t4, 112(\base)
sw t5, 116(\base) sw t5, 116(\base)
sw t6, 120(\base) # we don't save t6 here, due to we have used
# it as base, we have to save t6 in an extra step
# outside of reg_save
.endm .endm
# restore all General-Purpose(GP) registers from the context # restore all General-Purpose(GP) registers from the context
@@ -89,7 +91,15 @@ trap_vector:
# save context(registers). # save context(registers).
csrrw t6, mscratch, t6 # swap t6 and mscratch csrrw t6, mscratch, t6 # swap t6 and mscratch
reg_save t6 reg_save t6
csrw mscratch, t6
# Save the actual t6 register, which we swapped into
# mscratch
mv t5, t6 # t5 points to the context of current task
csrr t6, mscratch # read t6 back from mscratch
sw t6, 120(t5) # save t6 with t5 as base
# Restore the context pointer into mscratch
csrw mscratch, t5
# call the C trap handler in trap.c # call the C trap handler in trap.c
csrr a0, mepc csrr a0, mepc
@@ -115,6 +125,12 @@ switch_to:
beqz t6, 1f # Notice: previous task may be NULL beqz t6, 1f # Notice: previous task may be NULL
reg_save t6 # save context of prev task reg_save t6 # save context of prev task
# Save the actual t6 register, which we swapped into
# mscratch
mv t5, t6 # t5 points to the context of current task
csrr t6, mscratch # read t6 back from mscratch
sw t6, 120(t5) # save t6 with t5 as base
1: 1:
# switch mscratch to point to the context of the next task # switch mscratch to point to the context of the next task
csrw mscratch, a0 csrw mscratch, a0
@@ -123,7 +139,7 @@ switch_to:
# Use t6 to point to the context of the new task # Use t6 to point to the context of the new task
mv t6, a0 mv t6, a0
reg_restore t6 reg_restore t6
# Do actual context switching. # Do actual context switching.
ret ret

18
code/os/08-preemptive/entry.S
View File

@@ -33,7 +33,9 @@
sw t3, 108(\base) sw t3, 108(\base)
sw t4, 112(\base) sw t4, 112(\base)
sw t5, 116(\base) sw t5, 116(\base)
sw t6, 120(\base) # we don't save t6 here, due to we have used
# it as base, we have to save t6 in an extra step
# outside of reg_save
.endm .endm
# restore all General-Purpose(GP) registers from the context # restore all General-Purpose(GP) registers from the context
@@ -89,11 +91,19 @@ trap_vector:
# save context(registers). # save context(registers).
csrrw t6, mscratch, t6 # swap t6 and mscratch csrrw t6, mscratch, t6 # swap t6 and mscratch
reg_save t6 reg_save t6
csrw mscratch, t6
# Save the actual t6 register, which we swapped into
# mscratch
mv t5, t6 # t5 points to the context of current task
csrr t6, mscratch # read t6 back from mscratch
sw t6, 120(t5) # save t6 with t5 as base
# save mepc to context of current task # save mepc to context of current task
csrr a0, mepc csrr a0, mepc
sw a0, 124(t6) sw a0, 124(t5)
# Restore the context pointer into mscratch
csrw mscratch, t5
# call the C trap handler in trap.c # call the C trap handler in trap.c
csrr a0, mepc csrr a0, mepc
@@ -125,7 +135,7 @@ switch_to:
# Use t6 to point to the context of the new task # Use t6 to point to the context of the new task
mv t6, a0 mv t6, a0
reg_restore t6 reg_restore t6
# Do actual context switching. # Do actual context switching.
# Notice this will enable global interrupt # Notice this will enable global interrupt
mret mret

18
code/os/09-lock/entry.S
View File

@@ -33,7 +33,9 @@
sw t3, 108(\base) sw t3, 108(\base)
sw t4, 112(\base) sw t4, 112(\base)
sw t5, 116(\base) sw t5, 116(\base)
sw t6, 120(\base) # we don't save t6 here, due to we have used
# it as base, we have to save t6 in an extra step
# outside of reg_save
.endm .endm
# restore all General-Purpose(GP) registers from the context # restore all General-Purpose(GP) registers from the context
@@ -89,11 +91,19 @@ trap_vector:
# save context(registers). # save context(registers).
csrrw t6, mscratch, t6 # swap t6 and mscratch csrrw t6, mscratch, t6 # swap t6 and mscratch
reg_save t6 reg_save t6
csrw mscratch, t6
# Save the actual t6 register, which we swapped into
# mscratch
mv t5, t6 # t5 points to the context of current task
csrr t6, mscratch # read t6 back from mscratch
sw t6, 120(t5) # save t6 with t5 as base
# save mepc to context of current task # save mepc to context of current task
csrr a0, mepc csrr a0, mepc
sw a0, 124(t6) sw a0, 124(t5)
# Restore the context pointer into mscratch
csrw mscratch, t5
# call the C trap handler in trap.c # call the C trap handler in trap.c
csrr a0, mepc csrr a0, mepc
@@ -125,7 +135,7 @@ switch_to:
# Use t6 to point to the context of the new task # Use t6 to point to the context of the new task
mv t6, a0 mv t6, a0
reg_restore t6 reg_restore t6
# Do actual context switching. # Do actual context switching.
# Notice this will enable global interrupt # Notice this will enable global interrupt
mret mret

18
code/os/10-swtimer/entry.S
View File

@@ -33,7 +33,9 @@
sw t3, 108(\base) sw t3, 108(\base)
sw t4, 112(\base) sw t4, 112(\base)
sw t5, 116(\base) sw t5, 116(\base)
sw t6, 120(\base) # we don't save t6 here, due to we have used
# it as base, we have to save t6 in an extra step
# outside of reg_save
.endm .endm
# restore all General-Purpose(GP) registers from the context # restore all General-Purpose(GP) registers from the context
@@ -89,11 +91,19 @@ trap_vector:
# save context(registers). # save context(registers).
csrrw t6, mscratch, t6 # swap t6 and mscratch csrrw t6, mscratch, t6 # swap t6 and mscratch
reg_save t6 reg_save t6
csrw mscratch, t6
# Save the actual t6 register, which we swapped into
# mscratch
mv t5, t6 # t5 points to the context of current task
csrr t6, mscratch # read t6 back from mscratch
sw t6, 120(t5) # save t6 with t5 as base
# save mepc to context of current task # save mepc to context of current task
csrr a0, mepc csrr a0, mepc
sw a0, 124(t6) sw a0, 124(t5)
# Restore the context pointer into mscratch
csrw mscratch, t5
# call the C trap handler in trap.c # call the C trap handler in trap.c
csrr a0, mepc csrr a0, mepc
@@ -125,7 +135,7 @@ switch_to:
# Use t6 to point to the context of the new task # Use t6 to point to the context of the new task
mv t6, a0 mv t6, a0
reg_restore t6 reg_restore t6
# Do actual context switching. # Do actual context switching.
# Notice this will enable global interrupt # Notice this will enable global interrupt
mret mret

18
code/os/11-syscall/entry.S
View File

@@ -33,7 +33,9 @@
sw t3, 108(\base) sw t3, 108(\base)
sw t4, 112(\base) sw t4, 112(\base)
sw t5, 116(\base) sw t5, 116(\base)
sw t6, 120(\base) # we don't save t6 here, due to we have used
# it as base, we have to save t6 in an extra step
# outside of reg_save
.endm .endm
# restore all General-Purpose(GP) registers from the context # restore all General-Purpose(GP) registers from the context
@@ -89,11 +91,19 @@ trap_vector:
# save context(registers). # save context(registers).
csrrw t6, mscratch, t6 # swap t6 and mscratch csrrw t6, mscratch, t6 # swap t6 and mscratch
reg_save t6 reg_save t6
csrw mscratch, t6
# Save the actual t6 register, which we swapped into
# mscratch
mv t5, t6 # t5 points to the context of current task
csrr t6, mscratch # read t6 back from mscratch
sw t6, 120(t5) # save t6 with t5 as base
# save mepc to context of current task # save mepc to context of current task
csrr a0, mepc csrr a0, mepc
sw a0, 124(t6) sw a0, 124(t5)
# Restore the context pointer into mscratch
csrw mscratch, t5
# call the C trap handler in trap.c # call the C trap handler in trap.c
csrr a0, mepc csrr a0, mepc
@@ -126,7 +136,7 @@ switch_to:
# Use t6 to point to the context of the new task # Use t6 to point to the context of the new task
mv t6, a0 mv t6, a0
reg_restore t6 reg_restore t6
# Do actual context switching. # Do actual context switching.
# Notice this will enable global interrupt # Notice this will enable global interrupt
mret mret

BIN
errata.pdf
View File

Binary file not shown.

BIN
slides/ch09-context-switch.pdf
View File

Binary file not shown.

BIN
slides/ch10-trap-exception.pdf
View File

Binary file not shown.