Use Result instead of Option with LoadErrors

risc_v/src/elf.rs

@@ -79,13 +79,20 @@ pub struct Program {
 	pub data:   Buffer
 }
 
+pub enum LoadErrors {
+    Magic,
+    Machine,
+    TypeExec,
+    FileRead
+}
+
 pub struct File {
 	pub header:   Header,
 	pub programs: VecDeque<Program>
 }
 
 impl File {
-	pub fn load(buffer: &Buffer) -> Option<Self> {
+	pub fn load(buffer: &Buffer) -> Result<Self, LoadErrors> {
 		let elf_hdr;
 		unsafe {
 			// Load the ELF
@@ -94,19 +101,16 @@ impl File {
 		}
 		// The ELF magic is 0x75, followed by ELF
 		if elf_hdr.magic != MAGIC {
-			println!("ELF magic didn't match.");
+			return Err(LoadErrors::Magic);
-			return None;
 		}
 		// We need to make sure we're built for RISC-V
 		if elf_hdr.machine != MACHINE_RISCV {
-			println!("ELF loaded is not RISC-V.");
+			return Err(LoadErrors::Machine);
-			return None;
 		}
 		// ELF has several types. However, we can only load
 		// executables.
 		if elf_hdr.obj_type != TYPE_EXEC {
-			println!("ELF is not an executable.");
+			return Err(LoadErrors::TypeExec);
-			return None;
 		}
 		let ph_tab = unsafe { buffer.get().add(elf_hdr.phoff) }
 		             as *const ProgramHeader;
@@ -140,17 +144,16 @@ impl File {
 				                        data:   ph_buffer });
 			}
 		}
-		Some(ret)
+		Ok(ret)
 	}
 
 	// load
-	pub fn load_proc(buffer: &Buffer, sz: usize) -> Option<Process> {
+	pub fn load_proc(buffer: &Buffer, sz: usize) -> Result<Process, LoadErrors> {
-		let elf_fl = Self::load(&buffer);
+        let elf_fl = Self::load(&buffer);
-		if elf_fl.is_none() {
+        if elf_fl.is_err() {
-			println!("Error reading elf file.");
+            return Err(elf_fl.err().unwrap());
-			return None;
+        }
-		}
+		let elf_fl = elf_fl.ok().unwrap();
-		let elf_fl = elf_fl.unwrap();
 
         let program_pages = (sz as usize / PAGE_SIZE) + 1;
         // I did this to demonstrate the expressive nature of Rust. Kinda cool, no?
@@ -262,6 +265,6 @@ impl File {
 		// now. Since we don't reuse PIDs, this means that we can only spawn
 		// 65534 processes.
 		satp_fence_asid(my_pid as usize);
-		Some(my_proc)
+		Ok(my_proc)
 	}
 }

risc_v/src/test.rs

@@ -44,11 +44,11 @@ pub fn test_elf() {
 	// user space. So, we need to know how many program pages we
 	// need. Each page is 4096 bytes.
 	let my_proc = elf::File::load_proc(&buffer, bytes_read as usize);
-	if my_proc.is_none() {
+	if my_proc.is_err() {
 		println!("Unable to load process");
 		return;
 	}
-	let my_proc = my_proc.unwrap();
+	let my_proc = my_proc.ok().unwrap();
 	// I took a different tact here than in process.rs. In there I created
 	// the process while holding onto the process list. It might
 	// matter since this is asynchronous--it is being ran as a kernel process.