Mercurial > hg > Members > menikon > CbC_xv6
diff src/impl/vm_impl_private.cbc @ 304:9fa2e66bc9ed
comment at vm_impl private field
author | anatofuz |
---|---|
date | Wed, 05 Feb 2020 14:11:58 +0900 |
parents | 4d76280758db |
children | 97c6157bac16 |
line wrap: on
line diff
--- a/src/impl/vm_impl_private.cbc Wed Feb 05 13:14:33 2020 +0900 +++ b/src/impl/vm_impl_private.cbc Wed Feb 05 14:11:58 2020 +0900 @@ -9,8 +9,8 @@ vm_impl* createvm_impl2(); //:skip */ -__code loaduvm_ptesize_checkvm_impl(struct vm_impl* vm_impl, __code next(int ret, ...)) { - char* addr = vm_impl->addr; +__code loaduvm_ptesize_checkvm_impl(struct vm_impl* vm_impl,char* addr, __code next(int ret, ...)) { + //char* addr = vm_impl->addr; if ((uint) addr %PTE_SZ != 0) { // goto panic @@ -19,9 +19,11 @@ goto loaduvm_loopvm_impl(vm_impl, next(ret, ...)); } -__code loaduvm_loopvm_impl(struct vm_impl* vm_impl, __code next(int ret, ...)) { +__code loaduvm_loopvm_impl(struct vm_impl* vm_impl, uint i, uint sz,__code next(int ret, ...)) { +/* uint i = vm_impl->i; uint sz = vm_impl->sz; +*/ if (i < sz) { goto loaduvm_check_pgdir(vm_impl, next(ret, ...)); @@ -60,12 +62,14 @@ } -__code loaduvm_check_pgdir(struct vm_impl* vm_impl, __code next(int ret, ...)) { +__code loaduvm_check_pgdir(struct vm_impl* vm_impl, pte_t* pte, pde_t* pgdir, uint i, char* addr, uint pa, __code next(int ret, ...)) { +/* pte_t* pte = vm_impl->pte; pde_t* pgdir = vm_impl->pgdir; uint i = vm_impl->i; char* addr = vm_impl->addr; uint pa = vm_impl->pa; +*/ if ((pte = walkpgdir(pgdir, addr + i, 0)) == 0) { // goto panic @@ -80,13 +84,15 @@ goto loaduvm_check_PTE_SZ(vm_impl, next(ret, ...)); } -__code loaduvm_check_PTE_SZ(struct vm_impl* vm_impl, __code next(int ret, ...)) { +__code loaduvm_check_PTE_SZ(struct vm_impl* vm_impl, uint sz, uint i, uint n, struct inode* ip, uint pa, uint offset, __code next(int ret, ...)) { +/* uint sz = vm_impl->sz; uint i = vm_impl->i; uint n = vm_impl->n; struct inode* ip = vm_impl->ip; uint pa = vm_impl->pa; uint offset = vm_impl->offset; +*/ if (sz - i < PTE_SZ) { n = sz - i;