diff options
author | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-03-05 14:34:18 -0800 |
---|---|---|
committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-03-05 14:34:18 -0800 |
commit | 80447e5711461fa58cf61d17a6a1b79f7dcd5294 (patch) | |
tree | 56a5ace30a808a606346c63b9d533cbcb787619e /pk/elf.c | |
parent | bbc9a65fed7c85ee058d7188a62f0b904c38b77b (diff) | |
download | pk-80447e5711461fa58cf61d17a6a1b79f7dcd5294.zip pk-80447e5711461fa58cf61d17a6a1b79f7dcd5294.tar.gz pk-80447e5711461fa58cf61d17a6a1b79f7dcd5294.tar.bz2 |
Disentangle PK and BBL a bit
Diffstat (limited to 'pk/elf.c')
-rw-r--r-- | pk/elf.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1,8 +1,9 @@ // See LICENSE for license details. #include "file.h" -#include "pk.h" #include "vm.h" +#include "mtrap.h" +#include "boot.h" #include <sys/stat.h> #include <fcntl.h> #include <elf.h> @@ -87,7 +88,7 @@ void load_elf(const char* fn, elf_info* info) if (IS_ELF64(eh64)) { #ifndef __riscv64 - panic("can't run 64-bit ELF on 32-bit arch"); + die("can't run 64-bit ELF on 32-bit arch"); #endif Elf64_Ehdr* eh; Elf64_Phdr* ph; @@ -96,7 +97,7 @@ void load_elf(const char* fn, elf_info* info) else if (IS_ELF32(eh64)) { #ifdef __riscv64 - panic("can't run 32-bit ELF on 64-bit arch"); + die("can't run 32-bit ELF on 64-bit arch"); #endif Elf32_Ehdr* eh; Elf32_Phdr* ph; @@ -113,5 +114,5 @@ void load_elf(const char* fn, elf_info* info) return; fail: - panic("couldn't open ELF program: %s!", fn); + die("couldn't open ELF program: %s!", fn); } |