X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest_mem.c;h=b8db954cfa2d8ccb8b845c9681cdec74412d1c5c;hb=24178516ccd9f46718b687d4c630415eb63ff595;hp=32d4ab65d2f5d745c008ad394742901f47bba655;hpb=8c767ddb04d3ac42d080d9f9f5f40196d6f8f217;p=palacios.git

diff --git a/palacios/src/palacios/vm_guest_mem.c b/palacios/src/palacios/vm_guest_mem.c
index 32d4ab6..b8db954 100644
--- a/palacios/src/palacios/vm_guest_mem.c
+++ b/palacios/src/palacios/vm_guest_mem.c
@@ -66,12 +66,15 @@ int host_pa_to_host_va(addr_t host_pa, addr_t * host_va) {
 
 
 int guest_pa_to_host_pa(struct guest_info * guest_info, addr_t guest_pa, addr_t * host_pa) {
-  // we use the shadow map here...
-  host_region_type_t reg_type = lookup_shadow_map_addr(&(guest_info->mem_map), guest_pa, host_pa);
+  struct v3_shadow_region * shdw_reg = v3_get_shadow_region(guest_info, guest_pa);
 
-  if (reg_type != HOST_REGION_PHYSICAL_MEMORY) {
-    PrintError("In GPA->HPA: Could not find address in shadow map (addr=%p) (reg_type=%d)\n", 
-	        (void *)guest_pa, reg_type);
+  *host_pa = v3_get_shadow_addr(shdw_reg, guest_pa);
+
+  if ((shdw_reg == NULL) ||
+      (shdw_reg->host_type == SHDW_REGION_INVALID) ||
+      (shdw_reg->host_type == SHDW_REGION_FULL_HOOK)){
+    PrintError("In GPA->HPA: Could not find address in shadow map (addr=%p) (reg_type=%s)\n", 
+	       (void *)guest_pa, v3_shdw_region_type_to_str(shdw_reg->host_type));
     return -1;
   }
 
@@ -143,82 +146,50 @@ int guest_pa_to_host_va(struct guest_info * guest_info, addr_t guest_pa, addr_t
 
 
 int guest_va_to_guest_pa(struct guest_info * guest_info, addr_t guest_va, addr_t * guest_pa) {
+  v3_reg_t guest_cr3 = 0;
+
   if (guest_info->mem_mode == PHYSICAL_MEM) {
     // guest virtual address is the same as the physical
     *guest_pa = guest_va;
     return 0;
   }
 
+  if (guest_info->shdw_pg_mode == SHADOW_PAGING) {
+    guest_cr3 = guest_info->shdw_pg_state.guest_cr3;
+  } else {
+    guest_cr3 = guest_info->ctrl_regs.cr3;
+  }
 
 
   // Guest Is in Paged mode
   switch (guest_info->cpu_mode) {
   case PROTECTED:
-    {
-      addr_t tmp_pa = 0;
-      pde32_t * pde = 0;
-      addr_t guest_pde = 0;
-      
-      if (guest_info->shdw_pg_mode == SHADOW_PAGING) {
-	guest_pde = (addr_t)CR3_TO_PDE32((void *)(guest_info->shdw_pg_state.guest_cr3));
-      } else if (guest_info->shdw_pg_mode == NESTED_PAGING) {
-	guest_pde = (addr_t)CR3_TO_PDE32((void *)(guest_info->ctrl_regs.cr3));
-      }
-      
-      if (guest_pa_to_host_va(guest_info, guest_pde, (addr_t *)&pde) == -1) {
-	PrintError("In GVA->GPA: Invalid GPA(%p)->HVA PDE32 lookup\n", 
-		    (void *)guest_pde);
-	return -1;
-      }
-      
-      
-      switch (pde32_lookup(pde, guest_va, &tmp_pa)) {
-      case PDE32_ENTRY_NOT_PRESENT: 
-	*guest_pa = 0;
-	return -1;
-      case PDE32_ENTRY_LARGE_PAGE:
-	*guest_pa = tmp_pa;
-	return 0;
-      case PDE32_ENTRY_PTE32:
-	{
-	  pte32_t * pte = 0;
-	  
-	  
-	  if (guest_pa_to_host_va(guest_info, tmp_pa, (addr_t*)&pte) == -1) {
-	    PrintError("In GVA->GPA: Invalid GPA(%p)->HVA PTE32 lookup\n", 
-		        (void *)guest_pa);
-	    return -1;
-	  }
-	  
-	  //PrintDebug("PTE host addr=%x, GVA=%x, GPA=%x(should be 0)\n", pte, guest_va, *guest_pa);
-	 
-	  if (pte32_lookup(pte, guest_va, guest_pa) != 0) {
-	    PrintError("In GVA->GPA: PTE32 Lookup failure GVA=%p; PTE=%p\n", 
-		        (void *)guest_va,  (void *)pte);
-	    //	      PrintPT32(PDE32_INDEX(guest_va) << 22, pte);
-	    return -1;
-	  }
-	  
-	  return 0;
-	}
-      default:
-	return -1;
-      }
+    if (v3_translate_guest_pt_32(guest_info, guest_cr3, guest_va, guest_pa) == -1) {
+      PrintDebug("Could not translate addr (%p) through 32 bit guest PT at %p\n", 
+		 (void *)guest_va, (void *)(addr_t)guest_cr3);
+      return -1;
     }
+    break;
   case PROTECTED_PAE:
-    {
-      // Fill in
+    if (v3_translate_guest_pt_32pae(guest_info, guest_cr3, guest_va, guest_pa) == -1) {
+      PrintDebug("Could not translate addr (%p) through 32 bitpae guest PT at %p\n", 
+		 (void *)guest_va, (void *)(addr_t)guest_cr3);
+      return -1;
     }
+    break;
   case LONG:
-    {
-      // Fill in
+  case LONG_32_COMPAT:
+  case LONG_16_COMPAT:
+    if (v3_translate_guest_pt_64(guest_info, guest_cr3, guest_va, guest_pa) == -1) {
+      PrintDebug("Could not translate addr (%p) through 64 bit guest PT at %p\n", 
+		 (void *)guest_va, (void *)(addr_t)guest_cr3);
+      return -1;
     }
+    break;
   default:
     return -1;
   }
   
-  
-  
   return 0;
 }