From f9b6ea48e9f19cef8d299835751b17e5af2391dd Mon Sep 17 00:00:00 2001 From: Yang Liu Date: Mon, 24 Feb 2025 02:29:59 +0800 Subject: [PATCH] [RV64_DYNAREC] Fixed swapCache scratch register usage (#2405) --- src/dynarec/rv64/dynarec_rv64_helper.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/dynarec/rv64/dynarec_rv64_helper.c b/src/dynarec/rv64/dynarec_rv64_helper.c index ca01e6969c..8dc8f9a4af 100644 --- a/src/dynarec/rv64/dynarec_rv64_helper.c +++ b/src/dynarec/rv64/dynarec_rv64_helper.c @@ -2389,19 +2389,16 @@ static void swapCache(dynarec_rv64_t* dyn, int ninst, int i, int j, extcache_t* MESSAGE(LOG_DUMP, "\t - Swapping %d <-> %d\n", i, j); // There is no swap instruction in RV64 to swap 2 float registers! // so use a scratch... -#define SCRATCH 2 - if (i_single) +#define SCRATCH 0 // f0 is not used anywhere else + if (i_single) { FMVS(SCRATCH, reg_i); - else - FMVD(SCRATCH, reg_i); - if (j_single) FMVS(reg_i, reg_j); - else - FMVD(reg_i, reg_j); - if (i_single) FMVS(reg_j, SCRATCH); - else + } else { + FMVD(SCRATCH, reg_i); + FMVD(reg_i, reg_j); FMVD(reg_j, SCRATCH); + } #undef SCRATCH tmp.v = cache->extcache[i].v; cache->extcache[i].v = cache->extcache[j].v;