diff --git a/lab1/Makefile b/lab1/Makefile index 55c3178..bb55086 100644 --- a/lab1/Makefile +++ b/lab1/Makefile @@ -6,7 +6,7 @@ endif LAB := 1 # try to generate a unique GDB port GDBPORT := 1234 -QEMUOPTS = -machine raspi3 -serial null -serial mon:stdio -m size=1G -kernel $(BUILD_DIR)/kernel.img -gdb tcp::1234 +QEMUOPTS = -machine raspi3b -serial null -serial mon:stdio -m size=1G -kernel $(BUILD_DIR)/kernel.img -gdb tcp::1234 IMAGES = $(BUILD_DIR)/kernel.img all: build diff --git a/lab2/Makefile b/lab2/Makefile index 56dc6bc..458e55a 100644 --- a/lab2/Makefile +++ b/lab2/Makefile @@ -6,7 +6,7 @@ endif LAB := 2 # try to generate a unique GDB port GDBPORT := 1234 -QEMUOPTS = -machine raspi3 -serial null -serial mon:stdio -m size=1G -kernel $(BUILD_DIR)/kernel.img -gdb tcp::1234 +QEMUOPTS = -machine raspi3b -serial null -serial mon:stdio -m size=1G -kernel $(BUILD_DIR)/kernel.img -gdb tcp::1234 IMAGES = $(BUILD_DIR)/kernel.img all: build diff --git a/lab3/.gdbinit b/lab3/.gdbinit index 98f1327..3070b32 100644 --- a/lab3/.gdbinit +++ b/lab3/.gdbinit @@ -13,4 +13,4 @@ define add-symbol-file-auto end add-symbol-file-auto ./build/kernel.img -add-symbol-file-auto ./user/build/ramdisk/testpf.bin +add-symbol-file-auto ./user/build/ramdisk/badinsn.bin diff --git a/lab3/Makefile b/lab3/Makefile index 9492ded..c9627c6 100644 --- a/lab3/Makefile +++ b/lab3/Makefile @@ -6,7 +6,7 @@ endif LAB := 3 # try to generate a unique GDB port GDBPORT := 1234 -QEMUOPTS = -machine raspi3 -serial null -serial mon:stdio -m size=1G -kernel $(BUILD_DIR)/kernel.img -gdb tcp::1234 +QEMUOPTS = -machine raspi3b -serial null -serial mon:stdio -m size=1G -kernel $(BUILD_DIR)/kernel.img -gdb tcp::1234 IMAGES = $(BUILD_DIR)/kernel.img all: user build diff --git a/lab4/.gdbinit b/lab4/.gdbinit index 5934363..38ac1f7 100644 --- a/lab4/.gdbinit +++ b/lab4/.gdbinit @@ -13,4 +13,4 @@ define add-symbol-file-auto end add-symbol-file-auto ./build/kernel.img -add-symbol-file-auto ./user/build/ramdisk/ipc_mem.bin +add-symbol-file-auto ./user/build/ramdisk/spawn_info.bin diff --git a/lab4/Makefile b/lab4/Makefile index e6f393d..9fdc332 100644 --- a/lab4/Makefile +++ b/lab4/Makefile @@ -6,7 +6,7 @@ endif LAB := 4 # try to generate a unique GDB port GDBPORT := 1234 -QEMUOPTS = -machine raspi3 -serial null -serial mon:stdio -m size=1G -kernel $(BUILD_DIR)/kernel.img -gdb tcp::1234 +QEMUOPTS = -machine raspi3b -serial null -serial mon:stdio -m size=1G -kernel $(BUILD_DIR)/kernel.img -gdb tcp::1234 IMAGES = $(BUILD_DIR)/kernel.img all: user build diff --git a/lab5/Makefile b/lab5/Makefile index 472bef4..3d07725 100644 --- a/lab5/Makefile +++ b/lab5/Makefile @@ -6,7 +6,7 @@ endif LAB := 5 # try to generate a unique GDB port GDBPORT := 1234 -QEMUOPTS = -machine raspi3 -serial null -serial mon:stdio -m size=1G -kernel $(BUILD_DIR)/kernel.img -gdb tcp::1234 +QEMUOPTS = -machine raspi3b -serial null -serial mon:stdio -m size=1G -kernel $(BUILD_DIR)/kernel.img -gdb tcp::1234 IMAGES = $(BUILD_DIR)/kernel.img all: user build