From: David Devecsery <ddevec@gatech.edu>
Date: Mon, 18 May 2020 13:51:11 +0000 (-0400)
Subject: Draft 1 on instructions
X-Git-Url: https://git.devinivas.org/?a=commitdiff_plain;h=4fe642115be3e4eddef7b5e27ac286b2839482eb;p=cs3210-lab1.git

Draft 1 on instructions
---

diff --git a/include/memlayout.h b/include/memlayout.h
index bd57410..5f5b064 100644
--- a/include/memlayout.h
+++ b/include/memlayout.h
@@ -17,3 +17,4 @@
 #define P2V_WO(x) ((x) + KERNBASE)    // same as P2V, but without casts
 
 #endif  // INCLUDE_MEMLAYOUT_h_
+
diff --git a/scripts/xv6-qemu b/scripts/xv6-qemu
index 17b9a26..f023a9e 100755
--- a/scripts/xv6-qemu
+++ b/scripts/xv6-qemu
@@ -16,8 +16,8 @@ function print_help() {
   print "    -m  --memory    -- Set the amount of memory to give to xv6 (default is ${MEMORY})"
 }
 
-OPTIONS="h?c:gxvm"
-LONGOPTS="help,num-cpus:,gdb,x-server,verbose,memory"
+OPTIONS="h?c:gxvm:"
+LONGOPTS="help,num-cpus:,gdb,x-server,verbose,memory:"
 
 ! PARSED=$(getopt --options=${OPTIONS} --longoptions=${LONGOPTS} --name "$0" -- "$@")
 
@@ -44,6 +44,10 @@ while true; do
       CPUS="$2"
       shift 2
       ;;
+    -m|--memory)
+      MEMORY="$2"
+      shift 2
+      ;;
     -g|--gdb)
       GDB="-S -gdb tcp::26000"
       shift