From patchwork Fri Jan 27 08:15:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9540675 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 79516604A0 for ; Fri, 27 Jan 2017 08:15:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 667D727F85 for ; Fri, 27 Jan 2017 08:15:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B5E927FC0; Fri, 27 Jan 2017 08:15:45 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, 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 7CCFA27F85 for ; Fri, 27 Jan 2017 08:15:44 +0000 (UTC) Received: from localhost ([::1]:43634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cX1h9-000453-Id for patchwork-qemu-devel@patchwork.kernel.org; Fri, 27 Jan 2017 03:15:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cX1gk-00043Q-H8 for qemu-devel@nongnu.org; Fri, 27 Jan 2017 03:15:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cX1gj-0005CI-H8 for qemu-devel@nongnu.org; Fri, 27 Jan 2017 03:15:18 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:36388) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cX1gj-0005Bn-D8 for qemu-devel@nongnu.org; Fri, 27 Jan 2017 03:15:17 -0500 Received: by mail-qt0-x242.google.com with SMTP id h53so7922372qth.3 for ; Fri, 27 Jan 2017 00:15:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=iHdJgv9Cz/0jgqNFsWucxvJcNGiOH+5du9VCzQgkJrk=; b=l0xwwnNUvoK2ShGKRR+t4dOXur7BJobbS9IqTymiIe5/SkVdr1Q++duzS8MtFylz8K 6wz7h9LsAHdOr/3VBFH0JqflbrxZj2tmO0JlVTPNHR/5xZhEs4ru51kKtTlSdpqsgQcY LI/ie65NQhHzMcOWVQ7XHUTai5Lj/nkoE083pdZfrhjUcJ3fnll4iFKCAAegCRe06RgO JAiWGSTmYeaOQA/SJTAgSYu8E7cIZEq6hehT6LUVGrIXJ8Jw6//mf3/c3u/a5ig0ovt6 ANETk8O7BdS9ZXjW/Jwv7tny6EhQgXuNOWmuHzN6XteOHjD4LKbRtkp69TB+Y+GY1quR N46A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=iHdJgv9Cz/0jgqNFsWucxvJcNGiOH+5du9VCzQgkJrk=; b=OLsBwlRW1y2RRqoeMOd7kzrKhZH7EGeneFm5zN7Rqm93gviCT5IxW552wLAJNsIWzm +futuDIxHfFQxkUTVuN7a1Z2Rw9GAUEg+xOKchvC/mZqaoYlVXnGA4eih/fpKKVHWcOl XdUv6CtIH2a/ekGGeTHPLak7caWoOcezplJkImPvQLX5SOCKG2Gj8mkl4lHfWvatzfYf yQ04QYLqxxNyAO7zGMupomuQF/4KxgP7xOYJihSfbHQtMBrqBVBuhHkJrE+OEam6vIRx Krzj4Oja5mGoyCiQllT1nH/KihuOUnWXWQkPr/UwL471tlmYIzE+l34QFNbB5q6dXOmK cpNw== X-Gm-Message-State: AIkVDXLhGLqKFSAFSrwjuBvLj+W/1uThznZKtzBUlzXSyHBGv6L9n7FKIrKu+C231Ja6ig== X-Received: by 10.237.33.47 with SMTP id 44mr6482764qtc.100.1485504915389; Fri, 27 Jan 2017 00:15:15 -0800 (PST) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id q145sm3528295qke.37.2017.01.27.00.15.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Jan 2017 00:15:14 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 27 Jan 2017 00:15:10 -0800 Message-Id: <20170127081510.11805-1-rth@twiddle.net> X-Mailer: git-send-email 2.9.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH] target/sparc: Restore ldstub of odd asis 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: mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Fixes the booting of ss20 roms. Reported-by: Mark Cave-Ayland Signed-off-by: Richard Henderson Tested-by: Mark Cave-Ayland --- target/sparc/translate.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 655060c..aa6734d 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -2448,8 +2448,31 @@ static void gen_ldstub_asi(DisasContext *dc, TCGv dst, TCGv addr, int insn) gen_ldstub(dc, dst, addr, da.mem_idx); break; default: - /* ??? Should be DAE_invalid_asi. */ - gen_exception(dc, TT_DATA_ACCESS); + /* ??? In theory, this should be raise DAE_invalid_asi. + But the SS-20 roms do ldstuba [%l0] #ASI_M_CTL, %o1. */ + if (parallel_cpus) { + gen_helper_exit_atomic(cpu_env); + } else { + TCGv_i32 r_asi = tcg_const_i32(da.asi); + TCGv_i32 r_mop = tcg_const_i32(MO_UB); + TCGv_i64 s64, t64; + + save_state(dc); + t64 = tcg_temp_new_i64(); + gen_helper_ld_asi(t64, cpu_env, addr, r_asi, r_mop); + + s64 = tcg_const_i64(0xff); + gen_helper_st_asi(cpu_env, addr, s64, r_asi, r_mop); + tcg_temp_free_i64(s64); + tcg_temp_free_i32(r_mop); + tcg_temp_free_i32(r_asi); + + tcg_gen_trunc_i64_tl(dst, t64); + tcg_temp_free_i64(t64); + + /* End the TB. */ + dc->npc = DYNAMIC_PC; + } break; } }