minor changes to organization

[palacios.git] / palacios / src / palacios / vmm_v3dec.c

diff --git a/palacios/src/palacios/vmm_v3dec.c b/palacios/src/palacios/vmm_v3dec.c
index 74c8c56..f10bed9 100644 (file)
--- a/palacios/src/palacios/vmm_v3dec.c
+++ b/palacios/src/palacios/vmm_v3dec.c
@@ -20,9 +20,14 @@
 #include <palacios/vmm_decoder.h>
 #include <palacios/vmm_instr_decoder.h>
 
+#ifndef V3_CONFIG_DEBUG_DECODER
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+
 
 #define MASK(val, length) ({                                           \
-            ullong_t mask = 0x0LL;                                     \
+            uint64_t mask = 0x0LL;                                     \
             switch (length) {                                          \
                case 1:                                                 \
                    mask = 0x00000000000000ffLL;                        \
@@ -70,7 +75,7 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins
     int length = 0;
 
 
-    V3_Print("Decoding Instruction at %p\n", (void *)instr_ptr);
+    PrintDebug("Decoding Instruction at %p\n", (void *)instr_ptr);
 
     memset(instr, 0, sizeof(struct x86_instr));
 
@@ -97,8 +102,7 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins
 
     form = op_code_to_form((uint8_t *)(instr_ptr + length), &length);
 
-
-    V3_Print("\t decoded as (%s)\n", op_form_to_str(form));
+    PrintDebug("\t decoded as (%s)\n", op_form_to_str(form));
 
     if (form == INVALID_INSTR) {
        PrintError("Could not find instruction form (%x)\n", *(uint32_t *)(instr_ptr + length));
@@ -114,12 +118,12 @@ int v3_decode(struct guest_info * core, addr_t instr_ptr, struct x86_instr * ins
        return -1;
     }
     length += ret;
-    
 
     instr->instr_length += length;
 
-
+#ifdef V3_CONFIG_DEBUG_DECODER
     v3_print_instr(instr);
+#endif
 
     return 0;
 }
@@ -259,6 +263,56 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 
            break;
        }
+       case MOVSX_8:
+       case MOVZX_8: {
+           uint8_t reg_code = 0;
+
+           ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->src_operand), &reg_code);
+           instr->src_operand.size = 1;
+
+           if (ret == -1) {
+               PrintError("Error decoding operand\n");
+               return -1;
+           }
+
+           instr_ptr += ret;
+
+           instr->dst_operand.size = operand_width;
+           instr->dst_operand.type = REG_OPERAND;
+           decode_gpr(core, reg_code, &(instr->dst_operand));
+
+           instr->src_operand.read = 1;
+           instr->dst_operand.write = 1;
+
+           instr->num_operands = 2;
+
+           break;
+       }
+       case MOVSX:
+       case MOVZX: {
+           uint8_t reg_code = 0;
+
+           ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->src_operand), &reg_code);
+           instr->src_operand.size = 2;
+
+           if (ret == -1) {
+               PrintError("Error decoding operand\n");
+               return -1;
+           }
+
+           instr_ptr += ret;
+
+           instr->dst_operand.size = operand_width;
+           instr->dst_operand.type = REG_OPERAND;
+           decode_gpr(core, reg_code, &(instr->dst_operand));
+
+           instr->src_operand.read = 1;
+           instr->dst_operand.write = 1;
+
+           instr->num_operands = 2;
+
+           break;
+       }
        case ADC_IMM2SX_8:
        case ADD_IMM2SX_8:
        case AND_IMM2SX_8:
@@ -269,7 +323,6 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 
            ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), &reg_code);
 
-
            if (ret == -1) {
                PrintError("Error decoding operand\n");
                return -1;
@@ -279,7 +332,7 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 
            instr->src_operand.type = IMM_OPERAND;
            instr->src_operand.size = operand_width;
-           instr->src_operand.operand = *(sint8_t *)instr_ptr;  // sign extend.
+           instr->src_operand.operand = (addr_t)MASK((sint64_t)*(sint8_t *)instr_ptr, operand_width);  // sign extend.
 
            instr->src_operand.read = 1;
            instr->dst_operand.write = 1;
@@ -319,99 +372,114 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
            instr->num_operands = 2;
 
            break;
+       }
+       case MOV_2CR: {
+           uint8_t reg_code = 0;
+           
+           ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->src_operand),
+                                   &reg_code);
 
-           case MOV_2CR: {
-               uint8_t reg_code = 0;
-
-               ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->src_operand),
-                                       &reg_code);
-
-               if (ret == -1) {
-                   PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
-                   return -1;
-               }
+           if (ret == -1) {
+               PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
+               return -1;
+           }
                
-               instr_ptr += ret;
-
-               instr->dst_operand.type = REG_OPERAND;
-               instr->dst_operand.size = operand_width;
-               decode_cr(core, reg_code, &(instr->dst_operand));
+           instr_ptr += ret;
 
