From nobody Tue Dec 16 05:37:43 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15199455413601023.576064204841; Thu, 1 Mar 2018 15:05:41 -0800 (PST) Received: from localhost ([::1]:59692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erXGZ-0000PQ-75 for importer@patchew.org; Thu, 01 Mar 2018 18:05:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erX5U-0000Ji-Ax for qemu-devel@nongnu.org; Thu, 01 Mar 2018 17:54:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erX5O-0004s4-RA for qemu-devel@nongnu.org; Thu, 01 Mar 2018 17:54:08 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:56947) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1erX5O-0004qx-Gw; Thu, 01 Mar 2018 17:54:02 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id A8F0221127; Thu, 1 Mar 2018 17:54:01 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Thu, 01 Mar 2018 17:54:01 -0500 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 706887E46B; Thu, 1 Mar 2018 17:54:01 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=XSdHTNWHCiXDcS 5wXJhxEZgeGZ9upzg1uONymCOEHhA=; b=R1u/XeMqtgetxMwZA7rl872m8ZrqoE 85vN2De+O+wC5TqzjuMRM93lBk30MfsiLXRwkooCHb8w9awpfX2ixJh4xCES2asL quyJJXYJ0zbsdtvIgnj4NVlB7BjcKsevSUCugmdesOVJi2At+qxgf+JbBVeLPI7Y of1CztPfRyDFM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=XSdHTNWHCiXDcS5wXJhxEZgeGZ9upzg1uONymCOEHhA=; b=GEW38vjE 4UAAeTAFBRaOhMfSGsac5czun9+BvZCxNAdPlqT9ulZRVm/auCeRk/LW82uizQXt hyTCwcDiN7/CpHIJfWo6JoxdCcSTFDUQ3lmMuNzSeOuX7iMXQHARKqRJNNaHkFno JIG/ZEWiZV+3+oZiWFc2FDySLFh9k1ahCoK6O2tm7+1cYtKcxBIRYDmhWLZomqWV VswjaSmtifS8HBurUrX8adFRnKWZbzOKcbs3shD4X23OZqPSiTHxtfJXwguIC32t zAfC4NCAxCNE/8S8arEGFUpI9aYfI/O2Vii4DyhcuwzkzCBLSAR1WlUarL710kRN X4FOE07aYsKxuQ== X-ME-Sender: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Thu, 1 Mar 2018 17:53:56 -0500 Message-Id: <1519944838-12430-13-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519944838-12430-1-git-send-email-cota@braap.org> References: <1519944838-12430-1-git-send-email-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.29 Subject: [Qemu-devel] [PATCHv1 12/14] target/s390x: convert to TranslatorOps 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: qemu-s390x@nongnu.org, Cornelia Huck , Richard Henderson , Alexander Graf , David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Note: I looked into dropping dc->do_debug. However, I don't see an easy way to do it given that TOO_MANY is also valid when we just translate more than max_insns. Thus, the check for do_debug in "case DISAS_PC_CC_UPDATED" would still need additional state to know whether or not we came from breakpoint_check. Cc: David Hildenbrand Cc: Cornelia Huck Cc: Alexander Graf Cc: qemu-s390x@nongnu.org Signed-off-by: Emilio G. Cota Acked-by: Cornelia Huck Reviewed-by: David Hildenbrand --- target/s390x/translate.c | 162 +++++++++++++++++++++++--------------------= ---- 1 file changed, 80 insertions(+), 82 deletions(-) diff --git a/target/s390x/translate.c b/target/s390x/translate.c index c83a57f..097009e 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -64,6 +64,7 @@ struct DisasContext { uint64_t pc_tmp; uint32_t ilen; enum cc_op cc_op; + bool do_debug; }; =20 /* Information carried about a condition to be evaluated. */ @@ -6113,98 +6114,87 @@ static DisasJumpType translate_one(CPUS390XState *e= nv, DisasContext *s) return ret; } =20 -void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) +static void s390x_tr_init_disas_context(DisasContextBase *dcbase, CPUState= *cs) { - CPUS390XState *env =3D cs->env_ptr; - DisasContext dc; - uint64_t next_page_start; - int num_insns, max_insns; - DisasJumpType status; - bool do_debug; + DisasContext *dc =3D container_of(dcbase, DisasContext, base); =20 - dc.base.pc_first =3D tb->pc; /* 31-bit mode */ - if (!(tb->flags & FLAG_MASK_64)) { - dc.base.pc_first &=3D 0x7fffffff; + if (!(dc->base.tb->flags & FLAG_MASK_64)) { + dc->base.pc_first &=3D 0x7fffffff; + dc->base.pc_next =3D dc->base.pc_first; } - dc.base.pc_next =3D dc.base.pc_first; - dc.base.tb =3D tb; - dc.base.singlestep_enabled =3D cs->singlestep_enabled; =20 - dc.cc_op =3D CC_OP_DYNAMIC; - dc.ex_value =3D dc.base.tb->cs_base; - do_debug =3D cs->singlestep_enabled; + dc->cc_op =3D CC_OP_DYNAMIC; + dc->ex_value =3D dc->base.tb->cs_base; + dc->do_debug =3D dc->base.singlestep_enabled; +} =20 - next_page_start =3D (dc.base.pc_first & TARGET_PAGE_MASK) + TARGET_PAG= E_SIZE; +static void s390x_tr_tb_start(DisasContextBase *db, CPUState *cs) +{ +} =20 - num_insns =3D 0; - max_insns =3D tb_cflags(tb) & CF_COUNT_MASK; - if (max_insns =3D=3D 0) { - max_insns =3D CF_COUNT_MASK; - } - if (max_insns > TCG_MAX_INSNS) { - max_insns =3D TCG_MAX_INSNS; - } +static void s390x_tr_insn_start(DisasContextBase *dcbase, CPUState *cs) +{ + DisasContext *dc =3D container_of(dcbase, DisasContext, base); =20 - gen_tb_start(tb); + tcg_gen_insn_start(dc->base.pc_next, dc->cc_op); +} =20 - do { - tcg_gen_insn_start(dc.base.pc_next, dc.cc_op); - num_insns++; +static bool s390x_tr_breakpoint_check(DisasContextBase *dcbase, CPUState *= cs, + const CPUBreakpoint *bp) +{ + DisasContext *dc =3D container_of(dcbase, DisasContext, base); =20 - if (unlikely(cpu_breakpoint_test(cs, dc.base.pc_next, BP_ANY))) { - status =3D DISAS_PC_STALE; - do_debug =3D true; - /* The address covered by the breakpoint must be included in - [tb->pc, tb->pc + tb->size) in order to for it to be - properly cleared -- thus we increment the PC here so that - the logic setting tb->size below does the right thing. */ - dc.base.pc_next +=3D 2; - break; - } + dc->base.is_jmp =3D DISAS_PC_STALE; + dc->do_debug =3D true; + /* The address covered by the breakpoint must be included in + [tb->pc, tb->pc + tb->size) in order to for it to be + properly cleared -- thus we increment the PC here so that + the logic setting tb->size below does the right thing. */ + dc->base.pc_next +=3D 2; + return true; +} =20 - if (num_insns =3D=3D max_insns && (tb_cflags(tb) & CF_LAST_IO)) { - gen_io_start(); - } +static void s390x_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) +{ + CPUS390XState *env =3D cs->env_ptr; + DisasContext *dc =3D container_of(dcbase, DisasContext, base); =20 - status =3D translate_one(env, &dc); - - /* If we reach a page boundary, are single stepping, - or exhaust instruction count, stop generation. */ - if (status =3D=3D DISAS_NEXT - && (dc.base.pc_next >=3D next_page_start - || tcg_op_buf_full() - || num_insns >=3D max_insns - || singlestep - || dc.base.singlestep_enabled - || dc.ex_value)) { - status =3D DISAS_TOO_MANY; - } - } while (status =3D=3D DISAS_NEXT); + dc->base.is_jmp =3D translate_one(env, dc); + if (dc->base.is_jmp =3D=3D DISAS_NEXT) { + uint64_t next_page; =20 - if (tb_cflags(tb) & CF_LAST_IO) { - gen_io_end(); + next_page =3D (dc->base.pc_first & TARGET_PAGE_MASK) + TARGET_PAGE= _SIZE; + if (dc->base.pc_next >=3D next_page || dc->ex_value) { + dc->base.is_jmp =3D DISAS_TOO_MANY; + } } +} + +static void s390x_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) +{ + DisasContext *dc =3D container_of(dcbase, DisasContext, base); =20 - switch (status) { + switch (dc->base.is_jmp) { case DISAS_GOTO_TB: case DISAS_NORETURN: break; case DISAS_TOO_MANY: case DISAS_PC_STALE: case DISAS_PC_STALE_NOCHAIN: - update_psw_addr(&dc); + update_psw_addr(dc); /* FALLTHRU */ case DISAS_PC_UPDATED: /* Next TB starts off with CC_OP_DYNAMIC, so make sure the cc op type is in env */ - update_cc_op(&dc); + update_cc_op(dc); /* FALLTHRU */ case DISAS_PC_CC_UPDATED: /* Exit the TB, either by raising a debug exception or by return. = */ - if (do_debug) { + if (dc->do_debug) { gen_exception(EXCP_DEBUG); - } else if (use_exit_tb(&dc) || status =3D=3D DISAS_PC_STALE_NOCHAI= N) { + } else if (use_exit_tb(dc) || + dc->base.is_jmp =3D=3D DISAS_PC_STALE_NOCHAIN) { tcg_gen_exit_tb(0); } else { tcg_gen_lookup_and_goto_ptr(); @@ -6213,28 +6203,36 @@ void gen_intermediate_code(CPUState *cs, struct Tra= nslationBlock *tb) default: g_assert_not_reached(); } +} =20 - gen_tb_end(tb, num_insns); - - tb->size =3D dc.base.pc_next - dc.base.pc_first; - tb->icount =3D num_insns; +static void s390x_tr_disas_log(const DisasContextBase *dcbase, CPUState *c= s) +{ + DisasContext *dc =3D container_of(dcbase, DisasContext, base); =20 -#if defined(S390X_DEBUG_DISAS) - if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM) - && qemu_log_in_addr_range(dc.base.pc_first)) { - qemu_log_lock(); - if (unlikely(dc.ex_value)) { - /* ??? Unfortunately log_target_disas can't use host memory. = */ - qemu_log("IN: EXECUTE %016" PRIx64 "\n", dc.ex_value); - } else { - qemu_log("IN: %s\n", lookup_symbol(dc.base.pc_first)); - log_target_disas(cs, dc.base.pc_first, - dc.base.pc_next - dc.base.pc_first); - qemu_log("\n"); - } - qemu_log_unlock(); + if (unlikely(dc->ex_value)) { + /* ??? Unfortunately log_target_disas can't use host memory. */ + qemu_log("IN: EXECUTE %016" PRIx64, dc->ex_value); + } else { + qemu_log("IN: %s\n", lookup_symbol(dc->base.pc_first)); + log_target_disas(cs, dc->base.pc_first, dc->base.tb->size); } -#endif +} + +static const TranslatorOps s390x_tr_ops =3D { + .init_disas_context =3D s390x_tr_init_disas_context, + .tb_start =3D s390x_tr_tb_start, + .insn_start =3D s390x_tr_insn_start, + .breakpoint_check =3D s390x_tr_breakpoint_check, + .translate_insn =3D s390x_tr_translate_insn, + .tb_stop =3D s390x_tr_tb_stop, + .disas_log =3D s390x_tr_disas_log, +}; + +void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) +{ + DisasContext dc; + + translator_loop(&s390x_tr_ops, &dc.base, cs, tb); } =20 void restore_state_to_opc(CPUS390XState *env, TranslationBlock *tb, --=20 2.7.4