From 5291f0b8a5d4ab9bb631f53f95b5337606e78bcc Mon Sep 17 00:00:00 2001
From: luojia65 <me@luojia.cc>
Date: Thu, 11 Mar 2021 00:17:30 +0800
Subject: [PATCH] Rename `interrupt` module to `trap` module

---
 tornado-kernel/src/main.rs                           | 4 ++--
 tornado-kernel/src/task/kernel_task.rs               | 2 +-
 tornado-kernel/src/task/switch.rs                    | 7 ++++++-
 tornado-kernel/src/{interrupt => trap}/handler.rs    | 0
 tornado-kernel/src/{interrupt => trap}/interrupt.asm | 0
 tornado-kernel/src/{interrupt => trap}/mod.rs        | 0
 tornado-kernel/src/{interrupt => trap}/timer.rs      | 0
 7 files changed, 9 insertions(+), 4 deletions(-)
 rename tornado-kernel/src/{interrupt => trap}/handler.rs (100%)
 rename tornado-kernel/src/{interrupt => trap}/interrupt.asm (100%)
 rename tornado-kernel/src/{interrupt => trap}/mod.rs (100%)
 rename tornado-kernel/src/{interrupt => trap}/timer.rs (100%)

diff --git a/tornado-kernel/src/main.rs b/tornado-kernel/src/main.rs
index f15269d..46e8845 100644
--- a/tornado-kernel/src/main.rs
+++ b/tornado-kernel/src/main.rs
@@ -13,7 +13,7 @@ mod console;
 mod algorithm;
 mod panic;
 mod sbi;
-mod interrupt;
+mod trap;
 mod memory;
 mod task;
 mod hart;
@@ -26,7 +26,7 @@ pub extern "C" fn rust_main(hart_id: usize) -> ! {
     println!("booted");
 
     memory::init();
-    interrupt::init();
+    trap::init();
 
     unsafe {
         llvm_asm!("ebreak"::::"volatile");
diff --git a/tornado-kernel/src/task/kernel_task.rs b/tornado-kernel/src/task/kernel_task.rs
index 1270ca2..cc614b1 100644
--- a/tornado-kernel/src/task/kernel_task.rs
+++ b/tornado-kernel/src/task/kernel_task.rs
@@ -3,7 +3,7 @@ use spin::Mutex;
 use core::ops::Range;
 use core::future::Future;
 use alloc::boxed::Box;
-use crate::{hart::KernelHartInfo, interrupt::TrapFrame, memory::VirtualAddress};
+use crate::{hart::KernelHartInfo, trap::TrapFrame, memory::VirtualAddress};
 use crate::task::{Process, SharedTaskHandle};
 use core::pin::Pin;
 use core::fmt;
diff --git a/tornado-kernel/src/task/switch.rs b/tornado-kernel/src/task/switch.rs
index 219a6cb..73b2df0 100644
--- a/tornado-kernel/src/task/switch.rs
+++ b/tornado-kernel/src/task/switch.rs
@@ -1,2 +1,7 @@
-use hashbrown::HashSet;
+use hashbrown::HashMap;
+use crate::trap::TrapFrame;
+use super::SharedTaskHandle;
 
+pub struct ContextTable {
+    inner: HashMap<SharedTaskHandle, TrapFrame>,
+}
diff --git a/tornado-kernel/src/interrupt/handler.rs b/tornado-kernel/src/trap/handler.rs
similarity index 100%
rename from tornado-kernel/src/interrupt/handler.rs
rename to tornado-kernel/src/trap/handler.rs
diff --git a/tornado-kernel/src/interrupt/interrupt.asm b/tornado-kernel/src/trap/interrupt.asm
similarity index 100%
rename from tornado-kernel/src/interrupt/interrupt.asm
rename to tornado-kernel/src/trap/interrupt.asm
diff --git a/tornado-kernel/src/interrupt/mod.rs b/tornado-kernel/src/trap/mod.rs
similarity index 100%
rename from tornado-kernel/src/interrupt/mod.rs
rename to tornado-kernel/src/trap/mod.rs
diff --git a/tornado-kernel/src/interrupt/timer.rs b/tornado-kernel/src/trap/timer.rs
similarity index 100%
rename from tornado-kernel/src/interrupt/timer.rs
rename to tornado-kernel/src/trap/timer.rs