From patchwork Sun Jun 25 10:24:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 780462 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wwSyZ0zD5z9rvt for ; Sun, 25 Jun 2017 20:26:13 +1000 (AEST) Received: from localhost ([::1]:41988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dP4k7-0001go-9n for incoming@patchwork.ozlabs.org; Sun, 25 Jun 2017 06:26:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dP4in-00014O-RD for qemu-devel@nongnu.org; Sun, 25 Jun 2017 06:24:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dP4ik-0002Cx-Me for qemu-devel@nongnu.org; Sun, 25 Jun 2017 06:24:49 -0400 Received: from roura.ac.upc.edu ([147.83.33.10]:47970 helo=roura.ac.upc.es) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dP4ik-0002CY-Ak; Sun, 25 Jun 2017 06:24:46 -0400 Received: from correu-1.ac.upc.es (correu-1.ac.upc.es [147.83.30.91]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id v5PAOiiF020696; Sun, 25 Jun 2017 12:24:44 +0200 Received: from localhost (unknown [132.68.53.125]) by correu-1.ac.upc.es (Postfix) with ESMTPSA id 1F7EA13E1; Sun, 25 Jun 2017 12:24:38 +0200 (CEST) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Sun, 25 Jun 2017 13:24:38 +0300 Message-Id: <149838627784.6497.8303638411162957700.stgit@frigg.lan> X-Mailer: git-send-email 2.11.0 In-Reply-To: <149838022308.6497.2104916050645246693.stgit@frigg.lan> References: <149838022308.6497.2104916050645246693.stgit@frigg.lan> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id v5PAOiiF020696 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy] X-Received-From: 147.83.33.10 Subject: [Qemu-devel] [PATCH v9 25/26] target: [tcg, arm] Port to disas_flags X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Peter Crosthwaite , "open list:ARM" , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Incrementally paves the way towards using the generic instruction translation loop. Signed-off-by: Lluís Vilanova --- target/arm/translate-a64.c | 10 +++++++++- target/arm/translate.c | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index b14e96cd58..97e8bda230 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -11389,6 +11389,13 @@ static void aarch64_trblock_tb_stop(DisasContextBase *db, CPUState *cpu) } } +static int aarch64_trblock_disas_flags(const DisasContextBase *db) +{ + DisasContext *dc = container_of(db, DisasContext, base); + + return 4 | (bswap_code(dc->sctlr_b) ? 2 : 0); +} + void gen_intermediate_code_a64(DisasContextBase *db, ARMCPU *cpu, TranslationBlock *tb) { @@ -11475,11 +11482,12 @@ done_generating: #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) && qemu_log_in_addr_range(db->pc_first)) { + int disas_flags = aarch64_trblock_disas_flags(db); qemu_log_lock(); qemu_log("----------------\n"); qemu_log("IN: %s\n", lookup_symbol(db->pc_first)); log_target_disas(cs, db->pc_first, dc->pc - db->pc_first, - 4 | (bswap_code(dc->sctlr_b) ? 2 : 0)); + disas_flags); qemu_log("\n"); qemu_log_unlock(); } diff --git a/target/arm/translate.c b/target/arm/translate.c index db31611258..d87328602a 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -12179,6 +12179,13 @@ static void arm_trblock_tb_stop(DisasContextBase *db, CPUState *cpu) } } +static int arm_trblock_disas_flags(const DisasContextBase *db) +{ + DisasContext *dc = container_of(db, DisasContext, base); + + return dc->thumb | (dc->sctlr_b << 1); +} + /* generate intermediate code for basic block 'tb'. */ void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb) { @@ -12274,11 +12281,12 @@ done_generating: #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) && qemu_log_in_addr_range(db->pc_first)) { + int disas_flags = arm_trblock_disas_flags(db); qemu_log_lock(); qemu_log("----------------\n"); qemu_log("IN: %s\n", lookup_symbol(db->pc_first)); log_target_disas(cpu, db->pc_first, dc->pc - db->pc_first, - dc->thumb | (dc->sctlr_b << 1)); + disas_flags); qemu_log("\n"); qemu_log_unlock(); }