X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_decoder.c;h=874e8cf3d824bd949cadb79a492cd7cc3cf2eab2;hb=c30d1b88a60c3a8df426ce81553675bbe4afef52;hp=f70e78419b0dcc43bd084085548f4cadd056fcb7;hpb=c44555f7fa9a90c1934f5b74c8fe1dee1c09d325;p=palacios.git

diff --git a/palacios/src/palacios/vmm_decoder.c b/palacios/src/palacios/vmm_decoder.c
index f70e784..874e8cf 100644
--- a/palacios/src/palacios/vmm_decoder.c
+++ b/palacios/src/palacios/vmm_decoder.c
@@ -146,6 +146,7 @@ static char * op_type_to_str(v3_op_type_t type) {
 	case V3_OP_STOS: return "V3_OP_STOS"; 
 	case V3_OP_MOVZX: return "V3_OP_MOVZX"; 
 	case V3_OP_MOVSX: return "V3_OP_MOVSX";
+ 	case V3_OP_INT: return "V3_OP_INT";
 	case V3_INVALID_OP: 
 	default:
 	    return "V3_INVALID_OP";
@@ -192,7 +193,7 @@ static const ullong_t mask_8 = 0xffffffffffffffffLL;
 void v3_print_instr(struct x86_instr * instr) {
     V3_Print("Instr: %s (Len: %d)\n", op_type_to_str(instr->op_type), instr->instr_length);
 
-    V3_Print("Prefixes= %x\n", *(uint32_t *)&(instr->prefixes));
+    V3_Print("Prefixes= %x\n", instr->prefixes.val);
 
     if (instr->is_str_op) {
 	V3_Print("String OP (len=%d)\n", (uint32_t)instr->str_op_length);
@@ -205,7 +206,7 @@ void v3_print_instr(struct x86_instr * instr) {
 	V3_Print("\tLen=%d (Addr: %p)\n", instr->src_operand.size, 
 		 (void *)instr->src_operand.operand);
 	if (instr->src_operand.type == REG_OPERAND) {
-	    V3_Print("\tVal: %p\n", (void *)MASK(*(uint64_t *)(instr->src_operand.operand), instr->src_operand.size));
+	    V3_Print("\tVal: 0x%llx\n", MASK(*(uint64_t *)(instr->src_operand.operand), instr->src_operand.size));
 	}
     }
 
@@ -214,7 +215,7 @@ void v3_print_instr(struct x86_instr * instr) {
 	V3_Print("\tLen=%d (Addr: %p)\n", instr->dst_operand.size, 
 		 (void *)instr->dst_operand.operand);
 	if (instr->dst_operand.type == REG_OPERAND) {
-	    V3_Print("\tVal: %p\n", (void *)MASK(*(uint64_t *)(instr->dst_operand.operand), instr->dst_operand.size));
+	    V3_Print("\tVal: 0x%llx\n", MASK(*(uint64_t *)(instr->dst_operand.operand), instr->dst_operand.size));
 	}
     }
 
@@ -223,7 +224,7 @@ void v3_print_instr(struct x86_instr * instr) {
 	V3_Print("\tLen=%d (Addr: %p)\n", instr->third_operand.size, 
 		 (void *)instr->third_operand.operand);
 	if (instr->third_operand.type == REG_OPERAND) {
-	    V3_Print("\tVal: %p\n", (void *)MASK(*(uint64_t *)(instr->third_operand.operand), instr->third_operand.size));
+	    V3_Print("\tVal: 0x%llx\n", MASK(*(uint64_t *)(instr->third_operand.operand), instr->third_operand.size));
 	}
     }
 }