From patchwork Wed Apr 3 10:32:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233347 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 5EF592C00AE for ; Wed, 3 Apr 2013 21:35:15 +1100 (EST) Received: from localhost ([::1]:32961 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNL29-00034N-H8 for incoming@patchwork.ozlabs.org; Wed, 03 Apr 2013 06:35:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNKzU-0000y3-G5 for qemu-devel@nongnu.org; Wed, 03 Apr 2013 06:32:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNKzN-0004Gr-Ay for qemu-devel@nongnu.org; Wed, 03 Apr 2013 06:32:28 -0400 Received: from mail-wg0-x229.google.com ([2a00:1450:400c:c00::229]:62064) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNKzM-0004GX-Ve for qemu-devel@nongnu.org; Wed, 03 Apr 2013 06:32:21 -0400 Received: by mail-wg0-f41.google.com with SMTP id y10so4057584wgg.0 for ; Wed, 03 Apr 2013 03:32:20 -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=OJdNUsv2j7Y3fu0TmSqHJiNghXfldhVjLlBFjeUypSE=; b=zCUZE1IREj4PBDsCMywB/KYitWEIqGx4JZAm11JbEfpr8nSdgzryhHJERg1GAkPNOS kFl/2Wj7EqyN8Mp8eo9T/krKk27t8/aQHT1CUwufR44bSahb8JGmHKRGOjr9QIIAmtIm NEDWEOoW+XMIb+6gOqAz74t/E/GkllL36xW88W0yxUjSBYUDDyQCV8YDDqxNoxOhfWwU sppdYFvYeEG9aXr19/Vsd0NAVYDwFj3FCzCc9BSeUKF6Sj8nWZ/C48cdeMDYIqTAjAwg 1llKChoxlO64Q2LdNhZSQFQS4CeYnbhk/z4f8B9DOktMHvp7STAakCNoKnP79bO9Jg3k e+Aw== X-Received: by 10.181.12.103 with SMTP id ep7mr21785811wid.12.1364985140281; Wed, 03 Apr 2013 03:32:20 -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.18 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 03 Apr 2013 03:32:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 3 Apr 2013 12:32:01 +0200 Message-Id: <1364985128-23772-4-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:c00::229 Cc: aurelien@aurel32.net, pmaydell@linaro.org Subject: [Qemu-devel] [PATCH v2 03/10] elfload: use tswapreg consistently in elf_core_copy_regs 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 Signed-off-by: Paolo Bonzini Reviewed-by: Peter Maydell --- linux-user/elfload.c | 114 +++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 9d5dbb8..bc2e9f1 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -297,25 +297,25 @@ typedef target_elf_greg_t target_elf_gregset_t[ELF_NREG]; static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUARMState *env) { - (*regs)[0] = tswapl(env->regs[0]); - (*regs)[1] = tswapl(env->regs[1]); - (*regs)[2] = tswapl(env->regs[2]); - (*regs)[3] = tswapl(env->regs[3]); - (*regs)[4] = tswapl(env->regs[4]); - (*regs)[5] = tswapl(env->regs[5]); - (*regs)[6] = tswapl(env->regs[6]); - (*regs)[7] = tswapl(env->regs[7]); - (*regs)[8] = tswapl(env->regs[8]); - (*regs)[9] = tswapl(env->regs[9]); - (*regs)[10] = tswapl(env->regs[10]); - (*regs)[11] = tswapl(env->regs[11]); - (*regs)[12] = tswapl(env->regs[12]); - (*regs)[13] = tswapl(env->regs[13]); - (*regs)[14] = tswapl(env->regs[14]); - (*regs)[15] = tswapl(env->regs[15]); - - (*regs)[16] = tswapl(cpsr_read((CPUARMState *)env)); - (*regs)[17] = tswapl(env->regs[0]); /* XXX */ + (*regs)[0] = tswapreg(env->regs[0]); + (*regs)[1] = tswapreg(env->regs[1]); + (*regs)[2] = tswapreg(env->regs[2]); + (*regs)[3] = tswapreg(env->regs[3]); + (*regs)[4] = tswapreg(env->regs[4]); + (*regs)[5] = tswapreg(env->regs[5]); + (*regs)[6] = tswapreg(env->regs[6]); + (*regs)[7] = tswapreg(env->regs[7]); + (*regs)[8] = tswapreg(env->regs[8]); + (*regs)[9] = tswapreg(env->regs[9]); + (*regs)[10] = tswapreg(env->regs[10]); + (*regs)[11] = tswapreg(env->regs[11]); + (*regs)[12] = tswapreg(env->regs[12]); + (*regs)[13] = tswapreg(env->regs[13]); + (*regs)[14] = tswapreg(env->regs[14]); + (*regs)[15] = tswapreg(env->regs[15]); + + (*regs)[16] = tswapreg(cpsr_read((CPUARMState *)env)); + (*regs)[17] = tswapreg(env->regs[0]); /* XXX */ } #define USE_ELF_CORE_DUMP @@ -681,19 +681,19 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUPPCState *en target_ulong ccr = 0; for (i = 0; i < ARRAY_SIZE(env->gpr); i++) { - (*regs)[i] = tswapl(env->gpr[i]); + (*regs)[i] = tswapreg(env->gpr[i]); } - (*regs)[32] = tswapl(env->nip); - (*regs)[33] = tswapl(env->msr); - (*regs)[35] = tswapl(env->ctr); - (*regs)[36] = tswapl(env->lr); - (*regs)[37] = tswapl(env->xer); + (*regs)[32] = tswapreg(env->nip); + (*regs)[33] = tswapreg(env->msr); + (*regs)[35] = tswapreg(env->ctr); + (*regs)[36] = tswapreg(env->lr); + (*regs)[37] = tswapreg(env->xer); for (i = 0; i < ARRAY_SIZE(env->crf); i++) { ccr |= env->crf[i] << (32 - ((i + 1) * 4)); } - (*regs)[38] = tswapl(ccr); + (*regs)[38] = tswapreg(ccr); } #define USE_ELF_CORE_DUMP @@ -801,11 +801,11 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUMBState *env int i, pos = 0; for (i = 0; i < 32; i++) { - (*regs)[pos++] = tswapl(env->regs[i]); + (*regs)[pos++] = tswapreg(env->regs[i]); } for (i = 0; i < 6; i++) { - (*regs)[pos++] = tswapl(env->sregs[i]); + (*regs)[pos++] = tswapreg(env->sregs[i]); } } @@ -841,11 +841,11 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs, int i; for (i = 0; i < 32; i++) { - (*regs)[i] = tswapl(env->gpr[i]); + (*regs)[i] = tswapreg(env->gpr[i]); } - (*regs)[32] = tswapl(env->pc); - (*regs)[33] = tswapl(env->sr); + (*regs)[32] = tswapreg(env->pc); + (*regs)[33] = tswapreg(env->sr); } #define ELF_HWCAP 0 #define ELF_PLATFORM NULL @@ -890,15 +890,15 @@ static inline void elf_core_copy_regs(target_elf_gregset_t *regs, int i; for (i = 0; i < 16; i++) { - (*regs[i]) = tswapl(env->gregs[i]); + (*regs[i]) = tswapreg(env->gregs[i]); } - (*regs)[TARGET_REG_PC] = tswapl(env->pc); - (*regs)[TARGET_REG_PR] = tswapl(env->pr); - (*regs)[TARGET_REG_SR] = tswapl(env->sr); - (*regs)[TARGET_REG_GBR] = tswapl(env->gbr); - (*regs)[TARGET_REG_MACH] = tswapl(env->mach); - (*regs)[TARGET_REG_MACL] = tswapl(env->macl); + (*regs)[TARGET_REG_PC] = tswapreg(env->pc); + (*regs)[TARGET_REG_PR] = tswapreg(env->pr); + (*regs)[TARGET_REG_SR] = tswapreg(env->sr); + (*regs)[TARGET_REG_GBR] = tswapreg(env->gbr); + (*regs)[TARGET_REG_MACH] = tswapreg(env->mach); + (*regs)[TARGET_REG_MACL] = tswapreg(env->macl); (*regs)[TARGET_REG_SYSCALL] = 0; /* FIXME */ } @@ -952,25 +952,25 @@ typedef target_elf_greg_t target_elf_gregset_t[ELF_NREG]; static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUM68KState *env) { - (*regs)[0] = tswapl(env->dregs[1]); - (*regs)[1] = tswapl(env->dregs[2]); - (*regs)[2] = tswapl(env->dregs[3]); - (*regs)[3] = tswapl(env->dregs[4]); - (*regs)[4] = tswapl(env->dregs[5]); - (*regs)[5] = tswapl(env->dregs[6]); - (*regs)[6] = tswapl(env->dregs[7]); - (*regs)[7] = tswapl(env->aregs[0]); - (*regs)[8] = tswapl(env->aregs[1]); - (*regs)[9] = tswapl(env->aregs[2]); - (*regs)[10] = tswapl(env->aregs[3]); - (*regs)[11] = tswapl(env->aregs[4]); - (*regs)[12] = tswapl(env->aregs[5]); - (*regs)[13] = tswapl(env->aregs[6]); - (*regs)[14] = tswapl(env->dregs[0]); - (*regs)[15] = tswapl(env->aregs[7]); - (*regs)[16] = tswapl(env->dregs[0]); /* FIXME: orig_d0 */ - (*regs)[17] = tswapl(env->sr); - (*regs)[18] = tswapl(env->pc); + (*regs)[0] = tswapreg(env->dregs[1]); + (*regs)[1] = tswapreg(env->dregs[2]); + (*regs)[2] = tswapreg(env->dregs[3]); + (*regs)[3] = tswapreg(env->dregs[4]); + (*regs)[4] = tswapreg(env->dregs[5]); + (*regs)[5] = tswapreg(env->dregs[6]); + (*regs)[6] = tswapreg(env->dregs[7]); + (*regs)[7] = tswapreg(env->aregs[0]); + (*regs)[8] = tswapreg(env->aregs[1]); + (*regs)[9] = tswapreg(env->aregs[2]); + (*regs)[10] = tswapreg(env->aregs[3]); + (*regs)[11] = tswapreg(env->aregs[4]); + (*regs)[12] = tswapreg(env->aregs[5]); + (*regs)[13] = tswapreg(env->aregs[6]); + (*regs)[14] = tswapreg(env->dregs[0]); + (*regs)[15] = tswapreg(env->aregs[7]); + (*regs)[16] = tswapreg(env->dregs[0]); /* FIXME: orig_d0 */ + (*regs)[17] = tswapreg(env->sr); + (*regs)[18] = tswapreg(env->pc); (*regs)[19] = 0; /* FIXME: regs->format | regs->vector */ }