From be3ec804e82b26120f58e081d7ca07d480e9ef9d Mon Sep 17 00:00:00 2001
From: 423A35C7 <609514299@qq.com>
Date: Sun, 14 Apr 2024 19:15:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C2=E7=8E=AF=E5=A2=83=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/c_cpp_properties.json        | 4 +++-
 .vscode/launch.json                  | 2 +-
 .vscode/tasks.json                   | 2 +-
 labcodes_answer/lab2_result/Makefile | 5 +++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 4c5fd3e..d9c7c87 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -4,7 +4,9 @@
             "name": "Linux",
             "includePath": [
                 "${workspaceFolder}/**",
-                "${workspaceFolder}/labcodes_answer/**/"
+                // "${workspaceFolder}/labcodes_answer/**/", 
+                // 由于按顺序搜索，所以如果这样的话搜索到lab1_result中的同名头文件就不会引用到lab2_result中的同名头文件导致错误
+                "${workspaceFolder}/labcodes_answer/lab2_result/kern/mm/"
             ],
             "defines": [],
             "compilerPath": "/usr/bin/gcc",
diff --git a/.vscode/launch.json b/.vscode/launch.json
index c50d81b..927fca1 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,7 +11,7 @@
             "program": "bin/kernel",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${workspaceFolder}/labcodes_answer/lab1_result",
+            "cwd": "${workspaceFolder}/labcodes_answer/lab2_result",
             "environment": [],
             "externalConsole": false,
             "MIMode": "gdb",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index c69f21a..ffc8a37 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -9,7 +9,7 @@
                 "env": {
                     "DISPLAY": ":0",
                 },
-                "cwd": "${workspaceFolder}/labcodes_answer/lab1_result"
+                "cwd": "${workspaceFolder}/labcodes_answer/lab2_result"
             },
             
             "problemMatcher": [
diff --git a/labcodes_answer/lab2_result/Makefile b/labcodes_answer/lab2_result/Makefile
index a06dbf3..69905f6 100644
--- a/labcodes_answer/lab2_result/Makefile
+++ b/labcodes_answer/lab2_result/Makefile
@@ -202,7 +202,7 @@ endif
 # files for grade script
 
 targets: $(TARGETS)
-
+all: $(TARGETS)
 .DEFAULT_GOAL := targets
 
 QEMUOPTS = -hda $(UCOREIMG)
@@ -217,7 +217,8 @@ qemu-nox: targets
 	$(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic
 
 TERMINAL := gnome-terminal
-
+gdb: $(UCOREIMG)
+	$(V)$(QEMU) -S -s -parallel stdio -hda $< -serial null
 debug: $(UCOREIMG)
 	$(V)$(QEMU) -S -s -parallel stdio $(QEMUOPTS) -serial null &
 	$(V)sleep 2