From b20fdcfe67ea56c47bfe1e059b504fae73bc52b3 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Mon, 9 Nov 2020 22:18:55 +0100
Subject: Removed non-net support and fixed some bugs

---
 run | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'run')

diff --git a/run b/run
index f3ed4c2..575420e 100755
--- a/run
+++ b/run
@@ -24,12 +24,8 @@ no_ask="${2}"
 
 # TODO: Support q35 chipset ('-machine q35') - loops in ide_wait
 qemu_with_flags() {
-    if [ -z "$network" ]; then network="rtl8139"; fi
-    if [ "$network" != "false" ] && [ "$mode" = "net" ]; then
-        qemu-system-i386 -cpu max -no-reboot -vga std -rtc base=localtime -m 256M -smp 4 -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 "$@"
-    else
-        qemu-system-i386 -cpu max -no-reboot -vga std -rtc base=localtime -m 256M -smp 4 "$@"
-    fi
+    network="rtl8139"
+    qemu-system-i386 -cpu max -no-reboot -vga std -rtc base=localtime -m 256M -smp 4 -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() {
@@ -113,7 +109,11 @@ make_build() {
     rm -rf build/*
 
     printf "\nBuilding...\n"
-    $MAKE -j $($NPROC)
+    if [ "$mode" = "debug" ]; then
+        $MAKE -j $($NPROC) debug
+    else
+        $MAKE -j $($NPROC)
+    fi
 
     # Create disk image
     dd if=/dev/zero of=build/disk.img bs=1k count=32k status=none
@@ -179,7 +179,7 @@ make_test() {
 }
 
 make_debug() {
-    qemu_with_flags -drive file=build/disk.img,format=raw,index=1,media=disk -s -S
+    qemu_with_flags -serial stdio -drive file=build/disk.img,format=raw,index=1,media=disk -s -S
 }
 
 make_disasm() {
@@ -248,7 +248,7 @@ elif [ "${mode}" = "debug" ]; then
     make_build
     make_sync &
     make_debug
-elif [ "${mode}" = "test" ] || [ "${mode}" = "net" ] || [ "${mode}" = "" ]; then
+elif [ "${mode}" = "test" ] || [ "${mode}" = "" ]; then
     make_cross
     make_clean
     make_build
@@ -267,7 +267,6 @@ else
     printf "disasm\t\tDisassembles the main kernel binary\n"
     printf "sync\t\tSyncs the 'tags' and 'compile_commands.json' file\n"
     printf "disk\t\tPrepares the userspace disk (e.g. fonts)\n"
-    printf "net\t\tBuilds and runs Melvix in network mode using QEMU (cross+clean+build)\n"
     printf "nothing\t\tWhen no option is set, Melvix gets built and emulated using QEMU (cross+clean+build)\n"
     printf "*\t\tAnything else prints this help\n\n"
 fi
-- 
cgit v1.2.3