remove failures by cherry-picking

Author: stlankes

src/arch/x86_64/kernel/start.rs

@@ -12,19 +12,25 @@ extern "C" {
 	pub fn main();
 }
 
+#[cfg(not(test))]
+#[no_mangle]
+pub unsafe extern "C" fn pre_main() -> ! {
+	main();
+
+	loop {}
+}
+
 #[cfg(not(test))]
 #[no_mangle]
 #[naked]
 pub unsafe extern "C" fn _start() -> ! {
-	// be sure that rsp is a valid stack pointer
-	asm!("lea rax, {1}",
-		"add rax, {offset}",
-		"mov rsp, rax",
-		"call {0}",
-		"L0: jmp L0",
-		sym main,
-		sym BOOT_STACK,
-		offset = const STACK_SIZE - 16,
+	asm!(
+		// initialize stack pointer
+		"lea rsp, [{stack}+{size}]",
+		"call {pre_main}",
+		stack = sym BOOT_STACK,
+		size = const STACK_SIZE - 16,
+		pre_main = sym pre_main,
 		options(noreturn)
 	);
-}
+}

src/arch/x86_64/mm/paging.rs

@@ -238,11 +238,7 @@ impl<S: PageSize> Page<S> {
 	#[inline(always)]
 	fn flush_from_tlb(&self) {
 		unsafe {
-<<<<<<< HEAD
-			asm!("invlpg [{0}]", in(reg) self.virtual_address, options(nostack));
-=======
 			asm!("invlpg [{}]", in(reg) self.virtual_address, options(preserves_flags, nostack));
->>>>>>> 7d66029... convert inline assmebly to the new assembly format
 		}
 	}
 

src/lib.rs

@@ -1,4 +1,4 @@
-#![feature(const_fn, asm, lang_items)]
+#![feature(asm, lang_items)]
 #![feature(allocator_api)]
 #![feature(global_asm)]
 #![feature(panic_info_message)]

src/scheduler/scheduler.rs

@@ -250,9 +250,7 @@ impl Scheduler {
 
 				self.current_task = new_task;
 
-				unsafe {
-					switch(current_stack_pointer, new_stack_pointer);
-				}
+				switch(current_stack_pointer, new_stack_pointer);
 			}
 			_ => {}
 		}