From patchwork Tue May 14 04:32:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Rigby X-Patchwork-Id: 243591 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 B5CD52C00B8 for ; Tue, 14 May 2013 14:34:11 +1000 (EST) Received: from localhost ([::1]:36130 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uc6wD-0007LB-PS for incoming@patchwork.ozlabs.org; Tue, 14 May 2013 00:34:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uc6ve-0007Fg-II for qemu-devel@nongnu.org; Tue, 14 May 2013 00:33:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uc6vZ-0008EB-Ue for qemu-devel@nongnu.org; Tue, 14 May 2013 00:33:34 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:65450) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uc6vZ-0008Cv-PB for qemu-devel@nongnu.org; Tue, 14 May 2013 00:33:29 -0400 Received: by mail-pa0-f41.google.com with SMTP id rl6so156972pac.28 for ; Mon, 13 May 2013 21:33:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=MfzpJ+UFKw72/sOWodMhRMZWYJi+lfyQQjbZ5egaGHQ=; b=ew3JBGyVXyMSazmv8vP8RHNqmfpaIP9IkZoQ6WwgG9Jlpd3FSojjHpGL755hxKZ5qA p57Ma2VsrKy8qXifTZDGJo0efCZPoOCAgREAqwgpH9jnUXeil4vBawyHyRHQgfAXq7Qz a4cGzVNydqcdBg3Hca38Obz4d7dxyOsZlZSQawvvMRjaliJq2+HJuFlB4l7/Iklc88Jk HCMYBhD7V7sPoyq/PvZJgh1Ua2LUgqsVMifN4VFP0ozPR2iXzA0ogLhtCzAleXDY4ZrD 2mI7JdSFVVgUvaI6NkTl5YcBxLVcCsG7ADenCd3JGCRV4tkOwLnr6KsLXScxN5vUAHWQ SfGw== X-Received: by 10.66.253.132 with SMTP id aa4mr32216573pad.131.1368506009089; Mon, 13 May 2013 21:33:29 -0700 (PDT) Received: from localhost.localdomain (c-76-23-54-220.hsd1.ut.comcast.net. [76.23.54.220]) by mx.google.com with ESMTPSA id yj2sm12841472pbb.40.2013.05.13.21.33.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 May 2013 21:33:28 -0700 (PDT) From: John Rigby To: qemu-devel@nongnu.org Date: Mon, 13 May 2013 22:32:49 -0600 Message-Id: <1368505980-17151-2-git-send-email-john.rigby@linaro.org> X-Mailer: git-send-email 1.8.2.2 In-Reply-To: <1368505980-17151-1-git-send-email-john.rigby@linaro.org> References: <1368505980-17151-1-git-send-email-john.rigby@linaro.org> X-Gm-Message-State: ALoCoQnDr7IYTW3VcRbfS/oZCScVxkRa6S9QQlHvycJxRDR1wS4EMiY4/wA62LO4nxtar1QmYnJt X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.41 Cc: 'Peter Maydell , John Rigby , 'Alexander Graf , Paul Brook Subject: [Qemu-devel] [PATCH v4 01/12] ARM: Extract the disas struct to a header file 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 From: Alexander Graf We will need to share the disassembly status struct between AArch32 and AArch64 modes. So put it into a header file that both sides can use. Signed-off-by: Alexander Graf Signed-off-by: John Rigby --- target-arm/translate.c | 24 +----------------------- target-arm/translate.h | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 target-arm/translate.h diff --git a/target-arm/translate.c b/target-arm/translate.c index a1b7b8c..675773a 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -45,29 +45,7 @@ #define ARCH(x) do { if (!ENABLE_ARCH_##x) goto illegal_op; } while(0) -/* internal defines */ -typedef struct DisasContext { - target_ulong pc; - int is_jmp; - /* Nonzero if this instruction has been conditionally skipped. */ - int condjmp; - /* The label that will be jumped to when the instruction is skipped. */ - int condlabel; - /* Thumb-2 conditional execution bits. */ - int condexec_mask; - int condexec_cond; - struct TranslationBlock *tb; - int singlestep_enabled; - int thumb; - int bswap_code; -#if !defined(CONFIG_USER_ONLY) - int user; -#endif - int vfp_enabled; - int vec_len; - int vec_stride; -} DisasContext; - +#include "translate.h" static uint32_t gen_opc_condexec_bits[OPC_BUF_SIZE]; #if defined(CONFIG_USER_ONLY) diff --git a/target-arm/translate.h b/target-arm/translate.h new file mode 100644 index 0000000..e727bc6 --- /dev/null +++ b/target-arm/translate.h @@ -0,0 +1,27 @@ +#ifndef TARGET_ARM_TRANSLATE_H +#define TARGET_ARM_TRANSLATE_H + +/* internal defines */ +typedef struct DisasContext { + target_ulong pc; + int is_jmp; + /* Nonzero if this instruction has been conditionally skipped. */ + int condjmp; + /* The label that will be jumped to when the instruction is skipped. */ + int condlabel; + /* Thumb-2 conditional execution bits. */ + int condexec_mask; + int condexec_cond; + struct TranslationBlock *tb; + int singlestep_enabled; + int thumb; + int bswap_code; +#if !defined(CONFIG_USER_ONLY) + int user; +#endif + int vfp_enabled; + int vec_len; + int vec_stride; +} DisasContext; + +#endif /* TARGET_ARM_TRANSLATE_H */