Update tree

Author: katietheqt-old

.cargo/config

@@ -2,4 +2,4 @@
 target = "i8086-bootloader.json"
 
 [alias]
-bbuild = "build -Zbuild-std=core"
+xbuild = "build -Zbuild-std=core"

src/protected/Cargo.lock

@@ -1,6 +1,5 @@
 [workspace]
 members = [
-  "v86",
   "stage_3"
 ]
 

src/protected/Cargo.toml

@@ -6,12 +6,8 @@ use shared::println;
 mod panic;
 
 #[no_mangle]
-pub extern "C" fn third_stage() {
-	unsafe {
-		llvm_asm!("mov bx, 0x0
-		           mov ds, bx
-		           mov es, bx" ::: "bx" : "intel", "volatile");
-	}
+pub extern "C" fn third_stage() -> ! {
+	println!("X");
 
-	println!("Stage 3");
+	loop {}
 }

src/protected/stage_3/src/lib.rs

@@ -10,7 +10,7 @@ use core::panic::PanicInfo;
 use shared::{dap, linker_symbol, utils};
 
 extern "C" {
-    fn second_stage();
+    fn second_stage() -> !;
 }
 global_asm!(include_str!("bootstrap.s"));
 
@@ -26,13 +26,10 @@ extern "C" fn rust_start(disk_number: u16) -> ! {
         linker_symbol!(_rest_of_bootloader_end) - linker_symbol!(_rest_of_bootloader_start),
     );
 
-    unsafe { dap.perform_load(disk_number) };
-
-    unsafe { second_stage() };
-
-    loop {
-        utils::hlt();
-    }
+    unsafe {
+        dap.perform_load(disk_number);
+        second_stage();
+    };
 }
 
 fn check_int13h_extensions(disk_number: u16) {

src/protected/v86/Cargo.toml

@@ -1,4 +1,4 @@
-#![feature(llvm_asm)]
+#![feature(global_asm, llvm_asm)]
 #![no_std]
 
 // FIXME
@@ -13,9 +13,11 @@ use lazy_static::lazy_static;
 mod panic;
 
 extern "C" {
-    fn third_stage();
+    fn protected_mode_switch() -> !;
 }
 
+global_asm!(include_str!("protected_mode.s"));
+
 lazy_static! {
     static ref TSS: TaskStateSegment = {
         let mut tss = TaskStateSegment::new();
@@ -26,6 +28,7 @@ lazy_static! {
     };
     static ref GDT: GlobalDescriptorTable = {
         let mut gdt = GlobalDescriptorTable::new();
+
         gdt.add_entry(Descriptor::kernel_code_segment());
         gdt.add_entry(Descriptor::kernel_data_segment());
         gdt.add_entry(Descriptor::user_code_segment());
@@ -38,15 +41,19 @@ lazy_static! {
 }
 
 #[no_mangle]
-pub fn second_stage() {
+pub fn second_stage() -> ! {
     println!("Stage 2");
 
-    enter_protected_mode();
-
-    loop {};
+    unsafe {
+        //GDT.load();
+        
+        println!("Switching to Protected Mode");
+    
+        protected_mode_switch();
+    }
 }
 
-fn enter_protected_mode() {
+fn enter_protected_mode() -> ! {
     unsafe {
         GDT.load();
     }
@@ -57,14 +64,42 @@ fn enter_protected_mode() {
 
     println!("A20 On");
 
+
     unsafe {
-        llvm_asm!("cli
+        llvm_asm!("cli" :::: "intel", "volatile");
+    }
+
+    println!("Interrupts off");
 
-                   mov eax, cr0
+    let ds: u16;
+    let es: u16;
+
+    unsafe {
+        llvm_asm!("mov ax, ds
+                   mov bx, es"
+                  : "={ax}"(ds), "={bx}"(es)
+                  ::: "intel", "volatile");
+    }
+
+    println!("Segments stored");
+
+    unsafe {
+        llvm_asm!("mov bx, 0x0
+                   mov ds, bx
+                   mov es, bx" ::: "bx" : "intel", "volatile");
+    }
+
+    println!("Segments set");
+
+    unsafe {
+        llvm_asm!("mov eax, cr0
                    or al, 1
                    mov cr0, eax
 
-                   jmp third_stage" ::: "eax" : "intel", "volatile");
+                   push dx
+                   push cx
+
+                   jmp third_stage" :: "{dx}"(ds), "{cx}"(es) :: "intel", "volatile");
     }
 
     unreachable!();

src/protected/v86/src/lib.rs

@@ -0,0 +1,50 @@
+.intel_syntax noprefix
+.code16
+
+protected_mode_switch:
+    cli
+
+    lgdt [gdt32info]
+
+    mov eax, cr0
+    or al, 1
+    mov cr0, eax
+
+    push 0x8
+    lea eax, [protected_mode]
+    push eax
+    retf
+
+protected_mode:
+    mov bx, 0x10
+    mov ds, bx
+    mov es, bx
+
+    jmp third_stage
+
+gdt32info:
+   .word gdt32_end - gdt32 - 1  # last byte in table
+   .word gdt32                  # start of table
+
+gdt32:
+    # entry 0 is always unused
+    .quad 0
+codedesc:
+    .byte 0xff
+    .byte 0xff
+    .byte 0
+    .byte 0
+    .byte 0
+    .byte 0x9a
+    .byte 0xcc
+    .byte 0
+datadesc:
+    .byte 0xff
+    .byte 0xff
+    .byte 0
+    .byte 0
+    .byte 0
+    .byte 0x92
+    .byte 0xcc
+    .byte 0
+gdt32_end:

src/real/bootsector/src/lib.rs

@@ -9,7 +9,7 @@ lazy_static! {
     /// Used by the `print!` and `println!` macros.
     pub static ref WRITER: Mutex<Writer> = Mutex::new(Writer {
         column_position: 0,
-        color_code: ColorCode::new(Color::Yellow, Color::Black),
+        color_code: ColorCode::new(Color::Red, Color::Black),
         buffer: unsafe { &mut *(0xb8000 as *mut Buffer) },
     });
 }
@@ -153,7 +153,7 @@ impl fmt::Write for Writer {
 /// Like the `print!` macro in the standard library, but prints to the VGA text buffer.
 #[macro_export]
 macro_rules! print {
-    ($($arg:tt)*) => ($crate::console::vga::_print(format_args!($($arg)*)));
+    ($($arg:tt)*) => ($crate::console::_print(format_args!($($arg)*)));
 }
 
 /// Like the `println!` macro in the standard library, but prints to the VGA text buffer.