Mercurial > hg > CbC > CbC_xv6

changeset 195:9fb193a2c352

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix_vm_iml_private
author anatofuz
date Thu, 23 Jan 2020 14:42:47 +0900
parents ee6063379aad
children 758909fc5c60
files src/impl/vm_impl.cbc src/impl/vm_impl.h src/impl/vm_impl_private.cbc
diffstat 3 files changed, 8 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/impl/vm_impl.cbc	Thu Jan 23 09:39:56 2020 +0900
+++ b/src/impl/vm_impl.cbc	Thu Jan 23 14:42:47 2020 +0900
@@ -54,7 +54,7 @@
 }
 
 typedef struct proc proc;
-__code switchuvmvm_impl(struct vm_impl* vm ,struct proc* p, __code next(...)) { //:skip
+__code switchuvmvm_impl(struct vm_impl* vm ,struct proc* p, __code next(...)) {  //:skip
 
     goto next(...);
 }
--- a/src/impl/vm_impl.h	Thu Jan 23 09:39:56 2020 +0900
+++ b/src/impl/vm_impl.h	Thu Jan 23 14:42:47 2020 +0900
@@ -1,10 +1,11 @@
 typedef struct vm_impl<Impl, Isa> impl vm{
+    union Data* vm_impl;
     uint i;
     pte_t* pte;
-    unsigned int sz;
+    uint sz;
  
     __code loaduvm_ptesize_check(Type* vm_impl, __code next(...));
-    __code loaduvm_loop(Type* vm_impl, uint i, pte_t* pte, unsigned int sz, __code next(...));
+    __code loaduvm_loop(Type* vm_impl, uint i, pte_t* pte, uint sz, __code next(...));
     __code next(...);
  
 
--- a/src/impl/vm_impl_private.cbc	Thu Jan 23 09:39:56 2020 +0900
+++ b/src/impl/vm_impl_private.cbc	Thu Jan 23 14:42:47 2020 +0900
@@ -1,14 +1,10 @@
 #include "../../context.h"
 #interface "vm_impl.h"
-#define __ncode
 
-__ncode loaduvm_ptesize_checkvm_impl(struct vm_impl* vm, enum Code next) {
-
-    // goto meta();
+__code loaduvm_ptesize_checkvm_impl(struct vm_impl* vm_impl) {
+    goto vm_impl->next();
 }
 
-__ncode loaduvm_loopvm_impl(struct vm_impl* vm, uint* i, pte_t* pte, uint sz, enum Code next) {
-
-    // goto meta();
+__code loaduvm_loopvm_impl(struct vm_impl* vm_impl) {
+    goto vm_impl->next();
 }
-