From patchwork Sat May 5 23:35:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Clark X-Patchwork-Id: 10382491 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6DD2560318 for ; Sat, 5 May 2018 23:47:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C57B28F60 for ; Sat, 5 May 2018 23:47:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5174028F6B; Sat, 5 May 2018 23:47:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C735928F60 for ; Sat, 5 May 2018 23:47:37 +0000 (UTC) Received: from localhost ([::1]:40318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fF6tt-00042l-2v for patchwork-qemu-devel@patchwork.kernel.org; Sat, 05 May 2018 19:47:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fF6k9-0004Es-Dt for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fF6k8-0003sG-F0 for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:33 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:43428) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fF6k8-0003ru-8a for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:32 -0400 Received: by mail-pf0-x243.google.com with SMTP id j20so5775137pff.10 for ; Sat, 05 May 2018 16:37:32 -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=lXTe0rk11UlaoolQNWbqKPLh0sxqHiqOOdSvoY5p97I=; b=fXQ7byHELBOvm8vlrvlZjJx2/mCp8t3/iyKAWgwe+FKplYZ6oCefaRcpNGvtUgRQ1Q sHxcWcKDVbRDc7dhsUk118i7/W8LpHyHogtWnr1lX4zSxbduxaG6hhIaFhxohVPKJLF2 QMoKy/0ZqqtDpx/d4a7FBlWtzedVOOSz5BoxTxKdhI9iQKNvuXwAd3oQZ96OQvSNZHPq 0M+DPEnY6LpVzudRqemrGK6DGTE3mvQzzqZSlOLB2ofKTmfb7r5BIwFOZO/tG84OGtex QXiz3Qfn/MFjG30F8h4qnkFs9EQcZAoxWbHPzU13Sg7zleFLE0lvG/GUvqUYyDE5iugC ESIw== 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=lXTe0rk11UlaoolQNWbqKPLh0sxqHiqOOdSvoY5p97I=; b=cvt3LpROMS3DABCqIj/YyHNHReidtEKtZzWZ00MO+o9Nsz64Cox7J9DuDqaLpeJflu 66Tyom5FRkNe5wO0TQKrE5Df3i93bYXRV9L38S0HT7M5YYcfcEgB0qxBnhzxWnv87jFd kkuHzz8pVwH60xMHozZRD4cKy5BEwgAG+a5B7LPJ7RA+Rlk7kOAY0ObTC3okJ0JTrnjC tc6mJilOFEp/OrOsbOdqMWnSlFUqMYFJHmaufGe+KWP6+ijmtYkUn1AdJnj+Ql6D8/8z xlFDwAtIgXsdwMWGXdFXI/rrtGA0bXQCUnLyUX3WZJ6q6iNUpVK3l9wx0ScxHihT/cbR nC+Q== X-Gm-Message-State: ALQs6tBiWv2PswyBJOVHpJQGTpqItp4qiFyt7xuI/Er0tIK8YVIVAjxO 6vgHvEYZX02zp9BqYIW2kKa1poBIksw= X-Google-Smtp-Source: AB8JxZqcGMLppS/4BD1sH/iynwO8MltRA4NNbNq+04ryrJfnIee0EUuu4SmS1LWReo9X9c4i3mtYmw== X-Received: by 10.98.155.87 with SMTP id r84mr31931496pfd.109.1525563451271; Sat, 05 May 2018 16:37:31 -0700 (PDT) Received: from localhost.localdomain (122-58-167-38-fibre.bb.spark.co.nz. [122.58.167.38]) by smtp.gmail.com with ESMTPSA id x8sm47297094pfa.173.2018.05.05.16.37.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 05 May 2018 16:37:30 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Sun, 6 May 2018 11:35:17 +1200 Message-Id: <1525563325-62963-13-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1525563325-62963-1-git-send-email-mjc@sifive.com> References: <1525563325-62963-1-git-send-email-mjc@sifive.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PULL 12/20] RISC-V: Update E and I extension order 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: Sagar Karandikar , Bastian Koppelmann , Palmer Dabbelt , Michael Clark , Alistair Francis , patches@groups.riscv.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Section 22.8 Subset Naming Convention of the RISC-V ISA Specification defines the canonical order for extensions in the ISA string. It is silent on the position of the E extension however E is a substitute for I so it must come early in the extension list order. A comment is added to state E and I are mutually exclusive, as the E extension will be added to the RISC-V port in the future. Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Palmer Dabbelt Cc: Alistair Francis Signed-off-by: Michael Clark Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 2 +- target/riscv/cpu.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 5a527fbba0bd..4e5a56d4e312 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -26,7 +26,7 @@ /* RISC-V CPU definitions */ -static const char riscv_exts[26] = "IMAFDQECLBJTPVNSUHKORWXYZG"; +static const char riscv_exts[26] = "IEMAFDQCLBJTPVNSUHKORWXYZG"; const char * const riscv_int_regnames[] = { "zero", "ra ", "sp ", "gp ", "tp ", "t0 ", "t1 ", "t2 ", diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 9871e6feb1de..1dcbdbe6f77d 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -71,6 +71,7 @@ #define RV(x) ((target_ulong)1 << (x - 'A')) #define RVI RV('I') +#define RVE RV('E') /* E and I are mutually exclusive */ #define RVM RV('M') #define RVA RV('A') #define RVF RV('F')