Skip to content

Commit 0858f8f

Browse files
author
Lucas Coutinho
committed
target/ppc: Move slbsync to decodetree
1 parent 2f36d6a commit 0858f8f

File tree

3 files changed

+16
-17
lines changed

3 files changed

+16
-17
lines changed

target/ppc/insn32.decode

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,8 @@ SLBMFEE 011111 ..... ----- ..... 1110010011 - @X_tb
769769

770770
SLBFEE 011111 ..... ----- ..... 1111010011 1 @X_tb
771771

772+
SLBSYNC 011111 ----- ----- ----- 0101010010 -
773+
772774
## TLB Management Instructions
773775

774776
&X_tlbie rb rs ric prs:bool r:bool

target/ppc/translate.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5388,20 +5388,6 @@ static void gen_tlbsync(DisasContext *ctx)
53885388
#endif /* defined(CONFIG_USER_ONLY) */
53895389
}
53905390

5391-
#if defined(TARGET_PPC64)
5392-
/* slbsync */
5393-
static void gen_slbsync(DisasContext *ctx)
5394-
{
5395-
#if defined(CONFIG_USER_ONLY)
5396-
GEN_PRIV(ctx);
5397-
#else
5398-
CHK_SV(ctx);
5399-
gen_check_tlb_flush(ctx, true);
5400-
#endif /* defined(CONFIG_USER_ONLY) */
5401-
}
5402-
5403-
#endif /* defined(TARGET_PPC64) */
5404-
54055391
/*** External control ***/
54065392
/* Optional: */
54075393

@@ -6803,9 +6789,6 @@ GEN_HANDLER(tlbia, 0x1F, 0x12, 0x0B, 0x03FFFC01, PPC_MEM_TLBIA),
68036789
* different ISA versions
68046790
*/
68056791
GEN_HANDLER(tlbsync, 0x1F, 0x16, 0x11, 0x03FFF801, PPC_MEM_TLBSYNC),
6806-
#if defined(TARGET_PPC64)
6807-
GEN_HANDLER_E(slbsync, 0x1F, 0x12, 0x0A, 0x03FFF801, PPC_NONE, PPC2_ISA300),
6808-
#endif
68096792
GEN_HANDLER(eciwx, 0x1F, 0x16, 0x0D, 0x00000001, PPC_EXTERN),
68106793
GEN_HANDLER(ecowx, 0x1F, 0x16, 0x09, 0x00000001, PPC_EXTERN),
68116794
GEN_HANDLER2(tlbld_6xx, "tlbld", 0x1F, 0x12, 0x1E, 0x03FF0001, PPC_6xx_TLB),

target/ppc/translate/storage-ctrl-impl.c.inc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,20 @@ static bool trans_SLBFEE(DisasContext *ctx, arg_SLBFEE *a)
154154
return true;
155155
}
156156

157+
static bool trans_SLBSYNC(DisasContext *ctx, arg_SLBSYNC *a)
158+
{
159+
REQUIRE_64BIT(ctx);
160+
REQUIRE_INSNS_FLAGS2(ctx, ISA300);
161+
REQUIRE_SV(ctx);
162+
163+
#if !defined(CONFIG_USER_ONLY) && defined(TARGET_PPC64)
164+
gen_check_tlb_flush(ctx, true);
165+
#else
166+
qemu_build_not_reached();
167+
#endif
168+
return true;
169+
}
170+
157171
static bool do_tlbie(DisasContext *ctx, arg_X_tlbie *a, bool local)
158172
{
159173
#if defined(CONFIG_USER_ONLY)

0 commit comments

Comments
 (0)