[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 095/147] target-s390: Convert STIDP
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 095/147] target-s390: Convert STIDP |
Date: |
Thu, 27 Sep 2012 17:29:35 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/helper.h | 1 -
target-s390x/insn-data.def | 2 ++
target-s390x/misc_helper.c | 6 ------
target-s390x/translate.c | 16 +++++++---------
4 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/target-s390x/helper.h b/target-s390x/helper.h
index 79bebc9..df6172e 100644
--- a/target-s390x/helper.h
+++ b/target-s390x/helper.h
@@ -85,7 +85,6 @@ DEF_HELPER_FLAGS_5(calc_cc, TCG_CALL_PURE|TCG_CALL_CONST,
DEF_HELPER_3(servc, i32, env, i32, i64)
DEF_HELPER_4(diag, i64, env, i32, i64, i64)
DEF_HELPER_3(load_psw, void, env, i64, i64)
-DEF_HELPER_FLAGS_2(stidp, TCG_CALL_CONST, void, env, i64)
DEF_HELPER_FLAGS_2(spx, TCG_CALL_CONST, void, env, i64)
DEF_HELPER_FLAGS_1(sck, TCG_CALL_CONST, i32, i64)
DEF_HELPER_2(stck, i32, env, i64)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index 5e1f8fd..4d9ecf4 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -640,6 +640,8 @@
/* STORE CONTROL */
C(0xb600, STCTL, RS_a, Z, 0, a2, 0, 0, stctl, 0)
C(0xeb25, STCTG, RSY_a, Z, 0, a2, 0, 0, stctg, 0)
+/* STORE CPU ID */
+ C(0xb202, STIDP, S, Z, la2, 0, new, m1_64, stidp, 0)
/* STORE THEN AND SYSTEM MASK */
C(0xac00, STNSM, SI, Z, la1, 0, 0, 0, stnosm, 0)
/* STORE THEN OR SYSTEM MASK */
diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index aec222c..e4518a6 100644
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -178,12 +178,6 @@ uint64_t HELPER(diag)(CPUS390XState *env, uint32_t num,
uint64_t mem,
return r;
}
-/* Store CPU ID */
-void HELPER(stidp)(CPUS390XState *env, uint64_t a1)
-{
- cpu_stq_data(env, a1, env->cpu_num);
-}
-
/* Set Prefix */
void HELPER(spx)(CPUS390XState *env, uint64_t a1)
{
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 2ccf569..f7eaa29 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -1033,15 +1033,6 @@ static void disas_b2(CPUS390XState *env, DisasContext
*s, int op,
LOG_DISAS("disas_b2: op 0x%x r1 %d r2 %d\n", op, r1, r2);
switch (op) {
- case 0x02: /* STIDP D2(B2) [S] */
- /* Store CPU ID */
- check_privileged(s);
- decode_rs(s, insn, &r1, &r3, &b2, &d2);
- tmp = get_address(s, 0, b2, d2);
- potential_page_fault(s);
- gen_helper_stidp(cpu_env, tmp);
- tcg_temp_free_i64(tmp);
- break;
case 0x04: /* SCK D2(B2) [S] */
/* Set Clock */
check_privileged(s);
@@ -2967,6 +2958,13 @@ static ExitStatus op_stctl(DisasContext *s, DisasOps *o)
return NO_EXIT;
}
+static ExitStatus op_stidp(DisasContext *s, DisasOps *o)
+{
+ check_privileged(s);
+ tcg_gen_ld32u_i64(o->out, cpu_env, offsetof(CPUS390XState, cpu_num));
+ return NO_EXIT;
+}
+
static ExitStatus op_stnosm(DisasContext *s, DisasOps *o)
{
uint64_t i2 = get_field(s->fields, i2);
--
1.7.11.4
- [Qemu-devel] [PATCH 085/147] target-s390: Convert CONVERT TO FIXED, (continued)
- [Qemu-devel] [PATCH 085/147] target-s390: Convert CONVERT TO FIXED, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 086/147] target-s390: Convert CONVERT FROM FIXED, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 087/147] target-s390: Convert FLOGR, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 088/147] target-s390: Convert LFPC, SFPC, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 089/147] target-s390: Convert IPM, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 090/147] target-s390: Convert CKSM, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 091/147] target-s390: Convert EAR, SAR, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 092/147] target-s390: Convert MVPG, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 093/147] target-s390: Convert CLST, MVST, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 094/147] target-s390: Convert SRST, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 095/147] target-s390: Convert STIDP,
Richard Henderson <=
- [Qemu-devel] [PATCH 096/147] target-s390: Convert SCK, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 097/147] target-s390: Convert STCK, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 098/147] target-s390: Convert SCKC, STCKC, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 099/147] target-s390: Convert SPT, STPT, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 100/147] target-s390: Convert SPKA, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 101/147] target-s390: Convert PTLB, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 102/147] target-s390: Convert SPX, STPX, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 103/147] target-s390: Convert STAP, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 104/147] target-s390: Convert IPTE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 105/147] target-s390: Convert ISKE, Richard Henderson, 2012/09/27