On qemu-sparc (user-space), the CASA instruction is not handled for
SPARC32 even if the selected cpu (e.g. LEON3) supports it.
Following the patch that works.
The patch also include an incorrect cpu-type for 32bit and missing
configurable CPU features TA0_SHUTDOWN, ASR17, CACHE_CTRL, POWERDOWN,
and CASA.
Re-posting to add "signed-off-by" line. Removing also unused functions
from qemu-sparc (32bit) building, and consequently removed helper patch
(needed only by unused [removed] functions).
Signed-off-by: Luca Bonissi <q...@bonslack.org>
---
diff -urp a/linux-user/syscall.c b/linux-user/syscall.c
--- a/linux-user/syscall.c 2023-03-27 15:41:42.000000000 +0200
+++ b/linux-user/syscall.c 2023-04-01 13:54:14.709136932 +0200
@@ -8286,7 +8286,11 @@ static int open_net_route(CPUArchState *
#if defined(TARGET_SPARC)
static int open_cpuinfo(CPUArchState *cpu_env, int fd)
{
+#if defined(TARGET_SPARC64)
dprintf(fd, "type\t\t: sun4u\n");
+#else
+ dprintf(fd, "type\t\t: sun4m\n");
+#endif
return 0;
}
#endif
diff -urp a/target/sparc/cpu.c b/target/sparc/cpu.c
--- a/target/sparc/cpu.c 2023-03-27 15:41:42.000000000 +0200
+++ b/target/sparc/cpu.c 2023-03-31 21:32:54.927008782 +0200
@@ -560,6 +560,11 @@ static const char * const feature_name[]
"hypv",
"cmt",
"gl",
+ "ta0shdn",
+ "asr17",
+ "cachectrl",
+ "powerdown",
+ "casa",
};
static void print_features(uint32_t features, const char *prefix)
@@ -852,6 +857,11 @@ static Property sparc_cpu_properties[] =
DEFINE_PROP_BIT("hypv", SPARCCPU, env.def.features, 11, false),
DEFINE_PROP_BIT("cmt", SPARCCPU, env.def.features, 12, false),
DEFINE_PROP_BIT("gl", SPARCCPU, env.def.features, 13, false),
+ DEFINE_PROP_BIT("ta0shdn", SPARCCPU, env.def.features, 14, false),
+ DEFINE_PROP_BIT("asr17", SPARCCPU, env.def.features, 15, false),
+ DEFINE_PROP_BIT("cachectrl",SPARCCPU, env.def.features, 16, false),
+ DEFINE_PROP_BIT("powerdown",SPARCCPU, env.def.features, 17, false),
+ DEFINE_PROP_BIT("casa", SPARCCPU, env.def.features, 18, false),
DEFINE_PROP_UNSIGNED("iu-version", SPARCCPU, env.def.iu_version, 0,
qdev_prop_uint64, target_ulong),
DEFINE_PROP_UINT32("fpu-version", SPARCCPU, env.def.fpu_version, 0),
diff -urp a/target/sparc/translate.c b/target/sparc/translate.c
--- a/target/sparc/translate.c 2023-03-27 15:41:42.000000000 +0200
+++ b/target/sparc/translate.c 2023-07-18 17:27:30.681134549 +0200
@@ -1917,7 +1917,6 @@ static void gen_ldstub(DisasContext *dc,
}
/* asi moves */
-#if !defined(CONFIG_USER_ONLY) || defined(TARGET_SPARC64)
typedef enum {
GET_ASI_HELPER,
GET_ASI_EXCP,
@@ -2149,6 +2148,7 @@ static DisasASI get_asi(DisasContext *dc
return (DisasASI){ type, asi, mem_idx, memop };
}
+#if !defined(CONFIG_USER_ONLY) || defined(TARGET_SPARC64)
static void gen_ld_asi(DisasContext *dc, TCGv dst, TCGv addr,
int insn, MemOp memop)
{
@@ -2277,6 +2277,7 @@ static void gen_swap_asi(DisasContext *d
break;
}
}
+#endif // !defined(CONFIG_USER_ONLY) || defined(TARGET_SPARC64)
static void gen_cas_asi(DisasContext *dc, TCGv addr, TCGv cmpv,
int insn, int rd)
@@ -2300,6 +2301,7 @@ static void gen_cas_asi(DisasContext *dc
}
}
+#if !defined(CONFIG_USER_ONLY) || defined(TARGET_SPARC64)
static void gen_ldstub_asi(DisasContext *dc, TCGv dst, TCGv addr, int
insn)
{
DisasASI da = get_asi(dc, insn, MO_UB);
@@ -5508,7 +5510,6 @@ static void disas_sparc_insn(DisasContex
case 0x37: /* stdc */
goto ncp_insn;
#endif
-#if !defined(CONFIG_USER_ONLY) || defined(TARGET_SPARC64)
case 0x3c: /* V9 or LEON3 casa */
#ifndef TARGET_SPARC64
CHECK_IU_FEATURE(dc, CASA);
@@ -5517,7 +5518,6 @@ static void disas_sparc_insn(DisasContex
cpu_src2 = gen_load_gpr(dc, rs2);
gen_cas_asi(dc, cpu_addr, cpu_src2, insn, rd);
break;
-#endif
default:
goto illegal_insn;
}
