X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_decoder.h;h=ac3e83bf71b926b0c1d4176edbc0efad42660f1b;hb=6f089682a19a99474faf05f74b44f9f71f58b30b;hp=fda372966ecee09f1e7609af0b05e27399745542;hpb=98b605668d81bfe0965d482d9d0da647f5cca267;p=palacios.git diff --git a/palacios/include/palacios/vmm_decoder.h b/palacios/include/palacios/vmm_decoder.h index fda3729..ac3e83b 100644 --- a/palacios/include/palacios/vmm_decoder.h +++ b/palacios/include/palacios/vmm_decoder.h @@ -1,5 +1,8 @@ #ifndef __VMM_EMULATE_H #define __VMM_EMULATE_H + +#ifdef __V3VEE__ + #include #include @@ -8,11 +11,12 @@ * We can parse out the instruction prefixes, as well as decode the operands */ -typedef enum {INVALID_OPERAND, REG_OPERAND, MEM_OPERAND} operand_type_t; +typedef enum {INVALID_OPERAND, REG_OPERAND, MEM_OPERAND} operand_type_t; + struct x86_operand { addr_t operand; uint_t size; @@ -20,22 +24,74 @@ struct x86_operand { }; struct x86_prefix_list { - uint_t lock : 1; + uint_t lock : 1; // 0xF0 + uint_t repne : 1; // 0xF2 + uint_t repnz : 1; // 0xF2 + uint_t rep : 1; // 0xF3 + uint_t repe : 1; // 0xF3 + uint_t repz : 1; // 0xF3 + uint_t cs_override : 1; // 0x2E + uint_t ss_override : 1; // 0x36 + uint_t ds_override : 1; // 0x3E + uint_t es_override : 1; // 0x26 + uint_t fs_override : 1; // 0x64 + uint_t gs_override : 1; // 0x65 + uint_t br_not_taken : 1; // 0x2E + uint_t br_takend : 1; // 0x3E + uint_t op_size : 1; // 0x66 + uint_t addr_size : 1; // 0x67 +}; + + +struct x86_instr { + uint_t instr_length; // output + addr_t opcode; // output + uint_t opcode_length; // output + struct x86_prefix_list prefixes; // output + struct x86_operand src_operand; // output + struct x86_operand dst_operand; // output + struct x86_operand extra_operand; }; -/* This parses an instruction + + /************************/ + /* EXTERNAL DECODER API */ +/************************/ +/* + This is an External API definition that must be implemented by a decoder +*/ + + +/* + * Initializes a decoder + */ +int init_decoder(); + +/* + * Decodes an instruction + * All addresses in arguments are in the host address space + * instr_ptr is the host address of the instruction + * IMPORTANT: make sure the instr_ptr is in contiguous host memory + * ie. Copy it to a buffer before the call + */ +int v3_decode(struct guest_info * info, addr_t instr_ptr, struct x86_instr * instr); + +/* + * Encodes an instruction * All addresses in arguments are in the host address space + * The instruction is encoded from the struct, and copied into a 15 byte host buffer + * referenced by instr_buf + * any unused bytes at the end of instr_buf will be filled with nops + * IMPORTANT: instr_buf must be allocated and 15 bytes long */ -int v3_parse_instr(struct guest_info * info, // input - char * instr_ptr, // input - uint_t * instr_length, // output - addr_t * opcode, // output - uint_t * opcode_length, // output - struct x86_prefix_list * prefixes, // output - struct x86_operand * src_operand, // output - struct x86_operand * dst_operand, // output - struct x86_operand * extra_operand); // output - +int v3_encode(struct guest_info * info, struct x86_instr * instr, char * instr_buf); + + + + + + + /* @@ -107,22 +163,22 @@ MAKE_INSTR(LMSW, 3, 0x0f, 0x01, 0x00); MAKE_INSTR(SMSW, 3, 0x0f, 0x01, 0x00); -static const uchar_t PREFIX_LOCK = 0xF0; -static const uchar_t PREFIX_REPNE = 0xF2; -static const uchar_t PREFIX_REPNZ = 0xF2; -static const uchar_t PREFIX_REP = 0xF3; -static const uchar_t PREFIX_REPE = 0xF3; -static const uchar_t PREFIX_REPZ = 0xF3; -static const uchar_t PREFIX_CS_OVERRIDE = 0x2E; -static const uchar_t PREFIX_SS_OVERRIDE = 0x36; -static const uchar_t PREFIX_DS_OVERRIDE = 0x3E; -static const uchar_t PREFIX_ES_OVERRIDE = 0x26; -static const uchar_t PREFIX_FS_OVERRIDE = 0x64; -static const uchar_t PREFIX_GS_OVERRIDE = 0x65; -static const uchar_t PREFIX_BR_NOT_TAKEN = 0x2E; -static const uchar_t PREFIX_BR_TAKEN = 0x3E; -static const uchar_t PREFIX_OP_SIZE = 0x66; -static const uchar_t PREFIX_ADDR_SIZE = 0x67; +#define PREFIX_LOCK 0xF0 +#define PREFIX_REPNE 0xF2 +#define PREFIX_REPNZ 0xF2 +#define PREFIX_REP 0xF3 +#define PREFIX_REPE 0xF3 +#define PREFIX_REPZ 0xF3 +#define PREFIX_CS_OVERRIDE 0x2E +#define PREFIX_SS_OVERRIDE 0x36 +#define PREFIX_DS_OVERRIDE 0x3E +#define PREFIX_ES_OVERRIDE 0x26 +#define PREFIX_FS_OVERRIDE 0x64 +#define PREFIX_GS_OVERRIDE 0x65 +#define PREFIX_BR_NOT_TAKEN 0x2E +#define PREFIX_BR_TAKEN 0x3E +#define PREFIX_OP_SIZE 0x66 +#define PREFIX_ADDR_SIZE 0x67 static inline int is_prefix_byte(char byte) { switch (byte) { @@ -154,7 +210,6 @@ static inline v3_reg_t get_gpr_mask(struct guest_info * info) { return 0xffff; break; case PROTECTED: - case PROTECTED_PG: return 0xffffffff; default: V3_ASSERT(0); @@ -166,10 +221,12 @@ static inline v3_reg_t get_gpr_mask(struct guest_info * info) { static inline addr_t get_addr_linear(struct guest_info * info, addr_t addr, struct v3_segment * seg) { switch (info->cpu_mode) { case REAL: - return addr + (seg->selector << 4); - break; + // It appears that the segment values are computed and cached in the vmcb structure + // We Need to check this for Intel + /* return addr + (seg->selector << 4); + break;*/ + case PROTECTED: - case PROTECTED_PG: return addr + seg->base; break; default: @@ -256,14 +313,14 @@ static inline operand_type_t decode_operands16(struct v3_gprs * gprs, // input/o operand_type_t addr_type = INVALID_OPERAND; char * instr_cursor = modrm_instr; - PrintDebug("ModRM mod=%d\n", modrm->mod); + // PrintDebug("ModRM mod=%d\n", modrm->mod); instr_cursor += 1; if (modrm->mod == 3) { mod_mode = REG; addr_type = REG_OPERAND; - PrintDebug("first operand = Register (RM=%d)\n",modrm->rm); + //PrintDebug("first operand = Register (RM=%d)\n",modrm->rm); *first_operand = decode_register(gprs, modrm->rm, reg_size); @@ -354,7 +411,7 @@ static inline operand_type_t decode_operands32(struct v3_gprs * gprs, // input/o mod_mode = REG; addr_type = REG_OPERAND; - PrintDebug("first operand = Register (RM=%d)\n",modrm->rm); + // PrintDebug("first operand = Register (RM=%d)\n",modrm->rm); *first_operand = decode_register(gprs, modrm->rm, reg_size); @@ -502,5 +559,7 @@ static inline operand_type_t decode_operands32(struct v3_gprs * gprs, // input/o +#endif // !__V3VEE__ + #endif