From patchwork Sat Feb 17 20:31:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 128748 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1901009ljc; Sat, 17 Feb 2018 12:38:07 -0800 (PST) X-Google-Smtp-Source: AH8x2269qrH0vSWY7lhtY2Xsh1Z4Dk3CQmx9d2JYbsBhO18sTDB5qllcJPtKB6Y5d7DWKVUX96uJ X-Received: by 10.129.136.194 with SMTP id y185mr7786555ywf.202.1518899887760; Sat, 17 Feb 2018 12:38:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518899887; cv=none; d=google.com; s=arc-20160816; b=AwP/BbkmdcPfvfsAlmxIxR8LhXfuNBAomgDcAE/q1chD250DTZMcQEAiAbkybTQ0EG kaUO8a4FrybKcI/MoOPnsqGvZCHmDKudaipbqTgpWGsoCuvmxfse4m8lUYdM7psTpjzq TO4nz2C15kO7w/CeFvzuImX6h8rfPkKTHQsyWgx9wI0hD91dRxiPQ8n+VzK8CjDCJrJJ FjHyctrSBYMTL2nvS3EbJBGOQAmXYo8esj8uEbo11v8Xpytk8uRLfjNgoLpIKkBgYOiH gX1RL7/MNDGYxFOw+8GA1OY0wlXOlaEGru55PM8NbUdM0JVN2FTHZ0n+3vrI64AdnN1q Cryg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=c/KDZ6hXVEnnrt8q2K/tmcjMp19tsRG6TIdUJ15VyJg=; b=iFjw/0q8WSXCjm9drv4I+Hi/wfBYGogD36lrcJOuJ+mZa6Ce78m4HjUr0h1n8uP01m kjBHtrcSqypYPa1MEaQ3Yj1LCXEx+a6jQZcpczK2IhgogDdfuyAtP9SG0MQWvYdAkZXD PInb8iZ1WXaHy/76ryD0uEvVnn9MjvhXP7LoSyJwRDyAcS0eGlSzk25LntV39im5FSey rMq6yU5oSf3xV7fasA6L353tvUlSv0gpW0esePm80B6PPxk0ypZbL/7OLnyYKIf4gX5Y COLq3+7Cbi+ly7r2+gACVSjew39Wz2L05dPTyEG3Hio2dJLnWbbmZhV3KYEpWP7zhOZk XHrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=L7NfECln; 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 g66si3591991ywa.650.2018.02.17.12.38.07 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 17 Feb 2018 12:38:07 -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=L7NfECln; 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]:60426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1en9FH-0005OO-3J for patch@linaro.org; Sat, 17 Feb 2018 15:38:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1en99E-000084-Mb for qemu-devel@nongnu.org; Sat, 17 Feb 2018 15:31:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1en99D-0000mk-5F for qemu-devel@nongnu.org; Sat, 17 Feb 2018 15:31:52 -0500 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]:37397) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1en99C-0000mU-T6 for qemu-devel@nongnu.org; Sat, 17 Feb 2018 15:31:51 -0500 Received: by mail-pl0-x244.google.com with SMTP id ay8so3540830plb.4 for ; Sat, 17 Feb 2018 12:31:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=c/KDZ6hXVEnnrt8q2K/tmcjMp19tsRG6TIdUJ15VyJg=; b=L7NfEClna8FhmnMYUnYnOxoYgFGG+8DZHv2xsL79HafgToblYUkfkv+Fndsj8e1gPC AAb+gIlZAD386DPnoRGui0BhZWKG2IcFAzESmw2VBMSvsITYdVPyxSK1E2t8hY5n6ILW ub1Z9dhN/OEKSpQV+MCvXGV+Z/mCKmssRlzQ0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=c/KDZ6hXVEnnrt8q2K/tmcjMp19tsRG6TIdUJ15VyJg=; b=Xp5gkEH+ole8DUlXt3BcO2V0xIlaUrEUr8hlEobP8laiA2qcMDMudu68D6tehFJeU3 sHLlHZTAytdvtjSnLhl/zLJtoYEYA/nbXduy+nbXrw2HEVFfgnPMK88MioJFG7avk7Hb oTTbmAwoZwLVMHqBAtAeQJCVKuKEw9IJt2OYDBlOFoVBVYe4P9MuRghCYMTrCbFVdDo5 2+kDgsZFMJRC9a96tlekjF+5A5MqIXRbwPq5rggwHrVN/8/bqoGxSAqxaFDFQIexezab +Vf5S74x9q4q/9AOwnLH/i/GdyUAlMES2LCtlwCXq38siwFHPmIDoyoU+Ng8pZGkWRm2 aG5Q== X-Gm-Message-State: APf1xPCs4oLwgVgIVCxLma35NrJ20UUnrWk5V6qY7SCbmES3VOLYG6CE 37PfgfiM0rRzFLMLzEH5omuD+OF+8Uo= X-Received: by 2002:a17:902:62:: with SMTP id 89-v6mr9699129pla.178.1518899509346; Sat, 17 Feb 2018 12:31:49 -0800 (PST) Received: from cloudburst.twiddle.net ([50.0.192.64]) by smtp.gmail.com with ESMTPSA id y7sm48203797pfe.26.2018.02.17.12.31.47 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 17 Feb 2018 12:31:48 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 17 Feb 2018 12:31:21 -0800 Message-Id: <20180217203132.31780-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180217203132.31780-1-richard.henderson@linaro.org> References: <20180217203132.31780-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:c01::244 Subject: [Qemu-devel] [PATCH 08/19] target/hppa: Convert indexed memory insns 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/hppa/translate.c | 157 ++++++++++------------------------------------- target/hppa/insns.decode | 24 ++++++++ 2 files changed, 56 insertions(+), 125 deletions(-) -- 2.14.3 diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 91617bf9ad..792e838849 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -308,6 +308,13 @@ static int expand_sr3x(int val) return ~val; } +/* Convert the M:A bits within a memory insn to the tri-state value + we use for the final M. */ +static int ma_to_m(int val) +{ + return val & 2 ? (val & 1 ? -1 : 1) : 0; +} + /* Include the auto-generated decoder. */ #include "decode.inc.c" @@ -2842,116 +2849,57 @@ static void trans_cmpiclr(DisasContext *ctx, uint32_t insn) nullify_end(ctx); } -static void trans_ld_idx_i(DisasContext *ctx, uint32_t insn, - const DisasInsn *di) +static void trans_ld(DisasContext *ctx, arg_ldst *a, uint32_t insn) { - unsigned rt = extract32(insn, 0, 5); - unsigned m = extract32(insn, 5, 1); - unsigned sz = extract32(insn, 6, 2); - unsigned a = extract32(insn, 13, 1); - unsigned sp = extract32(insn, 14, 2); - int disp = low_sextract(insn, 16, 5); - unsigned rb = extract32(insn, 21, 5); - int modify = (m ? (a ? -1 : 1) : 0); - TCGMemOp mop = MO_TE | sz; - - do_load(ctx, rt, rb, 0, 0, disp, sp, modify, mop); + do_load(ctx, a->t, a->b, a->x, a->scale * a->size, + a->disp, a->sp, a->m, a->size | MO_TE); } -static void trans_ld_idx_x(DisasContext *ctx, uint32_t insn, - const DisasInsn *di) +static void trans_st(DisasContext *ctx, arg_ldst *a, uint32_t insn) { - unsigned rt = extract32(insn, 0, 5); - unsigned m = extract32(insn, 5, 1); - unsigned sz = extract32(insn, 6, 2); - unsigned u = extract32(insn, 13, 1); - unsigned sp = extract32(insn, 14, 2); - unsigned rx = extract32(insn, 16, 5); - unsigned rb = extract32(insn, 21, 5); - TCGMemOp mop = MO_TE | sz; - - do_load(ctx, rt, rb, rx, u ? sz : 0, 0, sp, m, mop); + assert(a->scale == 0); + do_store(ctx, a->t, a->b, a->disp, a->sp, a->m, a->size | MO_TE); } -static void trans_st_idx_i(DisasContext *ctx, uint32_t insn, - const DisasInsn *di) +static void trans_ldc(DisasContext *ctx, arg_ldst *a, uint32_t insn) { - int disp = low_sextract(insn, 0, 5); - unsigned m = extract32(insn, 5, 1); - unsigned sz = extract32(insn, 6, 2); - unsigned a = extract32(insn, 13, 1); - unsigned sp = extract32(insn, 14, 2); - unsigned rr = extract32(insn, 16, 5); - unsigned rb = extract32(insn, 21, 5); - int modify = (m ? (a ? -1 : 1) : 0); - TCGMemOp mop = MO_TE | sz; - - do_store(ctx, rr, rb, disp, sp, modify, mop); -} - -static void trans_ldcw(DisasContext *ctx, uint32_t insn, const DisasInsn *di) -{ - unsigned rt = extract32(insn, 0, 5); - unsigned m = extract32(insn, 5, 1); - unsigned i = extract32(insn, 12, 1); - unsigned au = extract32(insn, 13, 1); - unsigned sp = extract32(insn, 14, 2); - unsigned rx = extract32(insn, 16, 5); - unsigned rb = extract32(insn, 21, 5); - TCGMemOp mop = MO_TEUL | MO_ALIGN_16; + TCGMemOp mop = MO_TEUL | MO_ALIGN_16 | a->size; TCGv_reg zero, dest, ofs; TCGv_tl addr; - int modify, disp = 0, scale = 0; nullify_over(ctx); - if (i) { - modify = (m ? (au ? -1 : 1) : 0); - disp = low_sextract(rx, 0, 5); - rx = 0; - } else { - modify = m; - if (au) { - scale = mop & MO_SIZE; - } - } - if (modify) { + if (a->m) { /* Base register modification. Make sure if RT == RB, we see the result of the load. */ dest = get_temp(ctx); } else { - dest = dest_gpr(ctx, rt); + dest = dest_gpr(ctx, a->t); } - form_gva(ctx, &addr, &ofs, rb, rx, scale, disp, sp, modify, - ctx->mmu_idx == MMU_PHYS_IDX); + form_gva(ctx, &addr, &ofs, a->b, a->x, a->scale * a->size, + a->disp, a->sp, a->m, ctx->mmu_idx == MMU_PHYS_IDX); zero = tcg_const_reg(0); tcg_gen_atomic_xchg_reg(dest, addr, zero, ctx->mmu_idx, mop); - if (modify) { - save_gpr(ctx, rb, ofs); + if (a->m) { + save_gpr(ctx, a->b, ofs); } - save_gpr(ctx, rt, dest); + save_gpr(ctx, a->t, dest); nullify_end(ctx); } -static void trans_stby(DisasContext *ctx, uint32_t insn, const DisasInsn *di) +static void trans_stby(DisasContext *ctx, arg_stby *a, uint32_t insn) { - target_sreg disp = low_sextract(insn, 0, 5); - unsigned m = extract32(insn, 5, 1); - unsigned a = extract32(insn, 13, 1); - unsigned sp = extract32(insn, 14, 2); - unsigned rt = extract32(insn, 16, 5); - unsigned rb = extract32(insn, 21, 5); TCGv_reg ofs, val; TCGv_tl addr; nullify_over(ctx); - form_gva(ctx, &addr, &ofs, rb, 0, 0, disp, sp, m, + form_gva(ctx, &addr, &ofs, a->b, 0, 0, a->disp, a->sp, a->m, ctx->mmu_idx == MMU_PHYS_IDX); - val = load_gpr(ctx, rt); - if (a) { + val = load_gpr(ctx, a->r); + if (a->a) { if (tb_cflags(ctx->base.tb) & CF_PARALLEL) { gen_helper_stby_e_parallel(cpu_env, addr, val); } else { @@ -2964,72 +2912,34 @@ static void trans_stby(DisasContext *ctx, uint32_t insn, const DisasInsn *di) gen_helper_stby_b(cpu_env, addr, val); } } - - if (m) { + if (a->m) { tcg_gen_andi_reg(ofs, ofs, ~3); - save_gpr(ctx, rb, ofs); + save_gpr(ctx, a->b, ofs); } nullify_end(ctx); } -#ifndef CONFIG_USER_ONLY -static void trans_ldwa_idx_i(DisasContext *ctx, uint32_t insn, - const DisasInsn *di) +static void trans_lda(DisasContext *ctx, arg_ldst *a, uint32_t insn) { int hold_mmu_idx = ctx->mmu_idx; CHECK_MOST_PRIVILEGED(EXCP_PRIV_OPR); - - /* ??? needs fixing for hppa64 -- ldda does not follow the same - format wrt the sub-opcode in bits 6:9. */ ctx->mmu_idx = MMU_PHYS_IDX; - trans_ld_idx_i(ctx, insn, di); + trans_ld(ctx, a, insn); ctx->mmu_idx = hold_mmu_idx; } -static void trans_ldwa_idx_x(DisasContext *ctx, uint32_t insn, - const DisasInsn *di) +static void trans_sta(DisasContext *ctx, arg_ldst *a, uint32_t insn) { int hold_mmu_idx = ctx->mmu_idx; CHECK_MOST_PRIVILEGED(EXCP_PRIV_OPR); - - /* ??? needs fixing for hppa64 -- ldda does not follow the same - format wrt the sub-opcode in bits 6:9. */ ctx->mmu_idx = MMU_PHYS_IDX; - trans_ld_idx_x(ctx, insn, di); + trans_st(ctx, a, insn); ctx->mmu_idx = hold_mmu_idx; } -static void trans_stwa_idx_i(DisasContext *ctx, uint32_t insn, - const DisasInsn *di) -{ - int hold_mmu_idx = ctx->mmu_idx; - - CHECK_MOST_PRIVILEGED(EXCP_PRIV_OPR); - - /* ??? needs fixing for hppa64 -- ldda does not follow the same - format wrt the sub-opcode in bits 6:9. */ - ctx->mmu_idx = MMU_PHYS_IDX; - trans_st_idx_i(ctx, insn, di); - ctx->mmu_idx = hold_mmu_idx; -} -#endif - -static const DisasInsn table_index_mem[] = { - { 0x0c001000u, 0xfc001300, trans_ld_idx_i }, /* LD[BHWD], im */ - { 0x0c000000u, 0xfc001300, trans_ld_idx_x }, /* LD[BHWD], rx */ - { 0x0c001200u, 0xfc001300, trans_st_idx_i }, /* ST[BHWD] */ - { 0x0c0001c0u, 0xfc0003c0, trans_ldcw }, - { 0x0c001300u, 0xfc0013c0, trans_stby }, -#ifndef CONFIG_USER_ONLY - { 0x0c000180u, 0xfc00d3c0, trans_ldwa_idx_x }, /* LDWA, rx */ - { 0x0c001180u, 0xfc00d3c0, trans_ldwa_idx_i }, /* LDWA, im */ - { 0x0c001380u, 0xfc00d3c0, trans_stwa_idx_i }, /* STWA, im */ -#endif -}; - static void trans_ldil(DisasContext *ctx, uint32_t insn) { unsigned rt = extract32(insn, 21, 5); @@ -4445,9 +4355,6 @@ static void translate_one(DisasContext *ctx, uint32_t insn) opc = extract32(insn, 26, 6); switch (opc) { - case 0x03: - translate_table(ctx, insn, table_index_mem); - return; case 0x06: trans_fmpyadd(ctx, insn, false); return; diff --git a/target/hppa/insns.decode b/target/hppa/insns.decode index 156a34bf1a..212d12a9c9 100644 --- a/target/hppa/insns.decode +++ b/target/hppa/insns.decode @@ -26,6 +26,10 @@ %sm_imm 16:10 !function=expand_sm_imm +%im5_0 0:s1 1:4 +%im5_16 16:s1 17:4 +%ma_to_m 5:1 13:1 !function=ma_to_m + #### # Argument set definitions #### @@ -127,3 +131,23 @@ sub_tc 000010 ..... ..... .... 010011 0 ..... @rrr_cf sub_tsv_tc 000010 ..... ..... .... 110011 0 ..... @rrr_cf sub_b 000010 ..... ..... .... 010100 0 ..... @rrr_cf sub_b_tsv 000010 ..... ..... .... 110100 0 ..... @rrr_cf + +#### +# Index Mem +#### + +@ldstx ...... b:5 x:5 sp:2 scale:1 ....... m:1 t:5 &ldst disp=0 +@ldim5 ...... b:5 ..... sp:2 ......... t:5 \ + &ldst disp=%im5_16 x=0 scale=0 m=%ma_to_m +@stim5 ...... b:5 t:5 sp:2 ......... ..... \ + &ldst disp=%im5_0 x=0 scale=0 m=%ma_to_m + +ld 000011 ..... ..... .. . 1 -- 00 size:2 ...... @ldim5 +ld 000011 ..... ..... .. . 0 -- 00 size:2 ...... @ldstx +st 000011 ..... ..... .. . 1 -- 10 size:2 ...... @stim5 +ldc 000011 ..... ..... .. . 1 -- 0111 ...... @ldim5 size=2 +ldc 000011 ..... ..... .. . 0 -- 0111 ...... @ldstx size=2 +lda 000011 ..... ..... .. . 1 -- 0110 ...... @ldim5 size=2 +lda 000011 ..... ..... .. . 0 -- 0110 ...... @ldstx size=2 +sta 000011 ..... ..... .. . 1 -- 1110 ...... @stim5 size=2 +stby 000011 b:5 r:5 sp:2 a:1 1 -- 1100 m:1 ..... disp=%im5_0