1
0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-23 16:36:18 +04:00
Commit Graph

201 Commits

Author SHA1 Message Date
WangRunji
01c0c3b2ad Move IDT & GDT to arch, as Redox did. 2018-04-16 01:22:18 +08:00
WangRunji
77703442e7 Move paging mod to arch, as Redox did. 2018-04-16 01:04:23 +08:00
WangRunji
5b91db9d76 Move interrupt mod 2018-04-16 00:27:45 +08:00
WangRunji
d330bd8224 Merge branch 'dev' into move-kernel-va
# Conflicts:
#	src/arch/x86_64/boot/linker.ld
#	src/consts.rs
#	src/interrupts/mod.rs
2018-04-15 21:30:43 +08:00
WangRunji
d5cd4673fb Discard va to pa. Higher half kernel complete. 2018-04-15 21:17:38 +08:00
WangRunji
a4988195ce Fix kernel remap by fixing section name & linker. 2018-04-15 20:57:27 +08:00
WangRunji
cea8ccdac9 Recover IDT, using Once<> 2018-04-15 20:42:42 +08:00
WangRunji
230d5a0287 Move remap_the_kernel() out of paging mod. Add page fault handler. 2018-04-15 17:26:56 +08:00
WangRunji
9b4d9a4a1f Init IDT at beginning 2018-04-15 15:00:04 +08:00
WangRunji
3b792baf5b ACK for APIC IRQ 2018-04-15 01:01:44 +08:00
WangRunji
156034c3d1 Support timer IRQ from PIC 2018-04-15 00:45:57 +08:00
WangRunji
8af7220d25 Disable PIC 2018-04-14 22:43:57 +08:00
WangRunji
cf099ffa99 Make inits 'safe' 2018-04-14 22:22:11 +08:00
WangRunji
2028eadbfe Protect PIC & IOAPIC with Mutex 2018-04-14 22:08:42 +08:00
WangRunji
bb51547c12 Improve IOAPIC mod 2018-04-14 21:24:49 +08:00
WangRunji
15b1687ac6 Complete IOAPIC init 2018-04-14 20:44:49 +08:00
WangRunji
a76bfbc7f8 Copy PIC mod from Redox 2018-04-14 20:18:59 +08:00
WangRunji
4029e6d2d3 Fix gdt compile error 2018-04-14 20:18:37 +08:00
WangRunji
2f24eefb1d Copy GDT Segments from xv6 x86_64. Split IRQ mod. 2018-04-14 01:13:12 +08:00
WangRunji
ab37e359ac Temporarily map pages and run pass APIC init. 2018-04-13 22:57:41 +08:00
WangRunji
5d03035f9e Add page fault handler 2018-04-13 22:22:52 +08:00
WangRunji
bacc97ee94 Move address to memory mod. 2018-04-13 20:28:38 +08:00
WangRunji
03d4adfcfe Fix rsp. Use PhysicalAddress. 2018-04-13 18:41:39 +08:00
WangRunji
ca683e4787 More strict PhysicalAddress type 2018-04-13 15:14:19 +08:00
WangRunji
3b4f855763 Modify remap_kernel() 2018-04-13 14:22:50 +08:00
WangRunji
5db8c6f836 Add consts.rs from Redox. 2018-04-13 14:22:09 +08:00
WangRunji
02773ed2f4 Move kernel virtual address to high zone. Change asm. 2018-04-13 14:21:09 +08:00
WangRunji
21d97418d6 Impl lapic linking C code. Fix build.rs in macOS. 2018-04-12 23:46:44 +08:00
WangRunji
5c80d903ad Finish ACPI init 2018-04-12 20:57:56 +08:00
WangRunji
8c7ca612e7 Add example of binding C 2018-04-11 21:27:11 +08:00
WangRunji
7f872901ce Serial stdio 2018-04-10 20:46:24 +08:00
WangRunji
fc910d4b9d Change test pass error code, to avoid conflict with QEMU's 2018-04-09 22:22:43 +08:00
WangRunji
c446d2bb5e Add test for travis 2018-04-09 21:20:47 +08:00
WangRunji
2e405a0393 Auto exit in qemu 2018-04-09 17:02:18 +08:00
WangRunji
1de0087d49 Port part of MADT 2018-04-08 02:20:25 +08:00
WangRunji
e9d89576a3 Port acpiinit() 2018-04-07 22:40:22 +08:00
WangRunji
83684cbfd7 Add debug! macro. Modify VGA & Writer 2018-04-07 20:57:14 +08:00
WangRunji
936c485ab9 Port MP & RSDP detecting 2018-04-05 22:36:39 +08:00
WangRunji
eb9a5e9241 Impl Debug for page table 2018-04-05 18:41:31 +08:00
WangRunji
b954aef696 Add cursor for VGA 2018-04-05 01:12:42 +08:00
WangRunji
5bf407de7c Split vga_buffer.rs to VGA driver and VGA writer 2018-04-05 00:58:23 +08:00
WangRunji
c436b9afbe Move asm to boot dir. Continue to refactor... 2018-04-04 20:56:56 +08:00
WangRunji
4ce1ba8f6d Rewrite README. Add docker. 2018-04-02 15:28:32 +08:00
Philipp Oppermann
7f6576c9dc Set the stack index of the double fault IDT entry 2017-11-19 14:24:33 +01:00
Philipp Oppermann
aa8028cf6c Reload cs register and load TSS 2017-11-19 14:24:33 +01:00
Philipp Oppermann
165054d12a Create and load a static TSS and GDT 2017-11-19 14:24:33 +01:00
Philipp Oppermann
58e90d497e Add a Gdt::load method 2017-11-19 14:24:33 +01:00
Philipp Oppermann
238cc575c3 Add a Gdt::add_entry method 2017-11-19 14:24:33 +01:00
Philipp Oppermann
d2060e76f8 Create a GDT descriptor struct 2017-11-19 14:24:33 +01:00
Philipp Oppermann
f651987666 Add a dependency on bit_field 2017-11-19 14:24:33 +01:00
Philipp Oppermann
eea8c10a97 Create a interrupts::gdt submodule 2017-11-19 14:24:27 +01:00
Philipp Oppermann
e1d2af5ea7 Rename interrupts.rs to interrupts/mod.rs 2017-11-19 14:24:27 +01:00
Philipp Oppermann
a05db759d7 Create a TSS and save the double fault stack pointer it its IST 2017-11-19 14:24:27 +01:00
Philipp Oppermann
00bbd6fbc6 Pass the memory controller to interrupts::init and use it to create a double fault stack 2017-11-19 14:24:27 +01:00
Philipp Oppermann
f1459a552c Return a memory controller from memory::init 2017-11-19 14:24:27 +01:00
Philipp Oppermann
73d4390f27 Create a memory manager for convenience 2017-11-19 14:23:45 +01:00
Philipp Oppermann
0e3857ca50 Create a stack allocator module 2017-11-19 14:23:45 +01:00
Philipp Oppermann
3efe54169e Provoke a stack overflow, which still causes a boot loop 2017-11-19 14:23:45 +01:00
Philipp Oppermann
2b9d880e48 Add a double fault handler 2017-11-19 14:23:45 +01:00
Philipp Oppermann
91ffde4728 Trigger a double fault by causing a page fault 2017-11-19 14:23:45 +01:00
Philipp Oppermann
93aff8cfa8 Test our exception handler by invoking a breakpoint exception 2017-11-19 14:22:24 +01:00
Philipp Oppermann
fab320271a Create and load an IDT 2017-11-19 14:21:51 +01:00
Philipp Oppermann
7becaf5f30 Add a dependency on lazy_static 2017-11-19 14:21:51 +01:00
Philipp Oppermann
3bbc2a0bdc Add a simple handler function for the breakpoint exception 2017-11-19 14:21:36 +01:00
Philipp Oppermann
c2d22af1c7 Create a new interrupts module 2017-11-19 14:21:12 +01:00
Philipp Oppermann
ad211de615 Use linked list allocator instead of bump allocator 2017-11-19 14:20:46 +01:00
Philipp Oppermann
01f8c43ffb Map the heap pages to physical frames 2017-11-19 14:20:46 +01:00
Philipp Oppermann
f2bbe43099 Use once crate to ensure that memory::init is only called once 2017-11-19 14:20:45 +01:00
Philipp Oppermann
76550dcd95 Refactor: Move memory initialization to memory::init function 2017-11-19 14:20:45 +01:00
Philipp Oppermann
c0d403abbe Set a global allocator 2017-11-19 14:20:45 +01:00
Philipp Oppermann
9dc998222a Make the bump allocator lock free and impl Alloc for shared reference 2017-11-19 14:20:45 +01:00
Philipp Oppermann
1f6633fe44 Add a heap_allocator module with a basic bump allocator 2017-11-19 14:20:45 +01:00
Philipp Oppermann
5f017124dd Add a dependency on the alloc crate 2017-11-19 14:20:45 +01:00
Philipp Oppermann
c6dd37dcc5 Turn page of old P4 into guard page 2017-11-19 11:44:50 +01:00
Philipp Oppermann
2a3ce863fd Enable write protect bit to improve safety 2017-11-19 11:44:50 +01:00
Philipp Oppermann
ffaddeb84e Fix boot loop by enabling the NXE bit in the EFER register 2017-11-19 11:44:50 +01:00
Philipp Oppermann
0ce2b46ad1 Use the correct entry flags for kernel sections 2017-11-19 11:44:50 +01:00
Philipp Oppermann
11993b7e15 Also identity map the multiboot info structure 2017-11-19 11:44:50 +01:00
Philipp Oppermann
fdacfb24f0 Fix boot loop by identity mapping the vga buffer 2017-11-19 11:44:50 +01:00
Philipp Oppermann
564c6b64e9 Switch to the new page table after mapping all sections 2017-11-19 11:44:50 +01:00
Philipp Oppermann
fa3b572d68 Only print kernel/multiboot start/end in rust_main 2017-11-19 11:44:50 +01:00
Philipp Oppermann
40f1732ccb Call remap_the_kernel from rust_main 2017-11-19 11:44:49 +01:00
Philipp Oppermann
5d898d8474 Page align all sections as they will be individually mapped 2017-11-19 11:44:49 +01:00
Philipp Oppermann
e029eabe18 Add a remap_the_kernel function 2017-11-19 11:44:49 +01:00
Philipp Oppermann
60d7c736a5 Add a (now safe) with method 2017-11-19 11:44:49 +01:00
Philipp Oppermann
2f30b0f7cf Create a new ActivePageTable struct that derefs to Mapper 2017-11-19 11:44:49 +01:00
Philipp Oppermann
ce9c4d6e43 Refactor: Move ActivePageTable to new mapper submodule and rename to Mapper 2017-11-19 11:44:49 +01:00
Philipp Oppermann
4160cb6d7e Begin creating an ActivePageTable::with function 2017-11-19 11:42:33 +01:00
Philipp Oppermann
b2e79752fd Fix InactivePageTable::new function using a temporary page 2017-11-19 11:42:33 +01:00
Philipp Oppermann
11ae7e8aeb Create a temporary_page module 2017-11-19 11:42:33 +01:00
Philipp Oppermann
1737f48284 Create a InactivePageTable struct 2017-11-19 11:42:33 +01:00
Philipp Oppermann
1f1f6c62da Derive Copy and Clone for Page and add a Frame::clone method 2017-11-19 11:42:33 +01:00
Philipp Oppermann
1007c5157d Remove paging testing code again 2017-11-19 11:42:16 +01:00
Philipp Oppermann
55e602dc61 Fix unmap function by flushing the TLB 2017-11-19 11:42:16 +01:00
Philipp Oppermann
eb5c9afa51 Add a dependency on the x86_64 crate 2017-11-19 11:42:16 +01:00
Philipp Oppermann
0ee4ed738a Test the unmap function (it doesn't work correctly) 2017-11-19 11:42:16 +01:00
Philipp Oppermann
b49cb6986c Test the map_to function 2017-11-19 11:42:16 +01:00
Philipp Oppermann
15c9f43622 Add an (unfinished) unmap method 2017-11-19 11:42:16 +01:00
Philipp Oppermann
3696c7bacb Add map and identity_map functions for convenience 2017-11-19 11:42:16 +01:00
Philipp Oppermann
bb473c7907 Make translate and map_to safe by making them methods of a new ActivePageTable struct 2017-11-19 11:42:16 +01:00