Revert "Lib"

MRNIU · Nov 22, 2021 · fd12f4c · fd12f4c
1 parent a19f35d
commit fd12f4c
Show file tree

Hide file tree

Showing 82 changed files with 119 additions and 24,667 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# intr
+# vmm
 
-中断管理+键盘输入
+虚拟内存管理
 
diff --git a/cmake/header_files.cmake b/cmake/header_files.cmake
@@ -21,13 +21,11 @@ function(target_include_arch_header_files Target)
     target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/arch/${SimpleKernelArch}/)
     if (SimpleKernelArch STREQUAL "ia32/i386" OR SimpleKernelArch STREQUAL "ia32/x86_64")
         target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/arch/ia32)
+        target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/arch/ia32/multiboot2/include)
         target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/arch/ia32/port/include)
         target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/arch/${SimpleKernelArch}/gdt/include)
-        target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/arch/${SimpleKernelArch}/intr/include)
-        target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/arch/ia32/apic/include)
     elseif (SimpleKernelArch STREQUAL riscv64)
         target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/arch/${SimpleKernelArch}/opensbi/include)
-        target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/arch/${SimpleKernelArch}/intr/include)
     endif()
 endfunction()
 
@@ -38,11 +36,12 @@ function(target_include_common_header_files Target)
 endfunction()
 
 function(target_include_drv_header_files Target)
+    target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/drv/dtb/include)
+    target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/drv/multiboot2/include)
     target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/drv/tui/include)
     target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/drv/uart/include)
     target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/drv/opensbi/include)
     target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/drv/sbi_console/include)
     target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/drv/dtb/include)
     target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/drv/multiboot2/include)
-    target_include_directories(${Target} PRIVATE ${SimpleKernel_SOURCE_CODE_DIR}/drv/keyboard/include)
 endfunction()
diff --git a/docs/An Introduction to the RISC-V Architecture.pdf b/docs/An Introduction to the RISC-V Architecture.pdf
diff --git a/docs/RISC-V-Reader-Chinese-v2p1.pdf b/docs/RISC-V-Reader-Chinese-v2p1.pdf
diff --git a/docs/riscv-mmu.pdf b/docs/riscv-mmu.pdf
diff --git a/docs/riscv-spec-20191213.pdf b/docs/riscv-spec-20191213.pdf
diff --git a/docs/sifive-interrupt-cookbook.pdf b/docs/sifive-interrupt-cookbook.pdf
diff --git a/src/arch/arm/boot/CMakeLists.txt b/src/arch/arm/boot/CMakeLists.txt
diff --git a/src/arch/ia32/CMakeLists.txt b/src/arch/ia32/CMakeLists.txt
@@ -19,12 +19,6 @@ if (${SimpleKernelArch} STREQUAL "ia32/i386")
     find_asm_source_files(gdt_asm_src ${arch_SOURCE_DIR}/i386/gdt)
     aux_source_directory(${arch_SOURCE_DIR}/i386/gdt gdt_cpp_src)
     set(gdt_src ${gdt_asm_src} ${gdt_cpp_src})
-
-    find_asm_source_files(intr_asm_src ${arch_SOURCE_DIR}/i386/intr)
-    aux_source_directory(${arch_SOURCE_DIR}/i386/intr intr_cpp_src)
-    set(intr_src ${intr_asm_src}  ${intr_cpp_src})
-
-
 # 64 位
 elseif (${SimpleKernelArch} STREQUAL "ia32/x86_64")
     # 寻找汇编文件
@@ -35,22 +29,15 @@ elseif (${SimpleKernelArch} STREQUAL "ia32/x86_64")
     find_asm_source_files(gdt_asm_src ${arch_SOURCE_DIR}/x86_64/gdt)
     aux_source_directory(${arch_SOURCE_DIR}/x86_64/gdt gdt_cpp_src)
     set(gdt_src ${gdt_asm_src} ${gdt_cpp_src})
-
-    find_asm_source_files(intr_asm_src ${arch_SOURCE_DIR}/x86_64/intr)
-    aux_source_directory(${arch_SOURCE_DIR}/x86_64/intr intr_cpp_src)
-    set(intr_src ${intr_asm_src}  ${intr_cpp_src})
 endif ()
 
 # 寻找 CXX 文件
 aux_source_directory(${arch_SOURCE_DIR}/port port_cpp_src)
 # 添加到 port_src
 set(port_src ${port_cpp_src})
 
-aux_source_directory(${arch_SOURCE_DIR}/apic apic_cpp_src)
-set(apic_src ${apic_cpp_src})
-
 # 设置子模块所有的源码
-set(arch_src ${boot_src} ${port_src} ${gdt_src} ${intr_src} ${apic_src})
+set(arch_src ${boot_src} ${port_src} ${gdt_src})
 
 # 添加子模块
 add_library(${PROJECT_NAME} OBJECT ${arch_src})
@@ -59,4 +46,3 @@ add_library(${PROJECT_NAME} OBJECT ${arch_src})
 target_include_arch_header_files(${PROJECT_NAME})
 target_include_libc_header_files(${PROJECT_NAME})
 target_include_common_header_files(${PROJECT_NAME})
-target_include_drv_header_files(${PROJECT_NAME})
diff --git a/src/arch/ia32/apic/apic.cpp b/src/arch/ia32/apic/apic.cpp
diff --git a/src/arch/ia32/apic/include/apic.h b/src/arch/ia32/apic/include/apic.h
diff --git a/src/arch/ia32/apic/io_apic.cpp b/src/arch/ia32/apic/io_apic.cpp
diff --git a/src/arch/ia32/apic/local_apic.cpp b/src/arch/ia32/apic/local_apic.cpp