From patchwork Wed Apr 3 10:32:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233400 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 167782C0090 for ; Wed, 3 Apr 2013 22:05:46 +1100 (EST) Received: from localhost ([::1]:37201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNL3h-0005R0-Lo for incoming@patchwork.ozlabs.org; Wed, 03 Apr 2013 06:36:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNKzU-0000yL-T8 for qemu-devel@nongnu.org; Wed, 03 Apr 2013 06:32:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNKzP-0004Hq-Hi for qemu-devel@nongnu.org; Wed, 03 Apr 2013 06:32:28 -0400 Received: from mail-we0-x22f.google.com ([2a00:1450:400c:c03::22f]:45815) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNKzP-0004HC-BP for qemu-devel@nongnu.org; Wed, 03 Apr 2013 06:32:23 -0400 Received: by mail-we0-f175.google.com with SMTP id t11so1053768wey.20 for ; Wed, 03 Apr 2013 03:32:22 -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=D9aQFi8WFWse1AR91P2NYzXJvAy4XzlzP3qlGyeEVrA=; b=jDjxmQlJY5ObKhfOsnKUz8AkA8ZtjsbqEmSt29KOP4YDQts2RDODSAHp2ViAV005Gz UVDgL1mUaghFPZj6tpIkpos3dx37YRyGuEU6Cdna5YxshF7EXgoInfZFIKbTamgsp0G6 BgfY/n+/JVVo2Ujm+2D6ZdTGeUJlzfqZZyURCWxQVyWFNFFPjUH8rOwUBnMSXEBGYpSN x0pbAq/7f+pBg4ie69Kg4aMcQ/h3jU5I0RtKI+54obwVXkpTk9eIxDJCKL5jLlB7NBx2 Dcxum6CDZIdcDM5n0aO86MYVG6FJjjkbu9FSUO3B/2rQRrZO7iSvUlZ6/sYSY5B6sHf7 ZKJA== X-Received: by 10.194.71.110 with SMTP id t14mr1824259wju.53.1364985142587; Wed, 03 Apr 2013 03:32:22 -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.20 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 03 Apr 2013 03:32:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 3 Apr 2013 12:32:02 +0200 Message-Id: <1364985128-23772-5-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:c03::22f Cc: aurelien@aurel32.net, pmaydell@linaro.org Subject: [Qemu-devel] [PATCH v2 04/10] elfload: use abi_short/ushort instead of target_short/ushort 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 The alignment is a characteristic of the ABI, not the CPU. Signed-off-by: Paolo Bonzini Reviewed-by: Peter Maydell --- configure | 2 -- include/exec/cpu-defs.h | 2 -- include/exec/user/abitypes.h | 7 +++++++ linux-user/elfload.c | 6 +++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 437baa8..68314d1 100755 --- a/configure +++ b/configure @@ -4011,7 +4011,6 @@ bflt="no" target_nptl="no" interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"` gdb_xml_files="" -target_short_alignment=2 target_int_alignment=4 target_long_alignment=4 target_llong_alignment=8 @@ -4154,7 +4153,6 @@ case "$cpu" in ;; esac -echo "TARGET_SHORT_ALIGNMENT=$target_short_alignment" >> $config_target_mak echo "TARGET_INT_ALIGNMENT=$target_int_alignment" >> $config_target_mak echo "TARGET_LONG_ALIGNMENT=$target_long_alignment" >> $config_target_mak echo "TARGET_LLONG_ALIGNMENT=$target_llong_alignment" >> $config_target_mak diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index 0ae967a..d376f0f 100644 --- a/include/exec/cpu-defs.h +++ b/include/exec/cpu-defs.h @@ -36,8 +36,6 @@ #define TARGET_LONG_SIZE (TARGET_LONG_BITS / 8) -typedef int16_t target_short __attribute__ ((aligned(TARGET_SHORT_ALIGNMENT))); -typedef uint16_t target_ushort __attribute__((aligned(TARGET_SHORT_ALIGNMENT))); typedef int32_t target_int __attribute__((aligned(TARGET_INT_ALIGNMENT))); typedef uint32_t target_uint __attribute__((aligned(TARGET_INT_ALIGNMENT))); typedef int64_t target_llong __attribute__((aligned(TARGET_LLONG_ALIGNMENT))); diff --git a/include/exec/user/abitypes.h b/include/exec/user/abitypes.h index fe7f662..abaa028 100644 --- a/include/exec/user/abitypes.h +++ b/include/exec/user/abitypes.h @@ -2,6 +2,13 @@ #define QEMU_TYPES_H #include "cpu.h" +#ifndef ABI_SHORT_ALIGNMENT +#define ABI_SHORT_ALIGNMENT 2 +#endif + +typedef int16_t abi_short __attribute__ ((aligned(ABI_SHORT_ALIGNMENT))); +typedef uint16_t abi_ushort __attribute__((aligned(ABI_SHORT_ALIGNMENT))); + #ifdef TARGET_ABI32 typedef uint32_t abi_ulong; typedef int32_t abi_long; diff --git a/linux-user/elfload.c b/linux-user/elfload.c index bc2e9f1..5eca934 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -110,8 +110,8 @@ typedef abi_ulong target_elf_greg_t; #endif #ifdef USE_UID16 -typedef target_ushort target_uid_t; -typedef target_ushort target_gid_t; +typedef abi_ushort target_uid_t; +typedef abi_ushort target_gid_t; #else typedef target_uint target_uid_t; typedef target_uint target_gid_t; @@ -2116,7 +2116,7 @@ struct target_elf_siginfo { struct target_elf_prstatus { struct target_elf_siginfo pr_info; /* Info associated with signal */ - target_short pr_cursig; /* Current signal */ + abi_short pr_cursig; /* Current signal */ abi_ulong pr_sigpend; /* XXX */ abi_ulong pr_sighold; /* XXX */ target_pid_t pr_pid;