From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqdac-0008RA-UH for qemu-devel@nongnu.org; Thu, 14 Apr 2016 05:29:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aqdaa-0007z8-9o for qemu-devel@nongnu.org; Thu, 14 Apr 2016 05:29:30 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:34513) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqdaa-0007yy-2n for qemu-devel@nongnu.org; Thu, 14 Apr 2016 05:29:28 -0400 Received: by mail-wm0-x243.google.com with SMTP id n3so21100503wmn.1 for ; Thu, 14 Apr 2016 02:29:27 -0700 (PDT) From: Artyom Tarasenko Date: Thu, 14 Apr 2016 11:29:15 +0200 Message-Id: Subject: [Qemu-devel] [PATCH 1/2 for-2.6] target-sparc: fix Nucleus quad LDD 128 bit access for windowed registers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk, rth@twiddle.net, Artyom Tarasenko Fix register offset calculation when regwptr is used. Signed-off-by: Artyom Tarasenko --- target-sparc/ldst_helper.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c index 2b0221c..a383074 100644 --- a/target-sparc/ldst_helper.c +++ b/target-sparc/ldst_helper.c @@ -2059,11 +2059,11 @@ void helper_ldda_asi(CPUSPARCState *env, target_ulong addr, int asi, int rd) bswap64s(&env->gregs[rd + 1]); } } else { - env->regwptr[rd] = cpu_ldq_nucleus(env, addr); - env->regwptr[rd + 1] = cpu_ldq_nucleus(env, addr + 8); + env->regwptr[rd - 8] = cpu_ldq_nucleus(env, addr); + env->regwptr[rd + 1 - 8] = cpu_ldq_nucleus(env, addr + 8); if (asi == 0x2c) { - bswap64s(&env->regwptr[rd]); - bswap64s(&env->regwptr[rd + 1]); + bswap64s(&env->regwptr[rd - 8]); + bswap64s(&env->regwptr[rd + 1 - 8]); } } break; @@ -2076,8 +2076,8 @@ void helper_ldda_asi(CPUSPARCState *env, target_ulong addr, int asi, int rd) env->gregs[rd] = helper_ld_asi(env, addr, asi, 4, 0); env->gregs[rd + 1] = helper_ld_asi(env, addr + 4, asi, 4, 0); } else { - env->regwptr[rd] = helper_ld_asi(env, addr, asi, 4, 0); - env->regwptr[rd + 1] = helper_ld_asi(env, addr + 4, asi, 4, 0); + env->regwptr[rd - 8] = helper_ld_asi(env, addr, asi, 4, 0); + env->regwptr[rd + 1 - 8] = helper_ld_asi(env, addr + 4, asi, 4, 0); } break; } -- 1.8.3.1