From patchwork Wed Apr 3 10:32:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233345 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D41592C009E for ; Wed, 3 Apr 2013 21:33:04 +1100 (EST) Received: from localhost ([::1]:57431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNL03-0000y4-0n for incoming@patchwork.ozlabs.org; Wed, 03 Apr 2013 06:33:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNKzM-0000nx-Mz for qemu-devel@nongnu.org; Wed, 03 Apr 2013 06:32:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNKzL-0004GH-0d for qemu-devel@nongnu.org; Wed, 03 Apr 2013 06:32:20 -0400 Received: from mail-wi0-x235.google.com ([2a00:1450:400c:c05::235]:35304) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNKzK-0004G3-QC for qemu-devel@nongnu.org; Wed, 03 Apr 2013 06:32:18 -0400 Received: by mail-wi0-f181.google.com with SMTP id hj8so1345952wib.14 for ; Wed, 03 Apr 2013 03:32:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=/TYuN/t3H0/vxr8Bx2GvqvIVK7mDACy8986tbdOEjLs=; b=rZDuHp1A03qE1u+p6XZhAr7tBwpQr8nbtoswv5jaEor8ht2kfebhUkwndDMqaLNy3h SG3n2znkRMtkNncmCL651uGfOzzv2VGm9NfgixcujwiYuxb+iKfsxem4bewaCpFoEgVJ 0opS45ArhZJY/dMHlRx3KCmurYdim1b64oz3sjCSfMauJM8xEk8MPUjjzKZbs3LJfvxQ fzRQnzME/6eG/BGq4GC/Y/F17VccOPitBsHmmBpH0KYugk3JEm83NbiHQEOE/U5rA5rr N9cWmfwNzFeqz5NP6nJ86B3tNybgQM+LySJiWcbPMta4i8/fX8gHJLXa6acDhVEnqpmq X3QQ== X-Received: by 10.180.72.165 with SMTP id e5mr21766742wiv.7.1364985138121; Wed, 03 Apr 2013 03:32:18 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id dm9sm24010369wib.3.2013.04.03.03.32.16 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 03 Apr 2013 03:32:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 3 Apr 2013 12:32:00 +0200 Message-Id: <1364985128-23772-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1364985128-23772-1-git-send-email-pbonzini@redhat.com> References: <1364985128-23772-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::235 Cc: aurelien@aurel32.net, pmaydell@linaro.org Subject: [Qemu-devel] [PATCH v2 02/10] elfload: fix size of registers for N32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Registers are 64-bit in size for the MIPS n32 ABI. Define target_elf_greg_t accordingly, and use the correct function to do endian swaps. Signed-off-by: Paolo Bonzini Reviewed-by: Peter Maydell --- linux-user/elfload.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index d3589ff..9d5dbb8 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -101,7 +101,14 @@ enum { #define ELF_DATA ELFDATA2LSB #endif +#ifdef TARGET_ABI_MIPSN32 typedef target_ulong target_elf_greg_t; +#define tswapreg(ptr) tswapl(ptr) +#else +typedef abi_ulong target_elf_greg_t; +#define tswapreg(ptr) tswapal(ptr) +#endif + #ifdef USE_UID16 typedef target_ushort target_uid_t; typedef target_ushort target_gid_t; @@ -747,17 +754,17 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUMIPSState *e (*regs)[TARGET_EF_R0] = 0; for (i = 1; i < ARRAY_SIZE(env->active_tc.gpr); i++) { - (*regs)[TARGET_EF_R0 + i] = tswapl(env->active_tc.gpr[i]); + (*regs)[TARGET_EF_R0 + i] = tswapreg(env->active_tc.gpr[i]); } (*regs)[TARGET_EF_R26] = 0; (*regs)[TARGET_EF_R27] = 0; - (*regs)[TARGET_EF_LO] = tswapl(env->active_tc.LO[0]); - (*regs)[TARGET_EF_HI] = tswapl(env->active_tc.HI[0]); - (*regs)[TARGET_EF_CP0_EPC] = tswapl(env->active_tc.PC); - (*regs)[TARGET_EF_CP0_BADVADDR] = tswapl(env->CP0_BadVAddr); - (*regs)[TARGET_EF_CP0_STATUS] = tswapl(env->CP0_Status); - (*regs)[TARGET_EF_CP0_CAUSE] = tswapl(env->CP0_Cause); + (*regs)[TARGET_EF_LO] = tswapreg(env->active_tc.LO[0]); + (*regs)[TARGET_EF_HI] = tswapreg(env->active_tc.HI[0]); + (*regs)[TARGET_EF_CP0_EPC] = tswapreg(env->active_tc.PC); + (*regs)[TARGET_EF_CP0_BADVADDR] = tswapreg(env->CP0_BadVAddr); + (*regs)[TARGET_EF_CP0_STATUS] = tswapreg(env->CP0_Status); + (*regs)[TARGET_EF_CP0_CAUSE] = tswapreg(env->CP0_Cause); } #define USE_ELF_CORE_DUMP