X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_decoder.h;h=0ae0109ca0341bf9b36c68d560e837347de27934;hb=362391accc505b29d938e9d0a21bf6a28a8cee34;hp=2617913eb2a684ff4c29ad867362eb48e45f4a62;hpb=af355c370ac80f8e19d6375cb3070213c29a92eb;p=palacios.git diff --git a/palacios/include/palacios/vmm_decoder.h b/palacios/include/palacios/vmm_decoder.h index 2617913..0ae0109 100644 --- a/palacios/include/palacios/vmm_decoder.h +++ b/palacios/include/palacios/vmm_decoder.h @@ -1,5 +1,24 @@ -#ifndef __VMM_EMULATE_H -#define __VMM_EMULATE_H +/* + * This file is part of the Palacios Virtual Machine Monitor developed + * by the V3VEE Project with funding from the United States National + * Science Foundation and the Department of Energy. + * + * The V3VEE Project is a joint project between Northwestern University + * and the University of New Mexico. You can find out more at + * http://www.v3vee.org + * + * Copyright (c) 2008, Jack Lange + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Jack Lange + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + +#ifndef __VMM_DECODER_H +#define __VMM_DECODER_H #ifdef __V3VEE__ @@ -7,12 +26,22 @@ #include -typedef enum {INVALID_OPERAND, REG_OPERAND, MEM_OPERAND, IMM_OPERAND} operand_type_t; +typedef enum { V3_INVALID_OP, + V3_OP_MOVCR2, V3_OP_MOV2CR, V3_OP_SMSW, V3_OP_LMSW, V3_OP_CLTS, + V3_OP_ADC, V3_OP_ADD, V3_OP_AND, V3_OP_OR, V3_OP_XOR, V3_OP_SUB, + V3_OP_INC, V3_OP_DEC, V3_OP_NEG, V3_OP_MOV, V3_OP_NOT, V3_OP_XCHG, + V3_OP_SETB, V3_OP_SETBE, V3_OP_SETL, V3_OP_SETLE, V3_OP_SETNB, + V3_OP_SETNBE, V3_OP_SETNL, V3_OP_SETNLE, V3_OP_SETNO, V3_OP_SETNP, + V3_OP_SETNS, V3_OP_SETNZ, V3_OP_SETO, V3_OP_SETP, V3_OP_SETS, + V3_OP_SETZ, V3_OP_MOVS} v3_op_type_t; + + +typedef enum {INVALID_OPERAND, REG_OPERAND, MEM_OPERAND, IMM_OPERAND} v3_operand_type_t; struct x86_operand { addr_t operand; uint_t size; - operand_type_t type; + v3_operand_type_t type; }; struct x86_prefixes { @@ -29,7 +58,7 @@ struct x86_prefixes { 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 br_taken : 1; // 0x3E uint_t op_size : 1; // 0x66 uint_t addr_size : 1; // 0x67 }; @@ -38,15 +67,26 @@ struct x86_prefixes { struct x86_instr { struct x86_prefixes prefixes; uint_t instr_length; - addr_t opcode; // a pointer to the V3_OPCODE_[*] arrays defined below + v3_op_type_t op_type; uint_t num_operands; struct x86_operand dst_operand; struct x86_operand src_operand; struct x86_operand third_operand; + addr_t str_op_length; + addr_t is_str_op; void * decoder_data; }; +struct basic_instr_info { + uint_t instr_length; + uint_t op_size; + uint_t str_op : 1; + uint_t has_rep : 1; +}; + + + /************************/ /* EXTERNAL DECODER API */ /************************/ @@ -58,7 +98,7 @@ struct x86_instr { /* * Initializes a decoder */ -int init_decoder(); +int v3_init_decoder(); /* * Decodes an instruction @@ -84,12 +124,13 @@ int v3_encode(struct guest_info * info, struct x86_instr * instr, char * instr_b * Gets the operand size for a memory operation * */ -int v3_basic_mem_decode(struct guest_info * info, addr_t instr_ptr, uint_t * size, uint_t * instr_len); - - +int v3_basic_mem_decode(struct guest_info * info, addr_t instr_ptr, struct basic_instr_info * instr_info); +/* Removes a rep prefix in place */ +void v3_strip_rep_prefix(uchar_t * instr, int length); +void v3_get_prefixes(uchar_t * instr, struct x86_prefixes * prefixes); /* @@ -178,10 +219,10 @@ MAKE_INSTR(SMSW, 3, 0x0f, 0x01, 0x00); #define PREFIX_OP_SIZE 0x66 #define PREFIX_ADDR_SIZE 0x67 -int opcode_cmp(const uchar_t * op1, const uchar_t * op2); +int v3_opcode_cmp(const uchar_t * op1, const uchar_t * op2); -static inline int is_prefix_byte(char byte) { +static inline int is_prefix_byte(uchar_t byte) { switch (byte) { case 0xF0: // lock case 0xF2: // REPNE/REPNZ @@ -211,10 +252,14 @@ static inline v3_reg_t get_gpr_mask(struct guest_info * info) { return 0xffff; break; case PROTECTED: + case PROTECTED_PAE: return 0xffffffff; + case LONG: + case LONG_32_COMPAT: + case LONG_16_COMPAT: default: - V3_ASSERT(0); - return 0; + PrintError("Unsupported Address Mode\n"); + return -1; } } @@ -228,11 +273,20 @@ static inline addr_t get_addr_linear(struct guest_info * info, addr_t addr, stru break;*/ case PROTECTED: + case PROTECTED_PAE: + case LONG_32_COMPAT: return addr + seg->base; break; + + case LONG: + // In long mode the segment bases are disregarded (forced to 0), unless using + // FS or GS, then the base addresses are added + return addr + seg->base; + + case LONG_16_COMPAT: default: - V3_ASSERT(0); - return 0; + PrintError("Unsupported CPU Mode: %d\n", info->cpu_mode); + return -1; } } @@ -301,7 +355,7 @@ static inline addr_t decode_register(struct v3_gprs * gprs, char reg_code, reg_s -static inline operand_type_t decode_operands16(struct v3_gprs * gprs, // input/output +static inline v3_operand_type_t decode_operands16(struct v3_gprs * gprs, // input/output char * modrm_instr, // input int * offset, // output addr_t * first_operand, // output @@ -311,7 +365,7 @@ static inline operand_type_t decode_operands16(struct v3_gprs * gprs, // input/o struct modrm_byte * modrm = (struct modrm_byte *)modrm_instr; addr_t base_addr = 0; modrm_mode_t mod_mode = 0; - operand_type_t addr_type = INVALID_OPERAND; + v3_operand_type_t addr_type = INVALID_OPERAND; char * instr_cursor = modrm_instr; // PrintDebug("ModRM mod=%d\n", modrm->mod); @@ -390,19 +444,19 @@ static inline operand_type_t decode_operands16(struct v3_gprs * gprs, // input/o -static inline operand_type_t decode_operands32(struct v3_gprs * gprs, // input/output - char * modrm_instr, // input +static inline v3_operand_type_t decode_operands32(struct v3_gprs * gprs, // input/output + uchar_t * modrm_instr, // input int * offset, // output addr_t * first_operand, // output addr_t * second_operand, // output reg_size_t reg_size) { // input - char * instr_cursor = modrm_instr; + uchar_t * instr_cursor = modrm_instr; struct modrm_byte * modrm = (struct modrm_byte *)modrm_instr; addr_t base_addr = 0; modrm_mode_t mod_mode = 0; uint_t has_sib_byte = 0; - operand_type_t addr_type = INVALID_OPERAND; + v3_operand_type_t addr_type = INVALID_OPERAND; @@ -433,7 +487,7 @@ static inline operand_type_t decode_operands32(struct v3_gprs * gprs, // input/o base_addr = gprs->rax; break; case 1: - base_addr = gprs->rcx; + base_addr = gprs->rcx; break; case 2: base_addr = gprs->rdx;