From patchwork Thu Apr 21 15:17:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 564373 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp559141map; Thu, 21 Apr 2022 08:54:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7T5OPHnqfXiOG2wz+2KR1ecf+2IV+fKKmIENehNrx1AFS077xYtsnDaJ/AX0wHsytfs01 X-Received: by 2002:a25:7796:0:b0:645:7353:637a with SMTP id s144-20020a257796000000b006457353637amr335073ybc.446.1650556458613; Thu, 21 Apr 2022 08:54:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650556458; cv=none; d=google.com; s=arc-20160816; b=IyZo9nR7SeCLC/7rHStdn0dFjvvQQXXZfSnNvD0zy5DJXtHdwyw1TlRojihSNwn6p4 NZ4UMyzbmtjMk1guxaYncih7HBlQYqcJb8LRyuqbZkyb4PTnuvCc7/BUS/4VzarY6HrK 76jKgkj0z6BrOa9o87coKPJ9zdzPZl/oPFMdrAB9RhjJ7LFx8uCwkt23Pgh6H57RKocg fSFu5k0ITdnyLpihsdjPCjkUMLAQnqqoqqv15F25iNBm4vXKV1/xzqa2t/0wwvmOG5Sx wrzrXwOj+6cqT0/38Frw8a/fgj/E44ZPYd+A5IiI5PpOs0pM72ro6RtDu4wv/EbsIZEA /wgA== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=MKlth30hb0JDpCAkuU+AtSK9JdNhBrNjhcXkx0wo6j8=; b=MS7VAJbOP8Cu8Fz1EldTb71yLh7Zj/N7N8TIYj+vvPAY0aT0XPmlomJek5PJQF1aH/ D3C0V55WR1yYQjeQYXiBwrckUGvHn/QXVcjuQySCnogJC6EOmaaQsg6eUCcEi34+zkkp 01f1ANerE/6xGx7+2+cbm7EvOyBwgbxk12xeMzTZYFPjwO+/6IcTaMwUW99C93oKZyJk ta8WB14QZWKUC9OeRR4u49NjiOv40kn9/2rwLSj2BMtkbZQ3oIIUqQbMnzQZYeiMeBP3 zwCLZng1I5yS6rt4AfuBMJUIdYKGF8NKTjnGszhw67I4jLKbsONAan+yyGFc3/DHyIg3 iy+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kIBmr4o6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f4-20020a81c104000000b002ebc33a2bf7si2754461ywi.36.2022.04.21.08.54.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Apr 2022 08:54:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kIBmr4o6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhZ8M-0002bj-5w for patch@linaro.org; Thu, 21 Apr 2022 11:54:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhYZi-00087I-Nk for qemu-devel@nongnu.org; Thu, 21 Apr 2022 11:18:30 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]:42762) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhYZh-0006Lr-4c for qemu-devel@nongnu.org; Thu, 21 Apr 2022 11:18:30 -0400 Received: by mail-pf1-x435.google.com with SMTP id j17so5287412pfi.9 for ; Thu, 21 Apr 2022 08:18:28 -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=MKlth30hb0JDpCAkuU+AtSK9JdNhBrNjhcXkx0wo6j8=; b=kIBmr4o6br2U5i37kFg951yAk6ajch/nfb8+p7e5r+0e1jbFDgD6N1lVpF5D3mY2Xv MOppHgb0P4c4zPamoPp2fYLI0uHq0NQtGtb/oE+U46kl2mjtcyzoo3E1RlouE2XeMoaJ JfRzzt2aei+zeHSGySdL8pNiZmkFd1XswlflJKpuPYHp8Gym0UDOYpmEow0UdpVoBWrx 6UtmAYU0vQuZnNnHqc4ICrsSerp9cWPvyobO5IR0bgp1stmwl+2WfZtz2KnIuTXGitjb 42PY4XIzAJatNFuuUoGyzJN5L8ZfJzR8Qo3o+gd9g0CeLzzUZfGBG4X2A9lft/tDGW1+ Ls7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MKlth30hb0JDpCAkuU+AtSK9JdNhBrNjhcXkx0wo6j8=; b=wNtN09TF06BmVORVKCl61rmw2qB1WSiRxSY8ywQDZZ34YixyR9loeDWvtdx1GsMqVk Wf4Og2KN3GzUGxrRg4LoxPQOtYMM9q9om7UQG5L4zXDekeFUow3QAhxLn2o6eZTnS23H 7eMvkdjMS0zT0vXKwxxFg90wGy2YDZlNg98Jn/lXQmUKIKMg5Y7e/0Ysnstuo1+dji6O o7ob9avFWcRPrCVe4cBkjvQSaxF/I4agcDo8fFmUb+FpDLArwKaRw3yWLxDyIUrThU7O mLW9jkRVxZmipeUgR/01+xlUuEdI/Oz7i1KGDYOxdujpajEw4xcWVp+o2pdV0fShmil/ QLrA== X-Gm-Message-State: AOAM533Q73aJrzkGkRn7AOwGB0P5jcJJnwfVry7SoxTsjSBFI2Lxk8qc YeGRl7t14rl5Eua7p5RH2RYRC2PsnrHNMA== X-Received: by 2002:a63:d10d:0:b0:39c:d17a:7b08 with SMTP id k13-20020a63d10d000000b0039cd17a7b08mr24014360pgg.180.1650554306338; Thu, 21 Apr 2022 08:18:26 -0700 (PDT) Received: from stoup.. ([2607:fb90:80c8:6cf3:a91a:4957:ba18:ac18]) by smtp.gmail.com with ESMTPSA id z16-20020a056a00241000b004f3a647ae89sm24616248pfh.174.2022.04.21.08.18.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Apr 2022 08:18:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v7 31/64] target/nios2: Create EXCP_SEMIHOST for semi-hosting Date: Thu, 21 Apr 2022 08:17:02 -0700 Message-Id: <20220421151735.31996-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220421151735.31996-1-richard.henderson@linaro.org> References: <20220421151735.31996-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Decode 'break 1' during translation, rather than doing it again during exception processing. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/nios2/cpu.h | 1 + target/nios2/helper.c | 14 ++++++-------- target/nios2/translate.c | 17 ++++++++++++++++- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index 1998a16940..9e82100a1f 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -156,6 +156,7 @@ FIELD(CR_TLBMISC, EE, 24, 1) /* Exceptions */ #define EXCP_BREAK 0x1000 +#define EXCP_SEMIHOST 0x1001 #define EXCP_RESET 0 #define EXCP_PRESET 1 #define EXCP_IRQ 2 diff --git a/target/nios2/helper.c b/target/nios2/helper.c index a56aaaea18..1d17c0379f 100644 --- a/target/nios2/helper.c +++ b/target/nios2/helper.c @@ -152,14 +152,6 @@ void nios2_cpu_do_interrupt(CPUState *cs) case EXCP_BREAK: qemu_log_mask(CPU_LOG_INT, "BREAK exception at pc=%x\n", env->pc); - /* The semihosting instruction is "break 1". */ - if (semihosting_enabled() && - cpu_ldl_code(env, env->pc) == 0x003da07a) { - qemu_log_mask(CPU_LOG_INT, "Entering semihosting\n"); - env->pc += 4; - do_nios2_semihosting(env); - break; - } if ((env->ctrl[CR_STATUS] & CR_STATUS_EH) == 0) { env->ctrl[CR_BSTATUS] = env->ctrl[CR_STATUS]; @@ -176,6 +168,12 @@ void nios2_cpu_do_interrupt(CPUState *cs) env->pc = cpu->exception_addr; break; + case EXCP_SEMIHOST: + qemu_log_mask(CPU_LOG_INT, "BREAK semihosting at pc=%x\n", env->pc); + env->pc += 4; + do_nios2_semihosting(env); + break; + default: cpu_abort(cs, "unhandled exception type=%d\n", cs->exception_index); diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 4191db1342..97e531529f 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -33,6 +33,7 @@ #include "exec/translator.h" #include "qemu/qemu-print.h" #include "exec/gen-icount.h" +#include "semihosting/semihost.h" /* is_jmp field values */ #define DISAS_JUMP DISAS_TARGET_0 /* only pc was modified dynamically */ @@ -686,6 +687,20 @@ static void trap(DisasContext *dc, uint32_t code, uint32_t flags) t_gen_helper_raise_exception(dc, EXCP_TRAP); } +static void gen_break(DisasContext *dc, uint32_t code, uint32_t flags) +{ +#ifndef CONFIG_USER_ONLY + /* The semihosting instruction is "break 1". */ + R_TYPE(instr, code); + if (semihosting_enabled() && instr.imm5 == 1) { + t_gen_helper_raise_exception(dc, EXCP_SEMIHOST); + return; + } +#endif + + t_gen_helper_raise_exception(dc, EXCP_BREAK); +} + static const Nios2Instruction r_type_instructions[] = { INSTRUCTION_ILLEGAL(), INSTRUCTION(eret), /* eret */ @@ -739,7 +754,7 @@ static const Nios2Instruction r_type_instructions[] = { INSTRUCTION(add), /* add */ INSTRUCTION_ILLEGAL(), INSTRUCTION_ILLEGAL(), - INSTRUCTION_FLG(gen_excp, EXCP_BREAK), /* break */ + INSTRUCTION(gen_break), /* break */ INSTRUCTION_ILLEGAL(), INSTRUCTION(nop), /* nop */ INSTRUCTION_ILLEGAL(),