diff --git a/Asuro.iso b/Asuro.iso index 0fc9498f..9c1bddd6 100644 Binary files a/Asuro.iso and b/Asuro.iso differ diff --git a/compile_and_run.sh b/compile_and_run.sh index 85f39b2c..05bc209f 100755 --- a/compile_and_run.sh +++ b/compile_and_run.sh @@ -3,10 +3,5 @@ ERRCOUNT=0 echo "=======================" echo "== ASURO ==" echo "=======================" -if [ "%1" == "-d"] -then - ./compile.sh -d -else - ./compile.sh -fi +./compile.sh ./run.sh diff --git a/compile_and_run_debug.sh b/compile_and_run_debug.sh index e3fcb79a..bd6484e9 100644 --- a/compile_and_run_debug.sh +++ b/compile_and_run_debug.sh @@ -1,2 +1,7 @@ #!/bin/sh -./compile_and_run.sh -d +ERRCOUNT=0 +echo "=======================" +echo "== ASURO ==" +echo "=======================" +./compile.sh -d +./run.sh -d diff --git a/lib/libpkernel.a b/lib/libpkernel.a index 78214f12..1a45d884 100644 Binary files a/lib/libpkernel.a and b/lib/libpkernel.a differ diff --git a/run.sh b/run.sh index f58f99e2..fa88fd8c 100755 --- a/run.sh +++ b/run.sh @@ -6,7 +6,15 @@ echo "== ASURO OPERATION ==" echo "=======================" echo " " echo "Running Asaro..." -qemu-system-i386 -cdrom Asuro.iso +if [ "$1" = "-d" ] +then + qemu-system-i386 -s -S -cdrom Asuro.iso& + sleep 1 + gdb -ex "target remote localhost:1234" +else + qemu-system-i386 -cdrom Asuro.iso +fi + if [ $? -ne 0 ] then echo "Failed to run Asaro!"