From nobody Fri Jun 09 19:57:56 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QdBhN6fdtz4cKSJ; Fri, 9 Jun 2023 19:57:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QdBhN5lDsz4Hq3; Fri, 9 Jun 2023 19:57:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686340676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CmLOvs3Gg8KfbkmSw7C+oMnc0qz7Z/BxCsB1yoNzZPY=; b=uTbn1o/6dtH0TvedSIohvZidWfl+Y1gVWUVhAoBDI4NeGT/VUNZomA3wz+sqOq8XH/if9o wrrSGaoPGaoY0QDaejhbwecoOcg5Jymwx+2484GAglP9Bb3XV3XyZ5h2X6aGnycjv0UtxM NefRor6bngsAF3p2cPSKuxWj14t6SqcY65ZVYZ4F5JoprwarFtE6vHIeJuNPf2vj/PjD01 yh/1K30nt40Js5n99zxrn2s8uX2kV/WjmNmDB6x23g8tekIMLgTk2AX7Jk/cmv1TIcGEhc dDISocoiE4LRQ1XypzsbgqJ/OSLmsgAyjY8yxOOCWGxlxyHcFUmhswcYa4Iuvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686340676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CmLOvs3Gg8KfbkmSw7C+oMnc0qz7Z/BxCsB1yoNzZPY=; b=BnVpOiBDCFDnxJncsilAG2EZjaqrojRfJCovE7PrkAcdviVxnUEnxt2Gg/hwGjxKVgzsP6 JhYktlWZZNE1ltYfsnrhjR7HGIH2flOSo+PcU4E7B4pw6R5xmtZCSQk3/ld/58BBpXldMY 7TvyLVYZXg54AFOGtkgCoO+3Hk3s0thLRNsYtsl9UVl7M7vAE9DItLzZLgr+ZlTzjfavyT nLTEQwqT2tiPsdkUKy9s9G+qACrgrtpzQdaA5uQOgpH4ZeGjvJt9/3w0u57B/Xb7EiULBs h31zT8qszh47j9VD8Uiq6fQtGqY4rE5g1cBlMf7zrta05uFSRNirDVeaYc0WJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686340676; a=rsa-sha256; cv=none; b=VWZ7bbbPXWffSxVrUhGF04R2AsOivt2fPmhLXB2idNq6UjWRvWN/Ln4J+s0obPMMzkM1a9 DJYgnRzM73YtwndRcQzrMJ0CGF76jSY1jpL4wWPzjgAgeIDWiurXwYzZxjxCjHLmWtwWnN cd9E2aTfJH2Ty+Q1cZtFc45tC369g/i7yPlboWaX6KLECLHH8dKuL5FXv3UMRQk1KSGoEg BznEgrdvQW8TJV61twheduM7opwXGErokVP1KUBmcc0+rwl+72JjdrosUitlmLdEKWXNP/ ulYjG54KQoOyf9l1BXI+pBLGYgqdKKhSj7BjSXlFRXN0r8RCumJm5VSJ13jarQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QdBhN4mYNznwt; Fri, 9 Jun 2023 19:57:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 359JvukV071923; Fri, 9 Jun 2023 19:57:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 359JvuYO071922; Fri, 9 Jun 2023 19:57:56 GMT (envelope-from git) Date: Fri, 9 Jun 2023 19:57:56 GMT Message-Id: <202306091957.359JvuYO071922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 6cc69b793bbd - stable/13 - arm64/disassem.c: Fix typo sxts to sxts and amount for TYPE_02 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6cc69b793bbd761ec04eee0b379392dd75f09351 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=6cc69b793bbd761ec04eee0b379392dd75f09351 commit 6cc69b793bbd761ec04eee0b379392dd75f09351 Author: Mykola Hohsadze AuthorDate: 2023-04-18 15:50:58 +0000 Commit: Mitchell Horne CommitDate: 2023-06-09 18:14:58 +0000 arm64/disassem.c: Fix typo sxts to sxts and amount for TYPE_02 The current implementation is wrong, since it unconditionally sets the amount equal to the field of the instruction. However, when the bit (scale) is not set, it must be zero. Also fix a typo, sxts to sxtx, according to the Arm64 documentation. Reviewed by: mhorne MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39334 (cherry picked from commit cb923f03faa068f0c8ed5ffa7c3485ad7918be10) --- sys/arm64/arm64/disassem.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/disassem.c b/sys/arm64/arm64/disassem.c index ea6193655a5f..0f7b040e7b06 100644 --- a/sys/arm64/arm64/disassem.c +++ b/sys/arm64/arm64/disassem.c @@ -521,9 +521,13 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) arm64_reg(sf, rt), arm64_reg(1, rn), arm64_reg(option & 1, rm)); - /* Calculate amount, it's op(31:30) */ - amount = (insn >> ARM_INSN_SIZE_OFFSET) & - ARM_INSN_SIZE_MASK; + if (scale == 0) + amount = 0; + else { + /* Calculate amount, it's op(31:30) */ + amount = (insn >> ARM_INSN_SIZE_OFFSET) & + ARM_INSN_SIZE_MASK; + } switch (option) { case 0x2: @@ -537,7 +541,7 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) di->di_printf(", sxtw #%d", amount); break; case 0x7: - di->di_printf(", sxts #%d", amount); + di->di_printf(", sxtx #%d", amount); break; default: di->di_printf(", RSVD");