From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by sourceware.org (Postfix) with ESMTPS id 7BA8D3896C30 for ; Sat, 17 Apr 2021 17:58:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7BA8D3896C30 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=jimw@sifive.com Received: by mail-pl1-x62b.google.com with SMTP id u15so7058369plf.10 for ; Sat, 17 Apr 2021 10:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qG4/Q5XoH4oTG4sI8JPkOQBKSlLespFgJCXeqjmDAdA=; b=iujbvdbIRPmaxVjKRGf9V3clTQivGsWBjfIoP3Yeqv5RqtgXVdZqZUlcnetC5ocG4J dlyPgeQjHPl1udke+hFBaFH2Wm5M/sJf5DQQg/pYIkmktj8jcZ1yFL8cq805y3eQiB8o keIovE16G9f0xFjjGwF71zTQpDC81RrwQozzXPwWDcRudEGoKsrORyB/m5SWZ+kC6pld mlGiWnb2DAoMaoxGoI2dJF23B19xVvvBPbYvfaDkESaL/jzJZZ0NE/VYKW9tm+lrP+nm 73VKIEzvz06g6W/doAdzaT6nUIXMhsNq28rAaXzP/Hjerl4b2CjGIkpiH7XnbqIWnF6l fXGQ== 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; bh=qG4/Q5XoH4oTG4sI8JPkOQBKSlLespFgJCXeqjmDAdA=; b=aM5ElQYJNFqeMI8sC7wlPmiNAt5WfCYd3w+N5qT9IgzQP2JvrX4QjQnKWaRLahJSpH RDoDr6sukwSxqCnzIDH3nr+rEdYpoSjSu5+yMajOUMgFWRuydfURFoL4iKZUABLFElE2 MligGAhPHXHtEcbifLRh0A6Czp+mLQ205EAwVKQcegPKxWHPdx5SbKdq5cVBt6ykFvfk zVUNi0+ifpcePbvzrfUJ0lqbitoKp04UcMWcCOSCez4jSszTluDfHuzX6EY8ZzDhEZag xrAq69DR1b8rmbv0dYaTYzmQaK1QhpDNdHePtaIrQ01fZNwfN/1jVQxttcXPRV0HIy6H JzmQ== X-Gm-Message-State: AOAM532UX381tnsGZw5ELjvOMfdGTsrufx0NZOiCU39wpiLLZzlW3o46 9CwKrmwEchtbhmZwhWNsyVwm8LIdJWzfng== X-Google-Smtp-Source: ABdhPJzA5GYUTkigRP0kfUBjemfywupxKu/Cy5wHwb9ItwOIYLnQcJfy09XzvuNFC0Ume+CFZu48wg== X-Received: by 2002:a17:90b:1208:: with SMTP id gl8mr16102717pjb.12.1618682335343; Sat, 17 Apr 2021 10:58:55 -0700 (PDT) Received: from rohan.hsd1.ca.comcast.net ([2601:646:c180:b150:1820:3ed4:975:3fbe]) by smtp.gmail.com with ESMTPSA id u4sm5030705pfk.56.2021.04.17.10.58.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Apr 2021 10:58:54 -0700 (PDT) From: Jim Wilson To: gdb-patches@sourceware.org Subject: [PATCH 01/24] RISC-V sim: Fix fence.i. Date: Sat, 17 Apr 2021 10:58:08 -0700 Message-Id: <20210417175831.16413-2-jimw@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210417175831.16413-1-jimw@sifive.com> References: <20210417175831.16413-1-jimw@sifive.com> X-Spam-Status: No, score=0.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Apr 2021 17:58:58 -0000 The fence.i instruction was moved to the zifencei extension. sim/riscv/ * sim-main.c (execute_i): Drop MATCH_FENCE_I here. (execute_zifencei): New function, with MATCH_FENCE_I support. (execute_one): Call execute_zifencei. --- sim/riscv/sim-main.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c index ff328a0..ccab3ba 100644 --- a/sim/riscv/sim-main.c +++ b/sim/riscv/sim-main.c @@ -580,9 +580,6 @@ execute_i (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) case MATCH_FENCE: TRACE_INSN (cpu, "fence;"); break; - case MATCH_FENCE_I: - TRACE_INSN (cpu, "fence.i;"); - break; case MATCH_SBREAK: TRACE_INSN (cpu, "sbreak;"); /* GDB expects us to step over SBREAK. */ @@ -922,6 +919,26 @@ execute_a (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) } static sim_cia +execute_zifencei (SIM_CPU *cpu, unsigned_word iw, + const struct riscv_opcode *op) +{ + SIM_DESC sd = CPU_STATE (cpu); + sim_cia pc = cpu->pc + 4; + + switch (op->match) + { + case MATCH_FENCE_I: + TRACE_INSN (cpu, "fence.i;"); + break; + default: + TRACE_INSN (cpu, "UNHANDLED INSN: %s", op->name); + sim_engine_halt (sd, cpu, NULL, cpu->pc, sim_signalled, SIM_SIGILL); + } + + return pc; +} + +static sim_cia execute_one (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) { SIM_DESC sd = CPU_STATE (cpu); @@ -939,6 +956,8 @@ execute_one (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) return execute_i (cpu, iw, op); case INSN_CLASS_M: return execute_m (cpu, iw, op); + case INSN_CLASS_ZIFENCEI: + return execute_zifencei (cpu, iw, op); default: TRACE_INSN (cpu, "UNHANDLED EXTENSION: %d", op->insn_class); sim_engine_halt (sd, cpu, NULL, cpu->pc, sim_signalled, SIM_SIGILL); -- 2.7.4