From patchwork Tue Apr 26 18:18:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 566105 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp3862955map; Tue, 26 Apr 2022 12:04:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhuCjvItEGMqEw3HGxJYG/KtMltDb21BSyBiMOSpTyqaUeAZE5wLGwnIJM/uIZjS+OmH/Q X-Received: by 2002:a81:5bc5:0:b0:2d6:5659:73c2 with SMTP id p188-20020a815bc5000000b002d6565973c2mr24030009ywb.121.1650999875043; Tue, 26 Apr 2022 12:04:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650999875; cv=none; d=google.com; s=arc-20160816; b=OZDoqr039kMHZqlqyDXLXYivUyH6U1oMnNpr5FXkznRsxvpoLyGCPRSrgZO7RRcXeP xESHkD3yczELB61xML3gD5dwML2j+XUQdVz/AOoseQ5TekZCxG3o73kZE3HhOnDUTI1x +OC8+2PaaHW58x0VbZ3oKQFhaVQul1Ns7F7ISu2fNte4tl3UqBST3ozdiwQp+YvvWXf5 8yA/4gipwJrvd1ChyM/ZEqEZ03havGnnU9nJ612BGtlNCmgxp4VA6HesIftvKeC1yx7P Y0owNcGthlOmfc4Yu8Tee9AJaiff6gTt1JipMRxnHAKS95lcK00Hkc8YStxlBXZ6u6T8 kjug== 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=JGG1SeKnuAT2QHCjae7Ts/IpHjmxbOVPlNo/xG2utBk=; b=gmiOPbJnWmgvmUiWyUxq5WbgKoZzo/xzDwmwNwwnTCJmc2LbbXjRKSUVZm6Sviq1t+ J3wQThxuoI1YBb9eEOnikIIsE074RUvbmC4M9o+eD37VEOxtrl+UQN9JYdMh1gCkTcwX oWPJrES6Py2hqZYgynehxrWFzssKrkjCBEpcuwJ1rVLSB5vZ90lyZc+WPcykwMklhhfu xPoxABbMJtIaGWpEC4M2cmzk+/DsBvOB3BX3COMLMzBvoammVSusKun93COuyhrzR9W+ pQZ3q3pgkk9Iyu3bxxXw3pZ6NjEhz9rV3UIK6pxK3RXY1QFgxI0Mf/qHgtc5IHpyop8b 8oiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ODGBhfon; 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 i83-20020a256d56000000b006457ab3cf1bsi12210435ybc.316.2022.04.26.12.04.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Apr 2022 12:04:35 -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=ODGBhfon; 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]:33582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njQUE-00074A-Ia for patch@linaro.org; Tue, 26 Apr 2022 15:04:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njPmm-0002ha-3b for qemu-devel@nongnu.org; Tue, 26 Apr 2022 14:19:40 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:43922) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njPmk-0004S1-Cg for qemu-devel@nongnu.org; Tue, 26 Apr 2022 14:19:39 -0400 Received: by mail-pf1-x42d.google.com with SMTP id y14so17926428pfe.10 for ; Tue, 26 Apr 2022 11:19:37 -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=JGG1SeKnuAT2QHCjae7Ts/IpHjmxbOVPlNo/xG2utBk=; b=ODGBhfon5dy7laNbX5Rp5wJwZRhk99HNMMoCbizdxAmmtTiTNVmwVdzwcq/ih/djji +ieYo79vgnOsSz3i743swU14eceiaC2gdABczWS+hQMwQv6d3NP0eQwTvYRpYlddOak8 Wvh4V3Cbt2Im1OjhVBIeoYBZVO7YSjGI+1ALFk/C6c/MNCCTj81Q2xxxLVNcUVi23CFE Mf5SiNQ1YClKWwyUTLNw+8mUEhYVu5cuJN8+c4lXg6CKbG62D5Ocaez5qzB2J5zB0x9f 6L7KNxgA9NK1rNaxHmd/EtsxFEmWJFrj4S1fL5JC2z+C1PA4jXVZyzxznb0rkv+CLIZz AZGQ== 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=JGG1SeKnuAT2QHCjae7Ts/IpHjmxbOVPlNo/xG2utBk=; b=I75Y7xgDQ4i6lguOvEkLxEJUr7xm4uJT/XOm52GhHvl/dSsslHsyNWbjqPV8w2svyO EdWzMnaQbdngb5kbA9+2owXjEGamWfOZVTh9obzXTRStu1z0M1XeZ9x7cKtBMmXdKjjQ VNC1A+rAnc6slSTr3IXjfLBxxJgjqRfJTd7B9U1JIVwnBlhoPCv42lHojiR80+RuHDAC /f0ggnkxCy3Q6LD3tfpI4ly0YNCYSjo0sJ1PRYL91ebumRdvMKSblv6T2+o8vz9Sbkpe CQaASJiRllJXX446MMQkWwBhjlJurPZi2INkvHDLenwZ2SvMZ5+riXF2WHL9zTuEKotb g+3w== X-Gm-Message-State: AOAM533Cogv+A4woeITqB9UHDDidF4Hkjq1uqWBOZkpTOpGsGyjsuSZR w0AJmlmpjq4XUjYOBfqR4fWTgzchPSSzYQ== X-Received: by 2002:aa7:9109:0:b0:50a:78c8:8603 with SMTP id 9-20020aa79109000000b0050a78c88603mr25599642pfh.77.1650997176878; Tue, 26 Apr 2022 11:19:36 -0700 (PDT) Received: from stoup.. (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id j7-20020a056a00130700b004b9f7cd94a4sm16482827pfu.56.2022.04.26.11.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 11:19:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 31/68] target/nios2: Create EXCP_SEMIHOST for semi-hosting Date: Tue, 26 Apr 2022 11:18:30 -0700 Message-Id: <20220426181907.103691-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220426181907.103691-1-richard.henderson@linaro.org> References: <20220426181907.103691-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.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 Message-Id: <20220421151735.31996-32-richard.henderson@linaro.org> --- 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 65bcc5fc0e..01cead5502 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(),