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

Fixup cr register on be (s390x)

Browse Source
This commit is contained in:
mio
2025-04-14 13:04:20 +08:00
parent 59ff63a90d
commit ed5d47b338
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qemu/target/i386/unicorn.c
View File

@@ -1492,7 +1492,7 @@ uc_err reg_write(void *_env, int mode, unsigned int regid, const void *value,
break;
case UC_X86_REG_CR0:
CHECK_REG_TYPE(uint64_t);
cpu_x86_update_cr0(env, *(uint32_t *)value);
cpu_x86_update_cr0(env, (*(uint64_t *)value) & 0xFFFFFFFF);
goto write_cr64;
case UC_X86_REG_CR1:
case UC_X86_REG_CR2:
@@ -1500,11 +1500,11 @@ uc_err reg_write(void *_env, int mode, unsigned int regid, const void *value,
goto write_cr64;
case UC_X86_REG_CR3:
CHECK_REG_TYPE(uint64_t);
cpu_x86_update_cr3(env, *(uint32_t *)value);
cpu_x86_update_cr3(env, (*(uint64_t *)value) & 0xFFFFFFFF);
goto write_cr64;
case UC_X86_REG_CR4:
CHECK_REG_TYPE(uint64_t);
cpu_x86_update_cr4(env, *(uint32_t *)value);
cpu_x86_update_cr4(env, (*(uint64_t *)value) & 0xFFFFFFFF);
goto write_cr64;
case UC_X86_REG_CR8:
CHECK_REG_TYPE(uint64_t);

8
tests/unit/test_x86.c
View File

@@ -1474,8 +1474,8 @@ static void test_x86_16_incorrect_ip(void)
static void test_x86_mmu_prepare_tlb(uc_engine *uc, uint64_t vaddr,
uint64_t tlb_base)
{
uint32_t cr0;
uint32_t cr4;
uint64_t cr0;
uint64_t cr4;
uc_x86_msr msr = {.rid = 0x0c0000080, .value = 0};
uint64_t pml4o = ((vaddr & 0x00ff8000000000) >> 39) * 8;
uint64_t pdpo = ((vaddr & 0x00007fc0000000) >> 30) * 8;
@@ -1489,9 +1489,7 @@ static void test_x86_mmu_prepare_tlb(uc_engine *uc, uint64_t vaddr,
OK(uc_mem_write(uc, tlb_base + pml4o, &pml4e_mem, sizeof(pml4o)));
OK(uc_mem_write(uc, tlb_base + 0x1000 + pdpo, &pdpe_mem, sizeof(pdpe)));
OK(uc_mem_write(uc, tlb_base + 0x2000 + pdo, &pde_mem, sizeof(pde)));
uint32_t cr3 = tlb_base & 0xFFFFFFFF;
cr3 = LEINT32(cr3);
OK(uc_reg_write(uc, UC_X86_REG_CR3, &cr3));
OK(uc_reg_write(uc, UC_X86_REG_CR3, &tlb_base));
OK(uc_reg_read(uc, UC_X86_REG_CR0, &cr0));
OK(uc_reg_read(uc, UC_X86_REG_CR4, &cr4));
OK(uc_reg_read(uc, UC_X86_REG_MSR, &msr));