From nobody Tue Feb 10 12:42:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613918116; cv=none; d=zohomail.com; s=zohoarc; b=gXfMlsQYudXU1ohRWJJ7Rv4YRAQrwD6K40Z1eJaERUuG+YxzAPzR/a/GCHosWv9GDNhpbvrRMeWLtxUX3SoVUz1nPKsyK3oU+wRMH3J1EyjjWl7aWJpP6CbgHnsp3EDiVAhU7tzPHDaTPM0kKuoQ5TRXecxlq1jrO0il+b5+1lk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613918116; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EQuLPLB77gZv1TslkqbImF1RKczoOzqyp5dpx+bERaM=; b=PpRFsX7mfxxKdQSoziSgWf6ixjNeN65ROcyaLsPFlUHQGCCeWnNRQf5AZX1Bq4Em4bG0pIzbAZU5T1dnkjC4BlviabgRgt5wrgSluNd7oL7yt0AdTwg6ChZIeQanBfJhcWg74oZcmAvw12GpXewfI6MAy+7pDOc4Yfdy2DBXoyk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1613918116139167.3303853396992; Sun, 21 Feb 2021 06:35:16 -0800 (PST) Received: by mail-wm1-f52.google.com with SMTP id v62so12041118wmg.4 for ; Sun, 21 Feb 2021 06:35:15 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id o13sm27293866wro.15.2021.02.21.06.35.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 06:35:13 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=EQuLPLB77gZv1TslkqbImF1RKczoOzqyp5dpx+bERaM=; b=DOjfbkJJrIA/aBmmkSMNqv6kxCXvTDfmYroKMSIGk3Mf2fxYcwP8ajVKmJFw6LRvWW FnY5tCYE4d8kdKOs1qlHH8oTvHA/f3/GBVTszNzmkKYa7s1lK10OepaDPvo1fZ2PGqwv tw057k0UOAqvD3CB33WmIvc37je69G4eAjAQo+ZjSBabYK+DvLagB6iSgCuantc9+Xit gDExgaVDkMIeklvD3iyMy/xpk5Iv6sC962WHZxmWgLnjW3CN+p3VgGHoT9LFnHLg0hNi VXK/ws3vZWba1MyZ2xzdQUp1TuJjFFj0xEJ9t5IQRV6DYhg17LXTar0835f/6lBvAbX3 MchQ== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=EQuLPLB77gZv1TslkqbImF1RKczoOzqyp5dpx+bERaM=; b=acKTjZAOj0r1LnH2OAUyH5zWF8RxtMEr3fA3ODx3ePlyFBCbwzMZ1UPrY0kUi6UQcd d6mEk9VoqpJt9mkppEbFNqqQSXo01epPOqqhr8yXLyzJ4Svpu5FSR+PmvCwvX54WSmWT aF5yt4Tn46WxgoTSkjqJI1F1H/6GNErXbj0Q+pOdIl/8ZVdviF5hvEcoq1O1VZ/AFOcB 9R8euyCKKjLTSHw57SwQ5Lrrax2+VWV7H5VujVzlDrmo2tIBxGrbVPg2W3+lzmydkNpT 5EIxYQr9CiFNgH6x+/aJs4E8gPR0eDZKV/nUyEXvQ1b7vcZOvHN2S5rKhgzfwQoY9ZgA e0qw== X-Gm-Message-State: AOAM533yJuWt2LsbZAMvErrFpxv6z9SesYbDrAjFeWcj/TqOuMeGActS oVT8Uu3EfgL3NUAQMDMcklA= X-Google-Smtp-Source: ABdhPJzic8LozV321AXCHc/j5v7RfZ1nrGUsZz4yTwK1dhEy9FDaLy5cej+FqjinR9249MQrj+f8PQ== X-Received: by 2002:a7b:cd0d:: with SMTP id f13mr1956200wmj.74.1613918114401; Sun, 21 Feb 2021 06:35:14 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paul Burton , Wainer dos Santos Moschetta , Aleksandar Rikalo , Aurelien Jarno , Marcel Apfelbaum , Cleber Rosa , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Jiaxun Yang , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 08/43] target/mips: fetch code with translator_ld Date: Sun, 21 Feb 2021 15:33:57 +0100 Message-Id: <20210221143432.2468220-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210221143432.2468220-1-f4bug@amsat.org> References: <20210221143432.2468220-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Similarly to commits ae82adc8e29..7f93879e444, use the translator_ld*() API introduced in commit 409c1a0bf0f to fetch the code on the MIPS target. Reviewed-by: Jiaxun Yang Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Message-Id: <20210125105818.2707067-1-f4bug@amsat.org> --- target/mips/translate.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/mips/translate.c b/target/mips/translate.c index a5cf1742a8b..a6e835809aa 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -26,7 +26,7 @@ #include "cpu.h" #include "internal.h" #include "tcg/tcg-op.h" -#include "exec/cpu_ldst.h" +#include "exec/translator.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" #include "hw/semihosting/semihost.h" @@ -13911,7 +13911,7 @@ static void decode_i64_mips16(DisasContext *ctx, =20 static int decode_extended_mips16_opc(CPUMIPSState *env, DisasContext *ctx) { - int extend =3D cpu_lduw_code(env, ctx->base.pc_next + 2); + int extend =3D translator_lduw(env, ctx->base.pc_next + 2); int op, rx, ry, funct, sa; int16_t imm, offset; =20 @@ -14161,7 +14161,7 @@ static int decode_mips16_opc(CPUMIPSState *env, Dis= asContext *ctx) /* No delay slot, so just process as a normal instruction */ break; case M16_OPC_JAL: - offset =3D cpu_lduw_code(env, ctx->base.pc_next + 2); + offset =3D translator_lduw(env, ctx->base.pc_next + 2); offset =3D (((ctx->opcode & 0x1f) << 21) | ((ctx->opcode >> 5) & 0x1f) << 16 | offset) << 2; @@ -16295,7 +16295,7 @@ static void decode_micromips32_opc(CPUMIPSState *en= v, DisasContext *ctx) uint32_t op, minor, minor2, mips32_op; uint32_t cond, fmt, cc; =20 - insn =3D cpu_lduw_code(env, ctx->base.pc_next + 2); + insn =3D translator_lduw(env, ctx->base.pc_next + 2); ctx->opcode =3D (ctx->opcode << 16) | insn; =20 rt =3D (ctx->opcode >> 21) & 0x1f; @@ -21350,7 +21350,7 @@ static int decode_nanomips_32_48_opc(CPUMIPSState *= env, DisasContext *ctx) int offset; int imm; =20 - insn =3D cpu_lduw_code(env, ctx->base.pc_next + 2); + insn =3D translator_lduw(env, ctx->base.pc_next + 2); ctx->opcode =3D (ctx->opcode << 16) | insn; =20 rt =3D extract32(ctx->opcode, 21, 5); @@ -21469,7 +21469,7 @@ static int decode_nanomips_32_48_opc(CPUMIPSState *= env, DisasContext *ctx) break; case NM_P48I: { - insn =3D cpu_lduw_code(env, ctx->base.pc_next + 4); + insn =3D translator_lduw(env, ctx->base.pc_next + 4); target_long addr_off =3D extract32(ctx->opcode, 0, 16) | insn = << 16; switch (extract32(ctx->opcode, 16, 5)) { case NM_LI48: @@ -29087,17 +29087,17 @@ static void mips_tr_translate_insn(DisasContextBa= se *dcbase, CPUState *cs) =20 is_slot =3D ctx->hflags & MIPS_HFLAG_BMASK; if (ctx->insn_flags & ISA_NANOMIPS32) { - ctx->opcode =3D cpu_lduw_code(env, ctx->base.pc_next); + ctx->opcode =3D translator_lduw(env, ctx->base.pc_next); insn_bytes =3D decode_nanomips_opc(env, ctx); } else if (!(ctx->hflags & MIPS_HFLAG_M16)) { - ctx->opcode =3D cpu_ldl_code(env, ctx->base.pc_next); + ctx->opcode =3D translator_ldl(env, ctx->base.pc_next); insn_bytes =3D 4; decode_opc(env, ctx); } else if (ctx->insn_flags & ASE_MICROMIPS) { - ctx->opcode =3D cpu_lduw_code(env, ctx->base.pc_next); + ctx->opcode =3D translator_lduw(env, ctx->base.pc_next); insn_bytes =3D decode_micromips_opc(env, ctx); } else if (ctx->insn_flags & ASE_MIPS16) { - ctx->opcode =3D cpu_lduw_code(env, ctx->base.pc_next); + ctx->opcode =3D translator_lduw(env, ctx->base.pc_next); insn_bytes =3D decode_mips16_opc(env, ctx); } else { gen_reserved_instruction(ctx); --=20 2.26.2