Browse Source

实验3环境初始化

Makefile里的gdb和之前不一样了!要添加$(QEMUOPTS),不然会导致没有挂载交换分区。
x86-32
423A35C7 7 months ago
parent
commit
4c81247971
5 changed files with 27 additions and 6 deletions
  1. +1
    -1
      .vscode/c_cpp_properties.json
  2. +1
    -1
      .vscode/launch.json
  3. +1
    -1
      .vscode/tasks.json
  4. +4
    -2
      labcodes_answer/lab3_result/Makefile
  5. +20
    -1
      labcodes_answer/lab3_result/kern/mm/vmm.c

+ 1
- 1
.vscode/c_cpp_properties.json View File

@ -6,7 +6,7 @@
"${workspaceFolder}/**",
// "${workspaceFolder}/labcodes_answer/**/",
// lab1_resultlab2_result
"${workspaceFolder}/labcodes_answer/lab2_result/kern/mm/"
"${workspaceFolder}/labcodes_answer/lab3_result/**/"
],
"defines": [],
"compilerPath": "/usr/bin/gcc",

+ 1
- 1
.vscode/launch.json View File

@ -11,7 +11,7 @@
"program": "bin/kernel",
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceFolder}/labcodes_answer/lab2_result",
"cwd": "${workspaceFolder}/labcodes_answer/lab3_result",
"environment": [],
"externalConsole": false,
"MIMode": "gdb",

+ 1
- 1
.vscode/tasks.json View File

@ -9,7 +9,7 @@
"env": {
"DISPLAY": ":0",
},
"cwd": "${workspaceFolder}/labcodes_answer/lab2_result"
"cwd": "${workspaceFolder}/labcodes_answer/lab3_result"
},
"problemMatcher": [

+ 4
- 2
labcodes_answer/lab3_result/Makefile View File

@ -210,7 +210,8 @@ endif
# files for grade script
TARGETS: $(TARGETS)
targets: $(TARGETS)
all: $(TARGETS)
.DEFAULT_GOAL := TARGETS
QEMUOPTS = -hda $(UCOREIMG) -drive file=$(SWAPIMG),media=disk,cache=writeback
@ -225,7 +226,8 @@ qemu-nox: $(UCOREIMG) $(SWAPIMG)
$(V)$(QEMU) -serial mon:stdio $(QEMUOPTS) -nographic
TERMINAL := gnome-terminal
gdb: $(UCOREIMG) $(SWAPIMG)
$(V)$(QEMU) -S -s -parallel stdio $(QEMUOPTS) -serial null
debug: $(UCOREIMG) $(SWAPIMG)
$(V)$(QEMU) -S -s -parallel stdio $(QEMUOPTS) -serial null &
$(V)sleep 2

+ 20
- 1
labcodes_answer/lab3_result/kern/mm/vmm.c View File

@ -260,13 +260,32 @@ check_pgfault(void) {
*(char *)(addr + i) = i;
sum += i;
}
for (i = 0; i < 100; i ++) {
//
pte_t *pte = get_pte(pgdir, addr + i, 0);
if (pte != NULL && (*pte & PTE_P)) {
// 访
if (*pte & PTE_A) {
// A
cprintf("Access bit is set.\n");
} else {
// A
cprintf("Access bit is not set.\n");
}
} else {
//
cprintf("PTE not present.\n");
}
}
for (i = 0; i < 100; i ++) {
sum -= *(char *)(addr + i);
}
assert(sum == 0);
page_remove(pgdir, ROUNDDOWN(addr, PGSIZE));
free_page(pde2page(pgdir[0]));
free_page(pa2page(pgdir[0]));
pgdir[0] = 0;
mm->pgdir = NULL;

Loading…
Cancel
Save