Update 369-a3 functions

fish/.config/fish/config.fish

@@ -72,11 +72,9 @@ abbr grc "grep-c"
 abbr grh "grep-headers"
 abbr rgh "rg-headers"
 
-abbr r6 "run-a3"
-abbr r6f "run-a3-file"
-abbr r6c "run-a3-custom"
-abbr g6 "gdb-a3"
-abbr g6b "gdb-a3-break"
+abbr r6 "run-a3 c lru"
+abbr r6o "run-a3 c lru o"
+abbr g6b "gdb-a3-break c lru"
 
 # abbr cs "carsim"
 # abbr ga2 "gdb-a2"

fish/.config/fish/functions/369/a3/gdb-a3-break.fish

@@ -1,7 +1,18 @@
 function gdb-a3-break
+	# 1 = trace file, 2 = alg
+	set trace_file 'traceprogs/tr-custom.ref'
+	set memsize 1
+	set swapsize 10
+	if test $argv[1] = 's'
+		set trace_file 'traceprogs/tr-simpleloop.ref'
+		set memsize 50
+		set swapsize 3000
+	end
+
 	printf '\033c' 
 	and bear make 
-	and gdb -ex "b pagetable.c:147" \
+	and gdb -ex "b pagetable.c:69" \
+	# -ex "b lru.c:65" \
 	-ex "run" \
-	--args ./sim -f /home/kevin/school/369/a3/a3/traceprogs/tr-simpleloop.ref -m 50 -s 3000 -a rand
+	--args ./sim -f $trace_file -m $memsize -s $swapsize -a $argv[2]
 end

fish/.config/fish/functions/369/a3/gdb-a3-custom.fish

@@ -1,6 +0,0 @@
-function gdb-a3-custom
-	printf '\033c' 
-	and bear make 
-	gdb -ex "run" -ex "bt" \
-	--args ./sim -f /home/kevin/school/369/a3/a3/traceprogs/tr-custom-2.ref -m 1 -s 10 -a rand
-end

fish/.config/fish/functions/369/a3/gdb-a3.fish

@@ -1,6 +0,0 @@
-function gdb-a3
-	printf '\033c' 
-	and bear make 
-	gdb -ex "run" -ex "bt" \
-	--args ./sim -f /home/kevin/school/369/a3/a3/traceprogs/tr-simpleloop.ref -m 50 -s 3000 -a rand
-end

fish/.config/fish/functions/369/a3/run-a3-custom.fish

@@ -1,9 +0,0 @@
-function run-a3-custom
-	printf '\033c' 
-	# and bear make clean
-	and bear make 
-	# and ./sim -f /home/kevin/school/369/a3/a3/traceprogs/tr-custom.ref -m 5 -s 50 -a rand
-	and ./sim -f /home/kevin/school/369/a3/a3/traceprogs/tr-custom-2.ref -m 1 -s 10 -a rand
-
-	# rm swapfile.*
-end

fish/.config/fish/functions/369/a3/run-a3-file.fish

@@ -1,9 +0,0 @@
-function run-a3-file
-	printf '\033c' 
-	# and bear make clean
-	and bear make 
-	# and ./sim -f /home/kevin/school/369/a3/a3/traceprogs/tr-simpleloop.ref -m 50 -s 3000 -a rand > task-1.out
-	and ./sim -f /home/kevin/school/369/a3/a3/traceprogs/tr-simpleloop.ref -m 50 -s 3000 -a rand > task-1.out 2>&1
-
-	# rm swapfile.*
-end

fish/.config/fish/functions/369/a3/run-a3.fish

@@ -1,8 +1,28 @@
 function run-a3
+	# 1 = trace file, 2 = alg, 3 = output
+	
+	set trace_file 'traceprogs/tr-custom.ref'
+	set memsize 3
+	set swapsize 10
+	if test $argv[1] = 's'
+		set trace_file 'traceprogs/tr-simpleloop.ref'
+		set memsize 50
+		set swapsize 3000
+	end
+
 	printf '\033c' 
 	# and bear make clean
 	and bear make 
-	and ./sim -f /home/kevin/school/369/a3/a3/traceprogs/tr-simpleloop.ref -m 50 -s 3000 -a rand
+
+	switch $argv[3]
+		case f
+			./sim -f $trace_file -m $memsize -s $swapsize -a $argv[2] > a3.out 2>&1
+		case g
+			gdb -ex "run" -ex "bt" -ex "q" \
+			--args ./sim -f $trace_file -m $memsize -s $swapsize -a $argv[2]
+		case o
+			./sim -f $trace_file -m $memsize -s $swapsize -a $argv[2]
+	end
 
 	# rm swapfile.*
 end

fish/.config/fish/functions/compile_commands.json

@@ -1 +0,0 @@
-[]