From patchwork Sun Jan 28 23:14:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 126099 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp1977949ljd; Sun, 28 Jan 2018 15:23:18 -0800 (PST) X-Google-Smtp-Source: AH8x225rj6CS94RoaAvQwQ/+4ZNCl4iIgC8GpQ1nJB/FuvSgkSe1XXhXbCpNmwKHD41JkeI39fpZ X-Received: by 10.129.76.72 with SMTP id z69mr16430341ywa.255.1517181798488; Sun, 28 Jan 2018 15:23:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517181798; cv=none; d=google.com; s=arc-20160816; b=ZCducP/8ZU4pXXyaV36qBB/KEWvKU3ZjEz8kPl9vdhzcGMOmZQodMqLzqQz1aUUpRF 7ApYNOSz+VhzPFmuCWplqOYomwWOKu7GUDZ/fq5PnTJkUayF0rwh+ThPfbxvlBAVZfMK bQiN0tMDVjRlgzdSyCDluLcw4WVDTVKQ/mCAM74qosvRLYhXM5i0z13BkBBbc7UYe0xB 8N+i9DGV7ykP7cPOc20QggbDKKqXiLvHG9i5G9rhhAnT/9oZDDC14lVY02DWCvc2n51+ Njz8XxWc5LR8Av6/kr6KmPqhgYNxHuAlsmBCkOVnzQicxrRSQ2zzQ0t+n2Wb+eGIaAGA vGEQ== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=CmDb8zc64ts/l8vk6/9kd6hfUlx35AY4/dU2eyi00gA=; b=kZHOugQ0v9vb3Sj3o8rUZpDhKqzLtVcHKhBUoddJI0fu4jZbBqNdq5tSp5qIjSldsV lQlcqgkZNUIzeHqTaM+JJ/PcgdLC1SLLw8pEE3q+SN8Uq83UL4jgFpsc2wyZV99zwErD oagogec5dC1kRuZzl4ujB6d1BFWbPZ5FuXgQoQCyfu1YyRVcj0fMAqNfoh7YZgom0RhQ hsEGW3BRofvrHPH/p4qj3I4UqiYTQOsCek2oZ6sbQt3l4JGiFc29QnULK0fcNObQoe8D ykSuU2urY0s6RBZyDoI8WB6NPEURSUT8axVDdDuKNfTWWwwdxshPJpBIWa0JbuMY54RM 1KiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gKjAILeH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z5si2691114yba.282.2018.01.28.15.23.18 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 28 Jan 2018 15:23:18 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gKjAILeH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1efwI9-0007sU-Rm for patch@linaro.org; Sun, 28 Jan 2018 18:23:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1efwAv-0002cv-Kb for qemu-devel@nongnu.org; Sun, 28 Jan 2018 18:15:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1efwAs-0008GZ-HA for qemu-devel@nongnu.org; Sun, 28 Jan 2018 18:15:49 -0500 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:44929) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1efwAs-0008Fs-88 for qemu-devel@nongnu.org; Sun, 28 Jan 2018 18:15:46 -0500 Received: by mail-pf0-x242.google.com with SMTP id 17so1814604pfw.11 for ; Sun, 28 Jan 2018 15:15:46 -0800 (PST) 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; bh=CmDb8zc64ts/l8vk6/9kd6hfUlx35AY4/dU2eyi00gA=; b=gKjAILeHZLTHaf77t2Js4+0zRB/++v/yd1F+TDjmkRRbsatEqqGf2fo4j2vOELWujJ oGTdHXo1TvuoI6ShoUcEKpWdwgJGyyEwNY9s35ugVWMXIuatzbuISLxHbLprU8SyZiyT Zq5ujaNDhVrjVcT4uj0Tnqzngm8p/7OPL0okc= 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=CmDb8zc64ts/l8vk6/9kd6hfUlx35AY4/dU2eyi00gA=; b=puSDJf89cu9dK48C4UXAhCJAx4yKb93eMOY/qg2L9nhPpgA08I48Mk378N52RHudQe uUBMxWYVRFxYYJiUm3KgKf17uVkkJEdCczQd/ZSXlJ6POg/qwO9+UwT8Ua0IhEPx7zqf ayQfLVheUYKj+tqkh0Q/LoDg3zbLqpxDSMp/RRwzWQM21jZLslEyEKwfj8+t+WKzACtS KWhFwOpB4aLP8hjS0t89nvIznZwFbrgMfJWnK/AE2PxLZEnOKjEmgC7Ph7flD+tqDXDS 4XzNcDE/+9DDpZ/DCsFzp0E1mPc5IMUOVdLStiC0U432zgzOgeMtRX8S34nHV0y7i6MT 6+nQ== X-Gm-Message-State: AKwxytfl76uTfUIFXw8tfmk3L2md5tMz0ugAr/6UREJidTViILhFvkdp 8cqaUHSpwDk6GLdIr+pFoy9uzvTmXl0= X-Received: by 10.101.64.67 with SMTP id h3mr20192178pgp.168.1517181344945; Sun, 28 Jan 2018 15:15:44 -0800 (PST) Received: from cloudburst.twiddle.net (174-21-6-47.tukw.qwest.net. [174.21.6.47]) by smtp.gmail.com with ESMTPSA id r27sm26949344pfj.75.2018.01.28.15.15.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 28 Jan 2018 15:15:43 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 28 Jan 2018 15:14:53 -0800 Message-Id: <20180128231528.22719-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180128231528.22719-1-richard.henderson@linaro.org> References: <20180128231528.22719-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PULL v4 08/43] target/hppa: Add space registers 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Not used where they should be yet, but we can copy them. Signed-off-by: Richard Henderson --- target/hppa/cpu.h | 1 + target/hppa/helper.c | 14 ++++++---- target/hppa/translate.c | 73 +++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 77 insertions(+), 11 deletions(-) -- 2.14.3 diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index f60435b9ec..e3da05e5d3 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -140,6 +140,7 @@ typedef int64_t target_sreg; struct CPUHPPAState { target_ureg gr[32]; uint64_t fr[32]; + uint64_t sr[8]; /* stored shifted into place for gva */ target_ureg sar; target_ureg cr26; diff --git a/target/hppa/helper.c b/target/hppa/helper.c index b6521f61fc..48ac80cb2d 100644 --- a/target/hppa/helper.c +++ b/target/hppa/helper.c @@ -168,12 +168,16 @@ void hppa_cpu_dump_state(CPUState *cs, FILE *f, psw, psw_cb, psw_c); for (i = 0; i < 32; i++) { - cpu_fprintf(f, "GR%02d " TREG_FMT_lx " ", i, env->gr[i]); - if ((i % 4) == 3) { - cpu_fprintf(f, "\n"); - } + cpu_fprintf(f, "GR%02d " TREG_FMT_lx "%c", i, env->gr[i], + (i & 3) == 3 ? '\n' : ' '); + } +#ifndef CONFIG_USER_ONLY + for (i = 0; i < 8; i++) { + cpu_fprintf(f, "SR%02d %08x%c", i, (uint32_t)(env->sr[i] >> 32), + (i & 3) == 3 ? '\n' : ' '); } - cpu_fprintf(f, "\n"); +#endif + cpu_fprintf(f, "\n"); /* ??? FR */ } diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 088031e7f3..50d41b0c63 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -320,6 +320,7 @@ typedef struct DisasInsn { /* global register indexes */ static TCGv_reg cpu_gr[32]; +static TCGv_i64 cpu_sr[4]; static TCGv_reg cpu_iaoq_f; static TCGv_reg cpu_iaoq_b; static TCGv_reg cpu_sar; @@ -358,6 +359,10 @@ void hppa_translate_init(void) "r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23", "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31" }; + /* SR[4-7] are not global registers so that we can index them. */ + static const char sr_names[4][4] = { + "sr0", "sr1", "sr2", "sr3" + }; int i; @@ -367,6 +372,11 @@ void hppa_translate_init(void) offsetof(CPUHPPAState, gr[i]), gr_names[i]); } + for (i = 0; i < 4; i++) { + cpu_sr[i] = tcg_global_mem_new_i64(cpu_env, + offsetof(CPUHPPAState, sr[i]), + sr_names[i]); + } for (i = 0; i < ARRAY_SIZE(vars); ++i) { const GlobalVar *v = &vars[i]; @@ -571,6 +581,19 @@ static void save_frd(unsigned rt, TCGv_i64 val) tcg_gen_st_i64(val, cpu_env, offsetof(CPUHPPAState, fr[rt])); } +static void load_spr(DisasContext *ctx, TCGv_i64 dest, unsigned reg) +{ +#ifdef CONFIG_USER_ONLY + tcg_gen_movi_i64(dest, 0); +#else + if (reg < 4) { + tcg_gen_mov_i64(dest, cpu_sr[reg]); + } else { + tcg_gen_ld_i64(dest, cpu_env, offsetof(CPUHPPAState, sr[reg])); + } +#endif +} + /* Skip over the implementation of an insn that has been nullified. Use this when the insn is too complex for a conditional move. */ static void nullify_over(DisasContext *ctx) @@ -785,6 +808,13 @@ static unsigned assemble_rc64(uint32_t insn) return r2 * 32 + r1 * 4 + r0; } +static unsigned assemble_sr3(uint32_t insn) +{ + unsigned s2 = extract32(insn, 13, 1); + unsigned s0 = extract32(insn, 14, 2); + return s2 * 4 + s0; +} + static target_sreg assemble_12(uint32_t insn) { target_ureg x = -(target_ureg)(insn & 1); @@ -1894,11 +1924,17 @@ static DisasJumpType trans_mfsp(DisasContext *ctx, uint32_t insn, const DisasInsn *di) { unsigned rt = extract32(insn, 0, 5); - TCGv_reg tmp = dest_gpr(ctx, rt); + unsigned rs = assemble_sr3(insn); + TCGv_i64 t0 = tcg_temp_new_i64(); + TCGv_reg t1 = tcg_temp_new(); - /* ??? We don't implement space registers. */ - tcg_gen_movi_reg(tmp, 0); - save_gpr(ctx, rt, tmp); + load_spr(ctx, t0, rs); + tcg_gen_shri_i64(t0, t0, 32); + tcg_gen_trunc_i64_reg(t1, t0); + + save_gpr(ctx, rt, t1); + tcg_temp_free(t1); + tcg_temp_free_i64(t0); cond_free(&ctx->null_cond); return DISAS_NEXT; @@ -1944,6 +1980,32 @@ static DisasJumpType trans_mfctl(DisasContext *ctx, uint32_t insn, return DISAS_NEXT; } +static DisasJumpType trans_mtsp(DisasContext *ctx, uint32_t insn, + const DisasInsn *di) +{ + unsigned rr = extract32(insn, 16, 5); + unsigned rs = assemble_sr3(insn); + TCGv_i64 t64; + + if (rs >= 5) { + CHECK_MOST_PRIVILEGED(EXCP_PRIV_REG); + } + nullify_over(ctx); + + t64 = tcg_temp_new_i64(); + tcg_gen_extu_reg_i64(t64, load_gpr(ctx, rr)); + tcg_gen_shli_i64(t64, t64, 32); + + if (rs >= 4) { + tcg_gen_st_i64(t64, cpu_env, offsetof(CPUHPPAState, sr[rs])); + } else { + tcg_gen_mov_i64(cpu_sr[rs], t64); + } + tcg_temp_free_i64(t64); + + return nullify_end(ctx, DISAS_NEXT); +} + static DisasJumpType trans_mtctl(DisasContext *ctx, uint32_t insn, const DisasInsn *di) { @@ -2069,8 +2131,7 @@ static DisasJumpType trans_mtsm(DisasContext *ctx, uint32_t insn, static const DisasInsn table_system[] = { { 0x00000000u, 0xfc001fe0u, trans_break }, - /* We don't implement space register, so MTSP is a nop. */ - { 0x00001820u, 0xffe01fffu, trans_nop }, + { 0x00001820u, 0xffe01fffu, trans_mtsp }, { 0x00001840u, 0xfc00ffffu, trans_mtctl }, { 0x016018c0u, 0xffe0ffffu, trans_mtsarcm }, { 0x000014a0u, 0xffffffe0u, trans_mfia },