X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_debug.c;h=02be2dcff5ce6ec506dd348a1c13b47fcbc22cf9;hb=f2a53228fe453dcc66700d9a48129d5fe4514816;hp=c2401e878e0ed8ff0b1bfc50f942a893297e6921;hpb=a20c07e3428f9aa55997befebca7a30721a71145;p=palacios.git

diff --git a/palacios/src/palacios/vmm_debug.c b/palacios/src/palacios/vmm_debug.c
index c2401e8..02be2dc 100644
--- a/palacios/src/palacios/vmm_debug.c
+++ b/palacios/src/palacios/vmm_debug.c
@@ -406,17 +406,21 @@ void v3_print_backtrace(struct guest_info * core) {
 		tmp_ptr += 3; // pass over symbol type
 
 		if (sym_offset > rip_val) {
-		    char * end_ptr = strchr(sym_ptr, '\n');
-
-		    if (end_ptr) {
-			*end_ptr = 0; // null terminate symbol...
+		    if (sym_ptr) {
+			char * end_ptr = strchr(sym_ptr, '\n');
+			
+			if (end_ptr) {
+			    *end_ptr = 0; // null terminate symbol...
+			}
+			sym_name = sym_ptr;
+		    } else {
+			sym_name = NULL;
 		    }
-
-		    sym_name = sym_ptr;
 		    break;
 		}
 
 		sym_ptr = tmp_ptr;
+
 		{ 
 		    char * end_ptr2 = strchr(tmp_ptr, '\n');
 
@@ -483,14 +487,20 @@ void v3_print_idt(struct guest_info * core, addr_t idtr_base) {
 	
 
     if (core->mem_mode == PHYSICAL_MEM) {
-        v3_gpa_to_hva(core, 
-                      get_addr_linear(core, idtr_base, &(core->segments.cs)),
-                      &base_hva);
+        if (v3_gpa_to_hva(core, 
+			  get_addr_linear(core, idtr_base, &(core->segments.cs)),
+			  &base_hva)) {
+	    PrintError(core->vm_info, core, "Cannot translate address\n");
+	    return;
+	}
         PrintError(core->vm_info, core, "Kind of weird that we got here.... physical mem?\n");
     } else if (core->mem_mode == VIRTUAL_MEM) {
-        v3_gva_to_hva(core, 
-                      get_addr_linear(core, idtr_base, &(core->segments.cs)),
-                      &base_hva);
+        if (v3_gva_to_hva(core, 
+			  get_addr_linear(core, idtr_base, &(core->segments.cs)),
+			  &base_hva)) { 
+	    PrintError(core->vm_info, core, "Cannot translate address\n");
+	    return;
+	}
     }
 
     // SANITY CHECK
@@ -533,14 +543,20 @@ void v3_print_gdt(struct guest_info * core, addr_t gdtr_base) {
     }
 
     if (core->mem_mode == PHYSICAL_MEM) {
-        v3_gpa_to_hva(core, 
-                      get_addr_linear(core, gdtr_base, &(core->segments.cs)),
-                      &base_hva);
+        if (v3_gpa_to_hva(core, 
+			  get_addr_linear(core, gdtr_base, &(core->segments.cs)),
+			  &base_hva)) {
+	    PrintError(core->vm_info, core, "Cannot translate address\n");
+	    return;
+	}
         PrintError(core->vm_info, core, "Kind of weird that we got here.... physical mem?\n");
     } else if (core->mem_mode == VIRTUAL_MEM) {
-        v3_gva_to_hva(core, 
-                      get_addr_linear(core, gdtr_base, &(core->segments.cs)),
-                      &base_hva);
+        if (v3_gva_to_hva(core, 
+			  get_addr_linear(core, gdtr_base, &(core->segments.cs)),
+			  &base_hva)) {
+	    PrintError(core->vm_info, core, "Cannot translate address\n");
+	    return;
+	}
     }
 
     // SANITY CHECK
@@ -555,18 +571,42 @@ void v3_print_gdt(struct guest_info * core, addr_t gdtr_base) {
 
     int i;
     char* cd[2] = {"data","code"};
-    // TODO: handle possibility of gate/segment descriptor
+    char * sys_types[16] = {"rsvd",
+                      "rsvd",
+                      "64bit LDT",
+                      "rsvd",
+                      "rsvd",
+                      "rsvd",
+                      "rsvd",
+                      "rsvd",
+                      "rsvd",
+                      "avail 64bit TSS",
+                      "rsvd",
+                      "busy 64bit TSS",
+                      "64bit call gate",
+                      "rsvd",
+                      "64bit int gate",
+                      "64bit trap gate"};
 
-    struct code_desc_lgcy * entry;
+    struct code_desc_long * entry;
     entry = (struct code_desc_long *)base_hva;
     V3_Print(core->vm_info, core, "= GDT ========\n");
     V3_Print(core->vm_info, core, "  # | hex | limit |     base |  c/d | dpl | p\n");
-    for (i = 0; i < NUM_GDT_ENTRIES; i++) {
-        V3_Print(core->vm_info, core, "%3d | %3x | %x%04x | %02x%02x%04x | %s |   %x | %x\n", i, i,
-                entry->limit_hi, entry->limit_lo,
-                entry->base_hi, entry->base_mid, entry->base_lo,
-                cd[entry->one1], entry->dpl, entry->p);
-        entry++;
+    for (i = 0; i < (core->segments.gdtr.limit+1)/8; i++) {
+        if (entry->one2 == 0) { // this is a system descriptor
+            struct system_desc_long* sys = (struct system_desc_long*)entry;
+            V3_Print(core->vm_info, core, "%3d | %3x | %x%04x | %08x%02x%02x%04x | %20s |   %x | %x\n", i, i,
+                    entry->limit_hi, entry->limit_lo,
+                    sys->base_hi, entry->base_hi, entry->base_mid, entry->base_lo,
+                    sys_types[sys->type], entry->dpl, entry->p);
+            entry += 2;
+        } else {
+            V3_Print(core->vm_info, core, "%3d | %3x | %x%04x | %08x%02x%02x%04x | %20s |   %x | %x\n", i, i,
+                    entry->limit_hi, entry->limit_lo,
+                    0, entry->base_hi, entry->base_mid, entry->base_lo,
+                    cd[entry->one1], entry->dpl, entry->p);
+            entry++;
+        }
     }
 }
 
@@ -606,13 +646,19 @@ void v3_print_idt(struct guest_info * core, addr_t idtr_base) {
     }
 
     if (core->mem_mode == PHYSICAL_MEM) {
-        v3_gpa_to_hva(core, 
-                      get_addr_linear(core, idtr_base, &(core->segments.cs)),
-                      &base_hva);
+        if (v3_gpa_to_hva(core, 
+			  get_addr_linear(core, idtr_base, &(core->segments.cs)),
+			  &base_hva)) {
+	    PrintError(core->vm_info, core, "Cannot translate address\n");
+	    return;
+	}
     } else if (core->mem_mode == VIRTUAL_MEM) {
-        v3_gva_to_hva(core, 
-                      get_addr_linear(core, idtr_base, &(core->segments.cs)),
-                      &base_hva);
+        if (v3_gva_to_hva(core, 
+			  get_addr_linear(core, idtr_base, &(core->segments.cs)),
+			  &base_hva)) {
+	    PrintError(core->vm_info, core, "Cannot translate address\n");
+	    return;
+	}
     }
 
     // SANITY CHECK
@@ -656,13 +702,19 @@ void v3_print_gdt(struct guest_info * core, addr_t gdtr_base) {
     }
 
     if (core->mem_mode == PHYSICAL_MEM) {
-        v3_gpa_to_hva(core, 
-                      get_addr_linear(core, gdtr_base, &(core->segments.cs)),
-                      &base_hva);
+        if (v3_gpa_to_hva(core,
+			  get_addr_linear(core, gdtr_base, &(core->segments.cs)),
+			  &base_hva)) { 
+	    PrintError(core->vm_info, core, "Cannot translate address\n");
+	    return;
+	}
     } else if (core->mem_mode == VIRTUAL_MEM) {
-        v3_gva_to_hva(core, 
-                      get_addr_linear(core, gdtr_base, &(core->segments.cs)),
-                      &base_hva);
+        if (v3_gva_to_hva(core, 
+			  get_addr_linear(core, gdtr_base, &(core->segments.cs)),
+			  &base_hva)) {
+	    PrintError(core->vm_info, core, "Cannot translate address\n");
+	    return;
+	}
     }
 
     // SANITY CHECK
@@ -676,19 +728,31 @@ void v3_print_gdt(struct guest_info * core, addr_t gdtr_base) {
     }
 
     int i;
-    char* cd[2] = {"data","code"};
+    char* cd[2] = {"  data","  code"};
     // TODO: handle possibility of gate/segment descriptor
+    char *types[16] = {"  ILGL","  ILGL"," LDT64","  ILGL","  ILGL","  ILGL","  ILGL","  ILGL",
+        "  ILGL","aTSS64","  ILGL","bTSS64","call64","  ILGL","intr64","trap64"};
 
     struct code_desc_long * entry;
     entry = (struct code_desc_long *)base_hva;
     V3_Print(core->vm_info, core, "= GDT ========\n");
     V3_Print(core->vm_info, core, "  # | hex | limit |     base |  c/d | dpl | p\n");
-    for (i = 0; i < NUM_GDT_ENTRIES; i++) {
-        V3_Print(core->vm_info, core, "%3d | %3x | %x%04x | %02x%02x%04x | %s |   %x | %x\n", i, i,
-                entry->limit_hi, entry->limit_lo,
-                entry->base_hi, entry->base_mid, entry->base_lo,
-                cd[entry->one1], entry->dpl, entry->p);
-        entry++;
+    for (i = 0; i < (core->segments.gdtr.limit+1)/8; i++) {
+        if (entry->one2 == 0 && *(uint64_t*)entry != 0) { // this is a system descriptor
+            struct system_desc_long* sys = (struct system_desc_long*)entry;
+            V3_Print(core->vm_info, core, "%3d | %3x | %x%04x | %08x%02x%02x%04x | %s |   %x | %x\n", i, i,
+                    entry->limit_hi, entry->limit_lo,
+                    sys->base_hi, entry->base_hi, entry->base_mid, entry->base_lo,
+                    types[sys->type], entry->dpl, entry->p);
+            entry += 2;
+            i++;
+        } else {
+            V3_Print(core->vm_info, core, "%3d | %3x | %x%04x | %08x%02x%02x%04x | %s |   %x | %x\n", i, i,
+                    entry->limit_hi, entry->limit_lo,
+                    0, entry->base_hi, entry->base_mid, entry->base_lo,
+                    cd[entry->one1], entry->dpl, entry->p);
+            entry++;
+        }
     }
 }
 
@@ -709,13 +773,19 @@ void v3_print_ldt(struct guest_info * core, addr_t ldtr_base) {
     } 
 
     if (core->mem_mode == PHYSICAL_MEM) {
-        v3_gpa_to_hva(core, 
-                      get_addr_linear(core, ldtr_base, &(core->segments.cs)),
-                      &base_hva);
+        if (v3_gpa_to_hva(core, 
+			  get_addr_linear(core, ldtr_base, &(core->segments.cs)),
+			  &base_hva)) {
+	    PrintError(core->vm_info, core, "Cannot translate address\n");
+	    return;
+	}
     } else if (core->mem_mode == VIRTUAL_MEM) {
-        v3_gva_to_hva(core, 
-                      get_addr_linear(core, ldtr_base, &(core->segments.cs)),
-                      &base_hva);
+        if (v3_gva_to_hva(core, 
+			  get_addr_linear(core, ldtr_base, &(core->segments.cs)),
+			  &base_hva)) {
+	    PrintError(core->vm_info, core, "Cannot translate address\n");
+	    return;
+	}
     }
 
     // SANITY CHECK
@@ -762,13 +832,19 @@ void v3_print_tss(struct guest_info * core, addr_t tr_base) {
     } 
 
     if (core->mem_mode == PHYSICAL_MEM) {
-        v3_gpa_to_hva(core, 
-                      get_addr_linear(core, tr_base, &(core->segments.cs)),
-                      &base_hva);
+        if (v3_gpa_to_hva(core, 
+			  get_addr_linear(core, tr_base, &(core->segments.cs)),
+			  &base_hva)) {
+	    PrintError(core->vm_info, core, "Cannot translate address\n");
+	    return;
+	}
     } else if (core->mem_mode == VIRTUAL_MEM) {
-        v3_gva_to_hva(core, 
-                      get_addr_linear(core, tr_base, &(core->segments.cs)),
-                      &base_hva);
+        if (v3_gva_to_hva(core, 
+			  get_addr_linear(core, tr_base, &(core->segments.cs)),
+			  &base_hva)) {
+	    PrintError(core->vm_info, core, "Cannot translate address\n");
+	    return;
+	}
     }
 
     // SANITY CHECK