Merged ELF loading

1 files changed, 5 insertions, 5 deletions

diff --git a/run b/run
index bf27b42..27a7f5f 100755
--- a/run
+++ b/run
@@ -26,7 +26,7 @@ no_ask="${2}"
 # TODO: Support -enable-kvm: GPF?!
 qemu_with_flags() {
     network="rtl8139"
-    qemu-system-i386 -d guest_errors -cpu max -no-reboot -vga std -rtc base=localtime -m 256M -netdev user,id=net0,hostfwd=tcp:127.0.0.1:8000-10.0.2.15:8000 -device $network,netdev=net0 -object filter-dump,id=dump,netdev=net0,file=dump.pcap "$@"
+    qemu-system-i386 -cpu max -no-reboot -vga std -rtc base=localtime -m 256M -netdev user,id=net0,hostfwd=tcp:127.0.0.1:8000-10.0.2.15:8000 -device $network,netdev=net0 -object filter-dump,id=dump,netdev=net0,file=dump.pcap "$@"
 }
 
 make_cross() {
@@ -173,20 +173,20 @@ make_debug() {
 
 make_disasm() {
     if [ -z "$1" ]; then
-        echo "Usage: './run disasm {kernel, apps/wm, ...} [-S]'"
+        echo "Usage: './run disasm {kernel.elf, apps/wm, ...} [-S]'"
         exit 1
     fi
-    objdump -drwC "$2" -Mintel build/"$1".elf | less -R
+    objdump -drwC "$2" -Mintel build/"$1" | less -R
     #hexdump -C build/kernel.bin | less -R
 }
 
 make_addr() {
     printf "Info: Make sure that you've turned the debug build on (e.g. with MELVIX_DEBUG=1)\n\n"
     if [ -z "$2" ]; then
-        echo "Usage: './run addr kernel 0x50042'"
+        echo "Usage: './run addr kernel.elf 0x50042'"
         exit 1
     fi
-    addr2line -e build/"$1".elf -f -p "$2"
+    addr2line -e build/"$1" -f -p "$2"
 }
 
 make_cloc() {