423A35C7/os_kernel_lab
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile:: add tags options; vmm.[ch] fix bug in find_vma Function, and update check_vma_struct Funciton from lab3-lab8

Browse Source
This commit is contained in:
chyyuu
2013-03-24 20:20:28 -04:00
parent 0f1770031b
commit 0c99c48257
21 changed files with 240 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/lab3/Makefile
View File

@@ -254,9 +254,9 @@ touch:
print-%:
@echo $($(shell echo $(patsubst print-%,%,$@) | $(TR) [a-z] [A-Z]))
.PHONY: clean dist-clean handin packall
.PHONY: clean dist-clean handin packall tags
clean:
$(V)$(RM) $(GRADE_GDB_IN) $(GRADE_QEMU_OUT)
$(V)$(RM) $(GRADE_GDB_IN) $(GRADE_QEMU_OUT) cscope* tags
-$(RM) -r $(OBJDIR) $(BINDIR)
dist-clean: clean
@@ -269,3 +269,9 @@ packall: clean
@$(RM) -f $(HANDIN)
@tar -czf $(HANDIN) `find . -type f -o -type d | grep -v '^\.*$$' | grep -vF '$(HANDIN)'`
tags:
@echo TAGS ALL
$(V)rm -f cscope.files cscope.in.out cscope.out cscope.po.out tags
$(V)find . -type f -name "*.[chS]" >cscope.files
$(V)cscope -bq
$(V)ctags -L cscope.files

34
code/lab3/kern/mm/vmm.c
View File

@@ -80,7 +80,7 @@ find_vma(struct mm_struct *mm, uintptr_t addr) {
list_entry_t *list = &(mm->mmap_list), *le = list;
while ((le = list_next(le)) != list) {
vma = le2vma(le, list_link);
if (addr < vma->vm_end) {
if (vma->vm_start<=addr && addr < vma->vm_end) {
found = 1;
break;
}
@@ -181,7 +181,7 @@ check_vma_struct(void) {
int step1 = 10, step2 = step1 * 10;
int i;
for (i = step1; i >= 0; i --) {
for (i = step1; i >= 1; i --) {
struct vma_struct *vma = vma_create(i * 5, i * 5 + 2, 0);
assert(vma != NULL);
insert_vma_struct(mm, vma);
@@ -195,21 +195,35 @@ check_vma_struct(void) {
list_entry_t *le = list_next(&(mm->mmap_list));
for (i = 0; i <= step2; i ++) {
for (i = 1; i <= step2; i ++) {
assert(le != &(mm->mmap_list));
struct vma_struct *mmap = le2vma(le, list_link);
assert(mmap->vm_start == i * 5 && mmap->vm_end == i * 5 + 2);
le = list_next(le);
}
for (i = 0; i < 5 * step2 + 2; i ++) {
struct vma_struct *vma = find_vma(mm, i);
assert(vma != NULL);
int j = i / 5;
if (i >= 5 * j + 2) {
j ++;
for (i = 5; i <= 5 * step2; i +=5) {
struct vma_struct *vma1 = find_vma(mm, i);
assert(vma1 != NULL);
struct vma_struct *vma2 = find_vma(mm, i+1);
assert(vma2 != NULL);
struct vma_struct *vma3 = find_vma(mm, i+2);
assert(vma3 == NULL);
struct vma_struct *vma4 = find_vma(mm, i+3);
assert(vma4 == NULL);
struct vma_struct *vma5 = find_vma(mm, i+4);
assert(vma5 == NULL);
assert(vma1->vm_start == i && vma1->vm_end == i + 2);
assert(vma2->vm_start == i && vma2->vm_end == i + 2);
}
for (i =4; i>=0; i--) {
struct vma_struct *vma_below_5= find_vma(mm,i);
if (vma_below_5 != NULL ) {
cprintf("vma_below_5: i %x, start %x, end %x\n",i, vma_below_5->vm_start, vma_below_5->vm_end);
}
assert(vma->vm_start == j * 5 && vma->vm_end == j * 5 + 2);
assert(vma_below_5 == NULL);
}
mm_destroy(mm);

7
code/lab3/kern/mm/vmm.h
View File

@@ -9,11 +9,12 @@
//pre define
struct mm_struct;
// the virtual continuous memory area(vma)
// the virtual continuous memory area(vma), [vm_start, vm_end),
// addr belong to a vma means vma.vm_start<= addr <vma.vm_end
struct vma_struct {
struct mm_struct *vm_mm; // the set of vma using the same PDT
uintptr_t vm_start; // start addr of vma
uintptr_t vm_end; // end addr of vma
uintptr_t vm_start; // start addr of vma
uintptr_t vm_end; // end addr of vma, not include the vm_end itself
uint32_t vm_flags; // flags of vma
list_entry_t list_link; // linear list link which sorted by start addr of vma
};