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
10 changes: 7 additions & 3 deletions src/dynarec/la64/dynarec_la64_functions.c
Original file line number Diff line number Diff line change
Expand Up @@ -1127,16 +1127,20 @@ static int tryApplyPreloadCache(dynarec_la64_t* dyn, int first, int last, int re

lsx_cache_t first_cache = dyn->insts[first_use].lsx.lsxcache[reg];
if (first_cache.n != reg) return 0;
int dirty = 0;
if (ymm) {
if (first_cache.t != LSX_CACHE_YMMR && first_cache.t != LSX_CACHE_YMMW)
return 0;
dirty = first_cache.t == LSX_CACHE_YMMW;
} else if (first_cache.t != LSX_CACHE_XMMR && first_cache.t != LSX_CACHE_XMMW) {
return 0;
} else {
dirty = first_cache.t == LSX_CACHE_XMMW;
}

for (int i = first; i < first_use; ++i) {
lsxcache_t* cache = &dyn->insts[i].lsx;
cache->lsxcache[reg].t = ymm ? LSX_CACHE_YMMR : LSX_CACHE_XMMR;
cache->lsxcache[reg].t = ymm ? (dirty ? LSX_CACHE_YMMW : LSX_CACHE_YMMR) : (dirty ? LSX_CACHE_XMMW : LSX_CACHE_XMMR);
cache->lsxcache[reg].n = reg;
cache->fpuused[reg] = 1;
cache->news &= ~(1u << reg);
Expand All @@ -1145,12 +1149,12 @@ static int tryApplyPreloadCache(dynarec_la64_t* dyn, int first, int last, int re
cache->ssecache[reg].v = -1;
cache->avxcache[reg].reg = reg;
cache->avxcache[reg].upper_zero_pending = 0;
cache->avxcache[reg].write = 0;
cache->avxcache[reg].write = dirty;
if (!cache->avxcache[reg].v) cache->avxcache[reg].write = 1;
} else {
cache->avxcache[reg].v = -1;
cache->ssecache[reg].reg = reg;
cache->ssecache[reg].write = 0;
cache->ssecache[reg].write = dirty;
if (!cache->ssecache[reg].v) cache->ssecache[reg].write = 1;
}
}
Expand Down
10 changes: 6 additions & 4 deletions src/dynarec/la64/dynarec_la64_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -2571,18 +2571,20 @@ void doPreload(dynarec_la64_t* dyn, int ninst)
MESSAGE(LOG_INFO, "Preload XMM/YMM -------- %x\n", preload);
for (int i = 0; i < 16; ++i) {
if (preload & (1u << i)) {
int t = dyn->insts[ninst].lsx.lsxcache[i].t == LSX_CACHE_XMMW ? LSX_CACHE_XMMW : LSX_CACHE_XMMR;
dyn->lsx.avxcache[i].v = -1;
dyn->lsx.ssecache[i].reg = fpu_get_reg_xmm(dyn, LSX_CACHE_XMMR, i);
dyn->lsx.ssecache[i].write = 0;
dyn->lsx.ssecache[i].reg = fpu_get_reg_xmm(dyn, t, i);
dyn->lsx.ssecache[i].write = (t == LSX_CACHE_XMMW);
if (!dyn->lsx.ssecache[i].v) dyn->lsx.ssecache[i].write = 1;
VLD(dyn->lsx.ssecache[i].reg, xEmu, offsetof(x64emu_t, xmm[i]));
}
if (preload & (1u << (16 + i))) {
int t = dyn->insts[ninst].lsx.lsxcache[i].t == LSX_CACHE_YMMW ? LSX_CACHE_YMMW : LSX_CACHE_YMMR;
dyn->lsx.ssecache[i].v = -1;
dyn->lsx.avxcache[i].v = 0;
dyn->lsx.avxcache[i].reg = fpu_get_reg_ymm(dyn, LSX_CACHE_YMMR, i);
dyn->lsx.avxcache[i].reg = fpu_get_reg_ymm(dyn, t, i);
dyn->lsx.avxcache[i].upper_zero_pending = 0;
dyn->lsx.avxcache[i].write = 0;
dyn->lsx.avxcache[i].write = (t == LSX_CACHE_YMMW);
if (!dyn->lsx.avxcache[i].v) dyn->lsx.avxcache[i].write = 1;
VLD(dyn->lsx.avxcache[i].reg, xEmu, offsetof(x64emu_t, xmm[i]));
VLD(SCRATCH, xEmu, offsetof(x64emu_t, ymm[i]));
Expand Down
Loading