mirrors/unicorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the decoding of opcodes after getting vex2 using 0xc5 (#1064)

Browse Source 
* Fixed the decoding of opcodes after getting vex2 using 0xc5

* Added testcase for vex. Can and should be expanded

* Fixed warning of testcase for vex (parentheses for assignment)
This commit is contained in:
dmarxn 2019-02-25 15:14:20 +02:00 committed by Nguyen Anh Quynh
parent 738d102989
commit 5bf6d77e4e
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qemu/target-i386/translate.c
View File

@ -5145,7 +5145,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
rex_r = (~vex2 >> 4) & 8;
if (b == 0xc5) {
vex3 = vex2;
b = cpu_ldub_code(env, s->pc++);
b = cpu_ldub_code(env, s->pc++) | 0x100;
} else {
#ifdef TARGET_X86_64
s->rex_x = (~vex2 >> 3) & 8;

58
tests/regress/x86_vex.c Normal file
View File

@ -0,0 +1,58 @@
#include "unicorn/unicorn.h"
#include <assert.h>
#include <stdio.h>
#define OK(x) {uc_err __err; if ((__err = x)) { fprintf(stderr, "%s", uc_strerror(__err)); assert(false); } }
static void test_vmovdqu(void)
{
uc_engine *uc;
int r_esi = 0x1234;
int r_edi = 0x7890;
uint64_t r_xmm0[2] = {0x08090a0b0c0d0e0f, 0x0001020304050607};
/* 128 bit at address esi (0x1234) this should not be read into xmm0 */
char mem_esi[] = { '\xE7', '\x1D', '\xA7', '\xE8', '\x88', '\xE4', '\x94', '\x40', '\x54', '\x74', '\x24', '\x97', '\x1F', '\x2E', '\xB6', '\x40' };
/* 128 bit at address edi (0x7890) this SHOULD be read into xmm0 */
char mem_edi[] = { '\xAD', '\xFA', '\x5C', '\x6D', '\x45', '\x4A', '\x93', '\x40', '\xD2', '\x00', '\xDE', '\x02', '\x89', '\xE8', '\x94', '\x40' };
/* vmovdqu xmm0, [edi] */
char code[] = { '\xC5', '\xFA', '\x6F', '\x07' };
/* initialize memory and run emulation */
OK(uc_open(UC_ARCH_X86, UC_MODE_32, &uc));
OK(uc_mem_map(uc, 0, 2 * 1024 * 1024, UC_PROT_ALL));
OK(uc_mem_write(uc, 0, code, sizeof(code) / sizeof(code[0])));
// initialize machine registers;
OK(uc_reg_write(uc, UC_X86_REG_XMM0, &r_xmm0));
OK(uc_reg_write(uc, UC_X86_REG_ESI, &r_esi));
OK(uc_reg_write(uc, UC_X86_REG_EDI, &r_edi));
OK(uc_mem_write(uc, r_esi, mem_esi, sizeof(mem_esi) / sizeof(mem_esi[0])));
OK(uc_mem_write(uc, r_edi, mem_edi, sizeof(mem_edi) / sizeof(mem_edi[0])));
OK(uc_emu_start(uc, 0, sizeof(code) / sizeof(code[0]), 0, 0));
/* Read xmm0 after emulation */
OK(uc_reg_read(uc, UC_X86_REG_XMM0, &r_xmm0));
assert(0x4094e88902de00d2 == r_xmm0[0] && 0x40934a456d5cfaad == r_xmm0[1]);
OK(uc_close(uc));
}
/* TODO: Add more vex prefixed instructions
Suggestions: vxorpd, vxorps, vandpd, ... */
int main(int argc, char **argv, char **envp)
{
test_vmovdqu();
return 0;
}