Mercurial > hg > Members > menikon > CbC_xv6

changeset 318:173753022721

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
s/goto err->panic/goto meta/
author anatofuz
date Thu, 06 Feb 2020 20:31:43 +0900
parents d1dfc4af40d7
children 793a266bf3c7
files src/impl/vm_impl_private.cbc
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/impl/vm_impl_private.cbc	Thu Feb 06 20:22:31 2020 +0900
+++ b/src/impl/vm_impl_private.cbc	Thu Feb 06 20:31:43 2020 +0900
@@ -15,7 +15,7 @@
        char* msg = "addr % PTE_SZ != 0";
        struct Err* err = createKernelError(&proc->cbc_context);
        Gearef(cbc_context, Err)->msg = msg;
-       goto err->panic(msg);
+       goto meta(cbc_context, err->panic);
     }
 
     goto loaduvm_loopvm_impl(vm_impl, next(ret, ...));
@@ -64,7 +64,7 @@
        char* msg = "pte != walkpgdir...";
        struct Err* err = createKernelError(&proc->cbc_context);
        Gearef(cbc_context, Err)->msg = msg;
-       goto err->panic(msg);
+       goto meta(cbc_context, err->panic);
     } 
     pa = PTE_ADDR(*pte);
 
@@ -150,7 +150,7 @@
          char* msg = "oom: kpt_alloc";
          struct Err* err = createKernelError(&proc->cbc_context);
          Gearef(cbc_context, Err)->msg = msg;
-         goto err->panic(msg);
+         goto meta(cbc_context, err->panic);
     }
 
     memset(r, 0, PT_SZ);
@@ -201,7 +201,7 @@
          char* msg = "clearpteu";
          struct Err* err = createKernelError(&proc->cbc_context);
          Gearef(cbc_context, Err)->msg = msg;
-         goto err->panic(msg);
+         goto meta(cbc_context, err->panic);
     }
 
     // in ARM, we change the AP field (ap & 0x3) << 4)
@@ -242,7 +242,7 @@
            char* msg = "copyuvm: pte should exist";
            struct Err* err = createKernelError(&proc->cbc_context);
            Gearef(cbc_context, Err)->msg = msg;
-           goto err->panic(msg);
+           goto meta(cbc_context, err->panic);
         }
     goto copyuvm_loop_check_pte(vm_impl, pgdir, sz, d, pte, pa, i, ap, mem, __code next(int ret, ...));
 }
@@ -253,7 +253,7 @@
            char* msg = "copyuvm: page not present";
            struct Err* err = createKernelError(&proc->cbc_context);
            Gearef(cbc_context, Err)->msg = msg;
-           goto err->panic(msg);
+           goto meta(cbc_context, err->panic);
         }
 
     goto copyuvm_loop_check_mem(vm_impl, pgdir, sz, d, pte, pa, i, ap, mem, __code next(int ret, ...));
@@ -375,7 +375,7 @@
         char* msg = "switchuvm: no pgdir";
         struct Err* err = createKernelError(&proc->cbc_context);
         Gearef(cbc_context, Err)->msg = msg;
-        goto err->panic(msg);
+        goto meta(cbc_context, err->panic);
     }
 
     val = (uint) V2P(p->pgdir) | 0x00;
@@ -395,7 +395,7 @@
        char* msg = "inituvm: more than a page";
        struct Err* err = createKernelError(&proc->cbc_context);
        Gearef(cbc_context, Err)->msg = msg;
-       goto err->panic(msg);
+       goto meta(cbc_context, err->panic);
     }
 
     mem = alloc_page();