changeset 296:124c51584208

update vm_impl.h
author anatofuz <anatofuz@cr.ie.u-ryukyu.ac.jp>
date Tue, 04 Feb 2020 14:33:56 +0900
parents 274bbf78b87b
children c28c699c9caa 07c731e47330
files src/impl/vm_impl.h
diffstat 1 files changed, 2 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/src/impl/vm_impl.h	Tue Feb 04 14:04:34 2020 +0900
+++ b/src/impl/vm_impl.h	Tue Feb 04 14:33:56 2020 +0900
@@ -1,36 +1,9 @@
 typedef struct vm_impl<Impl, Isa> impl vm{
-    union Data* vm_impl;
-    uint i;
-    pte_t* pte;
-    uint sz;
-    pde_t* pgdir;
-    char* addr;
-    struct inode* ip;
-    uint offset;
-    uint pa;
-    uint n;
-    uint oldsz;
-    uint newsz;
-    uint a;
-    int ret;
-    char* mem;
-    char* uva;
-    pde_t* d;
-    uint ap;
-    uint phy_low;
-    uint phy_hi;
-    uint va;
-    void* pp;
-    uint len;
-    char* buf;
-    char* pa0;
-    uint va0;
-    proc_struct* p;
-    char* init;
-
     __code kpt_alloc_check_impl(Type* vm_impl, __code next(...));
+    __code loaduvm_ptesize_checkvm_impl(Type* vm_impl, char* addr, __code next(...));
     __code loaduvm_ptesize_check(Type* vm_impl, __code next(int ret, ...));
     __code loaduvm_loop(Type* vm_impl, uint i, pte_t* pte, uint sz, __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, ...));
     __code allocuvm_check_newsz(Type* vm_impl, pde_t* pgdir, uint oldsz, uint newsz, __code next(...));
     __code allocuvm_loop(Type* vm_impl, pde_t* pgdir, uint oldsz, uint newsz, uint a, __code next(...));
     __code copyuvm_check_null(Type* vm_impl, pde_t* pgdir, uint sz, __code next(...));