From patchwork Wed Sep 6 16:06:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 111819 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp1131336qge; Wed, 6 Sep 2017 09:17:49 -0700 (PDT) X-Received: by 10.55.114.194 with SMTP id n185mr4608919qkc.180.1504714669901; Wed, 06 Sep 2017 09:17:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504714669; cv=none; d=google.com; s=arc-20160816; b=bIsEyDOsafq1cLHPey1h/Max8iMNdyHgqH1/Cgg20o+zbLkSaMP166r/55p18ZHhNv CXMIR1yxJfPC7Xcg53vxZsbu2bCM0gWZ/1LpJlZ8rMCQnVX5Jiduh3wZE17woFW9m1Gu V+lXutr0rSCUuTXTT0laXv2palN4m2xhZNMpwdDGdmkoDrgFVNZBUBcEuh15VYWGdJw/ GkPADN7L9jK5iDNdN+EeFyYWno8BRQIATNiqbydORzeEQeYB3dRq0HZ671XADYw3LXps Sc4hVhUYjb/pBqYbVihoBwzxKj3r1svGk1/dnVQ+4OVQwGuoDOpc29N6TyDJWB/QdIWt I+dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=Ih77dH1LlHs+t4aUfyHaKRK6r0XUJB+LahRMCCHcq1E=; b=Xf8q+T+vZ0EuE59BZgIXoYu7U1zCcAYdYH7aoAnWOMTlTKsW+PuUN6oYj3YvU31mHd 80r4F6Dg+lpA7BCECwiRSaC9BN4a6Ut+8hb6dH6ShguKp5ocXn8xeRwRCSD2JTV9Lv6a 3ayUArnb8tvqu97uRnmUpycFTKxKKS5xqto9xNFmUjNZ9oI96LKTeo+mVbqRGoEQnves P20FC6kik7GgfZaO0A0HzegtWGQHxiCRFVisCml7wCEsU0xf4TZY+8aNhiiQ5VX5R1xK 0OfbTuwCphptwA1vhXjHjfNh4d3CTMrPjTmgLE5ozfpIFIbkrVYHRyaWyGGmnIJQsQtj dvaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=diQlWe4j; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id n89si204014qkl.314.2017.09.06.09.17.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 06 Sep 2017 09:17:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=diQlWe4j; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpd1P-0001BR-Bh for patch@linaro.org; Wed, 06 Sep 2017 12:17:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpcqw-0000Yd-5F for qemu-devel@nongnu.org; Wed, 06 Sep 2017 12:07:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpcqr-0002z0-79 for qemu-devel@nongnu.org; Wed, 06 Sep 2017 12:06:58 -0400 Received: from mail-pf0-x231.google.com ([2607:f8b0:400e:c00::231]:35367) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dpcqq-0002tv-Ua for qemu-devel@nongnu.org; Wed, 06 Sep 2017 12:06:53 -0400 Received: by mail-pf0-x231.google.com with SMTP id g13so13484239pfm.2 for ; Wed, 06 Sep 2017 09:06:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ih77dH1LlHs+t4aUfyHaKRK6r0XUJB+LahRMCCHcq1E=; b=diQlWe4jN69bnvdHuAF59iYnA79GfQJH5EjXOdUNg9pzyABscHAsO4DYbKQbLEN2+l QMCMMZoA+CIw5eFhQzo6ejH19FCo2Eu4rWEaBWXB/AUKWg+dIwhiFA6ah5N/wZvsCVf9 ONTU4XJIleI02cUL61RuoMo+NOiv9iYhoPaW4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ih77dH1LlHs+t4aUfyHaKRK6r0XUJB+LahRMCCHcq1E=; b=pYx6adBfG3ZcohoUdybUwaEoRjwq/C9Kz4YqGIJc28w9+PDEtxGobrmKZ5H4d/W+4s C5b9bpKlqgs9MW8ylm/Aki43/4f3bIdIqkXcYDlgyUfGm6fr4OXrKqK1Cvmsb/SgxBMc WXWqV+AtYsafpITtO7ckQSMFWmvVYaFv38livSHpi87RiMJFfWo9bq3QP23eB0tLKp7I e4JPgKzS6NXZFYdz/qTIaxrwTwVAH+IroPQokAT8Ldz5WQD4MgNUX/3tj06KM7K14+Si 9HogqRgqmXUvMWw8sujA+knlA56OW+ZpaXeuDaIWKkJeTNfiaYUUpqrYDFAdwUSmvzG1 KXtg== X-Gm-Message-State: AHPjjUivmMVi+kmiGt5iishYz3efQbIxtC+O1n4ZgJ+8KFNSBdH4rtLi taxTHK+CFWiEoRbbxx3IMg== X-Google-Smtp-Source: ADKCNb4RtUgg2EYCldK5RVwd5zW93aOSbJMBK84ZsPmub8s4KJmtpQ0Ry0EqdBDKvpRQNPSqYuNRVA== X-Received: by 10.84.232.135 with SMTP id i7mr9160202plk.104.1504714011637; Wed, 06 Sep 2017 09:06:51 -0700 (PDT) Received: from bigtime.twiddle.net (97-126-108-236.tukw.qwest.net. [97.126.108.236]) by smtp.gmail.com with ESMTPSA id t65sm262863pfk.59.2017.09.06.09.06.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Sep 2017 09:06:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 6 Sep 2017 09:06:08 -0700 Message-Id: <20170906160612.22769-29-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170906160612.22769-1-richard.henderson@linaro.org> References: <20170906160612.22769-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::231 Subject: [Qemu-devel] [PULL 28/32] target/arm: [tcg] Port to generic translation framework 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@linaro.org, =?utf-8?q?Llu=C3=ADs_Vilanova?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Lluís Vilanova Tested-by: Emilio G. Cota Reviewed-by: Emilio G. Cota Signed-off-by: Lluís Vilanova Message-Id: <150002631325.22386.10348327185029496649.stgit@frigg.lan> Signed-off-by: Richard Henderson --- target/arm/translate.h | 8 +--- target/arm/translate-a64.c | 107 ++++++++------------------------------------ target/arm/translate.c | 109 +++++++++------------------------------------ 3 files changed, 41 insertions(+), 183 deletions(-) -- 2.13.5 diff --git a/target/arm/translate.h b/target/arm/translate.h index e8dcec51ac..55d691db40 100644 --- a/target/arm/translate.h +++ b/target/arm/translate.h @@ -150,21 +150,15 @@ static void disas_set_insn_syndrome(DisasContext *s, uint32_t syn) #ifdef TARGET_AARCH64 void a64_translate_init(void); -void gen_intermediate_code_a64(DisasContextBase *db, CPUState *cpu, - TranslationBlock *tb); void gen_a64_set_pc_im(uint64_t val); void aarch64_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, int flags); +extern const TranslatorOps aarch64_translator_ops; #else static inline void a64_translate_init(void) { } -static inline void gen_intermediate_code_a64(DisasContextBase *db, CPUState *cpu, - TranslationBlock *tb) -{ -} - static inline void gen_a64_set_pc_im(uint64_t val) { } diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 1973a36462..25c6622825 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -11262,6 +11262,11 @@ static int aarch64_tr_init_disas_context(DisasContextBase *dcbase, return max_insns; } +static void aarch64_tr_tb_start(DisasContextBase *db, CPUState *cpu) +{ + tcg_clear_temp_count(); +} + static void aarch64_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) { DisasContext *dc = container_of(dcbase, DisasContext, base); @@ -11325,6 +11330,7 @@ static void aarch64_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) } dc->base.pc_next = dc->pc; + translator_loop_temp_check(&dc->base); } static void aarch64_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) @@ -11391,6 +11397,9 @@ static void aarch64_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) break; } } + + /* Functions above can change dc->pc, so re-align db->pc_next */ + dc->base.pc_next = dc->pc; } static void aarch64_tr_disas_log(const DisasContextBase *dcbase, @@ -11403,92 +11412,12 @@ static void aarch64_tr_disas_log(const DisasContextBase *dcbase, 4 | (bswap_code(dc->sctlr_b) ? 2 : 0)); } -void gen_intermediate_code_a64(DisasContextBase *dcbase, CPUState *cs, - TranslationBlock *tb) -{ - DisasContext *dc = container_of(dcbase, DisasContext, base); - int max_insns; - - dc->base.tb = tb; - dc->base.pc_first = dc->base.tb->pc; - dc->base.pc_next = dc->base.pc_first; - dc->base.is_jmp = DISAS_NEXT; - dc->base.num_insns = 0; - dc->base.singlestep_enabled = cs->singlestep_enabled; - - max_insns = dc->base.tb->cflags & CF_COUNT_MASK; - if (max_insns == 0) { - max_insns = CF_COUNT_MASK; - } - if (max_insns > TCG_MAX_INSNS) { - max_insns = TCG_MAX_INSNS; - } - max_insns = aarch64_tr_init_disas_context(&dc->base, cs, max_insns); - - gen_tb_start(tb); - - tcg_clear_temp_count(); - - do { - dc->base.num_insns++; - aarch64_tr_insn_start(&dc->base, cs); - - if (unlikely(!QTAILQ_EMPTY(&cs->breakpoints))) { - CPUBreakpoint *bp; - QTAILQ_FOREACH(bp, &cs->breakpoints, entry) { - if (bp->pc == dc->base.pc_next) { - if (aarch64_tr_breakpoint_check(&dc->base, cs, bp)) { - break; - } - } - } - if (dc->base.is_jmp > DISAS_TOO_MANY) { - break; - } - } - - if (dc->base.num_insns == max_insns && (dc->base.tb->cflags & CF_LAST_IO)) { - gen_io_start(); - } - - aarch64_tr_translate_insn(&dc->base, cs); - - if (tcg_check_temp_count()) { - fprintf(stderr, "TCG temporary leak before "TARGET_FMT_lx"\n", - dc->pc); - } - - if (!dc->base.is_jmp && (tcg_op_buf_full() || cs->singlestep_enabled || - singlestep || dc->base.num_insns >= max_insns)) { - dc->base.is_jmp = DISAS_TOO_MANY; - } - - /* Translation stops when a conditional branch is encountered. - * Otherwise the subsequent code could get translated several times. - * Also stop translation when a page boundary is reached. This - * ensures prefetch aborts occur at the right place. - */ - } while (!dc->base.is_jmp); - - if (dc->base.tb->cflags & CF_LAST_IO) { - gen_io_end(); - } - - aarch64_tr_tb_stop(&dc->base, cs); - - gen_tb_end(tb, dc->base.num_insns); - - dc->base.tb->size = dc->pc - dc->base.pc_first; - dc->base.tb->icount = dc->base.num_insns; - -#ifdef DEBUG_DISAS - if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) && - qemu_log_in_addr_range(dc->base.pc_first)) { - qemu_log_lock(); - qemu_log("----------------\n"); - aarch64_tr_disas_log(&dc->base, cs); - qemu_log("\n"); - qemu_log_unlock(); - } -#endif -} +const TranslatorOps aarch64_translator_ops = { + .init_disas_context = aarch64_tr_init_disas_context, + .tb_start = aarch64_tr_tb_start, + .insn_start = aarch64_tr_insn_start, + .breakpoint_check = aarch64_tr_breakpoint_check, + .translate_insn = aarch64_tr_translate_insn, + .tb_stop = aarch64_tr_tb_stop, + .disas_log = aarch64_tr_disas_log, +}; diff --git a/target/arm/translate.c b/target/arm/translate.c index 2dca196e17..dabd5eb89a 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -11936,6 +11936,7 @@ static void arm_tr_tb_start(DisasContextBase *dcbase, CPUState *cpu) tcg_gen_movi_i32(tmp, 0); store_cpu_field(tmp, condexec_bits); } + tcg_clear_temp_count(); } static void arm_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) @@ -12055,6 +12056,7 @@ static void arm_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) } dc->base.pc_next = dc->pc; + translator_loop_temp_check(&dc->base); } static void arm_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) @@ -12169,6 +12171,9 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) gen_goto_tb(dc, 1, dc->pc); } } + + /* Functions above can change dc->pc, so re-align db->pc_next */ + dc->base.pc_next = dc->pc; } static void arm_tr_disas_log(const DisasContextBase *dcbase, CPUState *cpu) @@ -12180,99 +12185,29 @@ static void arm_tr_disas_log(const DisasContextBase *dcbase, CPUState *cpu) dc->thumb | (dc->sctlr_b << 1)); } +static const TranslatorOps arm_translator_ops = { + .init_disas_context = arm_tr_init_disas_context, + .tb_start = arm_tr_tb_start, + .insn_start = arm_tr_insn_start, + .breakpoint_check = arm_tr_breakpoint_check, + .translate_insn = arm_tr_translate_insn, + .tb_stop = arm_tr_tb_stop, + .disas_log = arm_tr_disas_log, +}; + /* generate intermediate code for basic block 'tb'. */ -void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) +void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb) { - DisasContext dc1, *dc = &dc1; - int max_insns; - - /* generate intermediate code */ + DisasContext dc; + const TranslatorOps *ops = &arm_translator_ops; - /* The A64 decoder has its own top level loop, because it doesn't need - * the A32/T32 complexity to do with conditional execution/IT blocks/etc. - */ +#ifdef TARGET_AARCH64 if (ARM_TBFLAG_AARCH64_STATE(tb->flags)) { - gen_intermediate_code_a64(&dc->base, cs, tb); - return; - } - - dc->base.tb = tb; - dc->base.pc_first = dc->base.tb->pc; - dc->base.pc_next = dc->base.pc_first; - dc->base.is_jmp = DISAS_NEXT; - dc->base.num_insns = 0; - dc->base.singlestep_enabled = cs->singlestep_enabled; - - max_insns = tb->cflags & CF_COUNT_MASK; - if (max_insns == 0) { - max_insns = CF_COUNT_MASK; - } - if (max_insns > TCG_MAX_INSNS) { - max_insns = TCG_MAX_INSNS; - } - max_insns = arm_tr_init_disas_context(&dc->base, cs, max_insns); - - gen_tb_start(tb); - - tcg_clear_temp_count(); - arm_tr_tb_start(&dc->base, cs); - - do { - dc->base.num_insns++; - arm_tr_insn_start(&dc->base, cs); - - if (unlikely(!QTAILQ_EMPTY(&cs->breakpoints))) { - CPUBreakpoint *bp; - QTAILQ_FOREACH(bp, &cs->breakpoints, entry) { - if (bp->pc == dc->base.pc_next) { - if (arm_tr_breakpoint_check(&dc->base, cs, bp)) { - break; - } - } - } - if (dc->base.is_jmp > DISAS_TOO_MANY) { - break; - } - } - - if (dc->base.num_insns == max_insns && (tb->cflags & CF_LAST_IO)) { - gen_io_start(); - } - - arm_tr_translate_insn(&dc->base, cs); - - if (tcg_check_temp_count()) { - fprintf(stderr, "TCG temporary leak before "TARGET_FMT_lx"\n", - dc->pc); - } - - if (!dc->base.is_jmp && (tcg_op_buf_full() || singlestep || - dc->base.num_insns >= max_insns)) { - dc->base.is_jmp = DISAS_TOO_MANY; - } - } while (!dc->base.is_jmp); - - if (dc->base.tb->cflags & CF_LAST_IO) { - gen_io_end(); - } - - arm_tr_tb_stop(&dc->base, cs); - - gen_tb_end(tb, dc->base.num_insns); - - tb->size = dc->pc - dc->base.pc_first; - tb->icount = dc->base.num_insns; - -#ifdef DEBUG_DISAS - if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) && - qemu_log_in_addr_range(dc->base.pc_first)) { - qemu_log_lock(); - qemu_log("----------------\n"); - arm_tr_disas_log(&dc->base, cs); - qemu_log("\n"); - qemu_log_unlock(); + ops = &aarch64_translator_ops; } #endif + + translator_loop(ops, &dc.base, cpu, tb); } static const char *cpu_mode_names[16] = {