Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/dynarec/arm64/dynarec_arm64_avx_66_0f38.c
Original file line number Diff line number Diff line change
Expand Up @@ -1385,14 +1385,14 @@ uintptr_t dynarec64_AVX_66_0F38(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip
VMOVQDto(x4, v2, i);
CBZw(x4, 4+4*4);
SMOVQSto(x4, v1, i+l*2);
ADDx_REG_LSL(x4, ed, x4, wb1);
ADDz_REG_LSL(x4, ed, x4, wb1);
VLD1_64(v0, i, x4);
VMOVQDfrom(v2, i, xZR);
} else for(int i=0; i<4; ++i) {
VMOVSto(x4, v2, i);
CBZw(x4, 4+4*4);
SMOVQSto(x4, v1, i);
ADDx_REG_LSL(x4, ed, x4, wb1);
ADDz_REG_LSL(x4, ed, x4, wb1);
VLD1_32(v0, i, x4);
VMOVQSfrom(v2, i, xZR);
}
Expand Down Expand Up @@ -1440,7 +1440,7 @@ uintptr_t dynarec64_AVX_66_0F38(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip
VMOVSto(x4, v2, i);
CBZw(x4, 4+4*4);
VMOVQDto(x4, (i&2)?q1:v1, i&1);
ADDx_REG_LSL(x4, ed, x4, wb1);
ADDz_REG_LSL(x4, ed, x4, wb1);
VLD1_32(v0, i, x4);
VMOVQSfrom(v2, i, xZR);
}
Expand All @@ -1465,7 +1465,7 @@ uintptr_t dynarec64_AVX_66_0F38(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip
VMOVQDto(x4, v2, i);
CBZw(x4, 4+4*4);
VMOVQDto(x4, v1, i);
ADDx_REG_LSL(x4, ed, x4, wb1);
ADDz_REG_LSL(x4, ed, x4, wb1);
VLD1_64(v0, i, x4);
VMOVQDfrom(v2, i, xZR);
}
Expand Down
28 changes: 21 additions & 7 deletions src/emu/x64runavx660f38.c
Original file line number Diff line number Diff line change
Expand Up @@ -1418,13 +1418,17 @@ uintptr_t RunAVX_660F38(x64emu_t *emu, vex_t vex, uintptr_t addr, int *step)
if(rex.w) {
for(int i=0; i<2; ++i)
if(VX->q[i]) {
GX->q[i] = *(uint64_t*)(tmp64u + (EX->sd[i]<<u8));
uint64_t data_addr = (tmp64u + (EX->sd[i]<<u8));
if (box64_is32bits) data_addr = (uintptr_t)(uint32_t)data_addr;
GX->q[i] = *(uint64_t*)data_addr;
VX->q[i] = 0;
}
} else {
for(int i=0; i<4; ++i)
if(VX->ud[i]) {
GX->ud[i] = *(uint32_t*)(tmp64u + (EX->sd[i]<<u8));
uint64_t data_addr = (tmp64u + (EX->sd[i]<<u8));
if (box64_is32bits) data_addr = (uintptr_t)(uint32_t)data_addr;
GX->ud[i] = *(uint32_t*)data_addr;
VX->ud[i] = 0;
}
}
Expand All @@ -1438,13 +1442,17 @@ uintptr_t RunAVX_660F38(x64emu_t *emu, vex_t vex, uintptr_t addr, int *step)
if(rex.w) {
for(int i=0; i<2; ++i)
if(VY->q[i]) {
GY->q[i] = *(uint64_t*)(tmp64u + (EX->sd[2+i]<<u8));
uint64_t data_addr = (tmp64u + (EX->sd[2+i]<<u8));
if (box64_is32bits) data_addr = (uintptr_t)(uint32_t)data_addr;
GY->q[i] = *(uint64_t*)data_addr;
VY->q[i] = 0;
}
} else {
for(int i=0; i<4; ++i)
if(VY->ud[i]) {
GY->ud[i] = *(uint32_t*)(tmp64u + (EY->sd[i]<<u8));
uint64_t data_addr = (tmp64u + (EY->sd[i]<<u8));
if (box64_is32bits) data_addr = (uintptr_t)(uint32_t)data_addr;
GY->ud[i] = *(uint32_t*)data_addr;
VY->ud[i] = 0;
}
}
Expand Down Expand Up @@ -1488,13 +1496,17 @@ uintptr_t RunAVX_660F38(x64emu_t *emu, vex_t vex, uintptr_t addr, int *step)
if(rex.w) {
for(int i=0; i<2; ++i)
if(VX->q[i]) {
GX->q[i] = *(uint64_t*)(tmp64u + (EX->sq[i]<<u8));
uint64_t data_addr = (tmp64u + (EX->sq[i]<<u8));
if (box64_is32bits) data_addr = (uintptr_t)(uint32_t)data_addr;
GX->q[i] = *(uint64_t*)data_addr;
VX->q[i] = 0;
}
} else {
for(int i=0; i<(vex.l?4:2); ++i)
if(VX->ud[i]) {
GX->ud[i] = *(uint32_t*)(tmp64u + (((i>1)?EY->sq[i-2]:EX->sq[i])<<u8));
uint64_t data_addr = (tmp64u + (((i>1)?EY->sq[i-2]:EX->sq[i])<<u8));
if (box64_is32bits) data_addr = (uintptr_t)(uint32_t)data_addr;
GX->ud[i] = *(uint32_t*)data_addr;
VX->ud[i] = 0;
}
}
Expand All @@ -1507,7 +1519,9 @@ uintptr_t RunAVX_660F38(x64emu_t *emu, vex_t vex, uintptr_t addr, int *step)
if(rex.w) {
for(int i=0; i<2; ++i)
if(VY->q[i]) {
GY->q[i] = *(uint64_t*)(tmp64u + (EY->sq[i]<<u8));
uint64_t data_addr = (tmp64u + (EY->sq[i]<<u8));
if (box64_is32bits) data_addr = (uintptr_t)(uint32_t)data_addr;
GY->q[i] = *(uint64_t*)data_addr;
VY->q[i] = 0;
}
} else {
Expand Down
Loading