-               instr->src_operand.read = 1;
-               instr->dst_operand.write = 1;
+           instr->dst_operand.type = REG_OPERAND;
+           instr->dst_operand.size = operand_width;
+           decode_cr(core, reg_code, &(instr->dst_operand));
+           
+           instr->src_operand.read = 1;
+           instr->dst_operand.write = 1;
 
-               instr->num_operands = 2;
-               break;
+           instr->num_operands = 2;
+           break;
+       }
+       case MOV_CR2: {
+           uint8_t reg_code = 0;
+           
+           ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand),
+                                   &reg_code);
+           
+           if (ret == -1) {
+               PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
+               return -1;
            }
-           case MOV_CR2: {
-               uint8_t reg_code = 0;
 
-               ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand),
-                                       &reg_code);
+           instr_ptr += ret;
+           
+           instr->src_operand.type = REG_OPERAND;
+           instr->src_operand.size = operand_width;
+           decode_cr(core, reg_code, &(instr->src_operand));
 
+           instr->src_operand.read = 1;
+           instr->dst_operand.write = 1;
 
-               if (ret == -1) {
-                   PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
-                   return -1;
-               }
+           instr->num_operands = 2;
+           break;
+       }
+       case STOS:
+       case STOS_8: {
+           instr->is_str_op = 1;
 
-               instr_ptr += ret;
-               
-               instr->src_operand.type = REG_OPERAND;
-               instr->src_operand.size = operand_width;
-               decode_cr(core, reg_code, &(instr->src_operand));
+           if (instr->prefixes.rep == 1) {
+               instr->str_op_length = MASK(core->vm_regs.rcx, operand_width);
+           } else {
+               instr->str_op_length = 1;
+           }
 
-               instr->src_operand.read = 1;
-               instr->dst_operand.write = 1;
+           instr->src_operand.size = operand_width;
+           instr->src_operand.type = REG_OPERAND;
+           instr->src_operand.operand = (addr_t)&(core->vm_regs.rax);
 
-               instr->num_operands = 2;
-               break;
-           }
-           case STOS:
-           case STOS_8: {
-               instr->is_str_op = 1;
-               
-               if (instr->prefixes.rep == 1) {
-                   instr->str_op_length = MASK(core->vm_regs.rcx, operand_width);
-               } else {
-                   instr->str_op_length = 1;
-               }
-               
-               instr->src_operand.size = operand_width;
-               instr->src_operand.type = REG_OPERAND;
-               instr->src_operand.operand = (addr_t)&(core->vm_regs.rax);
+           instr->dst_operand.type = MEM_OPERAND;
+           instr->dst_operand.size = operand_width;
+           instr->dst_operand.operand = get_addr_linear(core, MASK(core->vm_regs.rdi, addr_width), &(core->segments.es));
+
+           instr->src_operand.read = 1;
+           instr->dst_operand.write = 1;
 
-               instr->dst_operand.type = MEM_OPERAND;
-               instr->dst_operand.size = operand_width;
-               instr->dst_operand.operand = get_addr_linear(core, MASK(core->vm_regs.rdi, addr_width), &(core->segments.es));
+           instr->num_operands = 2;
 
-               instr->src_operand.read = 1;
-               instr->dst_operand.write = 1;
+           break;
+       }
+       case INVLPG: {
+           uint8_t reg_code = 0;
 
-               instr->num_operands = 2;
+           ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), &reg_code);
 
-               break;
+           if (ret == -1) {
+               PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
+               return -1;
            }
-           case INVLPG: {
-               uint8_t reg_code = 0;
 
-               ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), &reg_code);
+           instr_ptr += ret;
 
-               if (ret == -1) {
-                   PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
-                   return -1;
-               }
+           instr->num_operands = 1;
+           break;
+       }
+       case LMSW: 
+       case SMSW: {
+           uint8_t reg_code = 0;
 
-               instr_ptr += ret;
+           ret = decode_rm_operand(core, instr_ptr, form, instr, &(instr->dst_operand), &reg_code);
 
-               instr->num_operands = 1;
-               break;
+           if (ret == -1) {
+               PrintError("Error decoding operand for (%s)\n", op_form_to_str(form));
+               return -1;
            }
-           case CLTS: {
-               // no operands. 
-               break;
 
-           }
+           instr_ptr += ret;
+
+           instr->dst_operand.read = 1;
+
+           instr->num_operands = 1;
+           break;
+       }
+       case CLTS: {
+           // no operands. 
+           break;
        }
        default:
            PrintError("Invalid Instruction form: %s\n", op_form_to_str(form));
@@ -438,6 +506,10 @@ static v3_op_type_t op_form_to_type(op_form_t form) {
        case MOV_2CR:
            return V3_OP_MOV2CR;
 
+    // KCH: for syscall interposition
+    case INT:
+        return V3_OP_INT;
+
 
        case MOV_MEM2_8:
        case MOV_MEM2:
@@ -464,7 +536,6 @@ static v3_op_type_t op_form_to_type(op_form_t form) {
            return V3_OP_MOVZX;
 
 
-           
        case ADC_2MEM_8:
        case ADC_2MEM:
        case ADC_MEM2_8: