[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 116/147] target-s390: Convert SERVC
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 116/147] target-s390: Convert SERVC |
Date: |
Thu, 27 Sep 2012 17:51:52 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/helper.h | 2 +-
target-s390x/insn-data.def | 2 ++
target-s390x/misc_helper.c | 6 ++----
target-s390x/translate.c | 29 +++++++++--------------------
4 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/target-s390x/helper.h b/target-s390x/helper.h
index 55eaeea..71cd9aa 100644
--- a/target-s390x/helper.h
+++ b/target-s390x/helper.h
@@ -82,7 +82,7 @@ DEF_HELPER_FLAGS_5(calc_cc, TCG_CALL_PURE|TCG_CALL_CONST,
i32, env, i32, i64, i64, i64)
#ifndef CONFIG_USER_ONLY
-DEF_HELPER_3(servc, i32, env, i32, i64)
+DEF_HELPER_3(servc, i32, env, i64, i64)
DEF_HELPER_4(diag, i64, env, i32, i64, i64)
DEF_HELPER_3(load_psw, void, env, i64, i64)
DEF_HELPER_FLAGS_2(spx, TCG_CALL_CONST, void, env, i64)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index b0cf908..cd773d0 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -641,6 +641,8 @@
C(0xb20d, PTLB, S, Z, 0, 0, 0, 0, ptlb, 0)
/* RESET REFERENCE BIT EXTENDED */
C(0xb22a, RRBE, RRE, Z, 0, r2_o, 0, 0, rrbe, 0)
+/* SERVICE CALL LOGICAL PROCESSOR (PV hypercall) */
+ C(0xb220, SERVC, RRE, Z, r1_o, r2_o, 0, 0, servc, 0)
/* SET ADDRESSING MODE */
/* We only do 64-bit, so accept this as a no-op.
Let SAM24 and SAM31 signal illegal instruction. */
diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index b24e3d1..6addc07 100644
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -135,11 +135,9 @@ int sclp_service_call(CPUS390XState *env, uint32_t sccb,
uint64_t code)
}
/* SCLP service call */
-uint32_t HELPER(servc)(CPUS390XState *env, uint32_t r1, uint64_t r2)
+uint32_t HELPER(servc)(CPUS390XState *env, uint64_t r1, uint64_t r2)
{
- int r;
-
- r = sclp_service_call(env, r1, r2);
+ int r = sclp_service_call(env, r1, r2);
if (r < 0) {
program_interrupt(env, -r, 4);
return 0;
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 61bac81..a4ac079 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -1022,27 +1022,7 @@ static void disas_b2(CPUS390XState *env, DisasContext
*s, int op,
uint32_t insn)
{
#ifndef CONFIG_USER_ONLY
- TCGv_i64 tmp;
- TCGv_i32 tmp32_1;
- int r1, r2;
-
- r1 = (insn >> 4) & 0xf;
- r2 = insn & 0xf;
-
- LOG_DISAS("disas_b2: op 0x%x r1 %d r2 %d\n", op, r1, r2);
-
switch (op) {
- case 0x20: /* SERVC R1,R2 [RRE] */
- /* SCLP Service call (PV hypercall) */
- check_privileged(s);
- potential_page_fault(s);
- tmp32_1 = load_reg32(r2);
- tmp = load_reg(r1);
- gen_helper_servc(cc_op, cpu_env, tmp32_1, tmp);
- set_cc_static(s);
- tcg_temp_free_i32(tmp32_1);
- tcg_temp_free_i64(tmp);
- break;
default:
#endif
LOG_DISAS("illegal b2 operation 0x%x\n", op);
@@ -2701,6 +2681,15 @@ static ExitStatus op_sqxb(DisasContext *s, DisasOps *o)
}
#ifndef CONFIG_USER_ONLY
+static ExitStatus op_servc(DisasContext *s, DisasOps *o)
+{
+ check_privileged(s);
+ potential_page_fault(s);
+ gen_helper_servc(cc_op, cpu_env, o->in2, o->in1);
+ set_cc_static(s);
+ return NO_EXIT;
+}
+
static ExitStatus op_sigp(DisasContext *s, DisasOps *o)
{
TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
--
1.7.11.4
- [Qemu-devel] [PATCH 106/147] target-s390: Convert SSKE, (continued)
- [Qemu-devel] [PATCH 106/147] target-s390: Convert SSKE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 107/147] target-s390: Convert RRBE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 108/147] target-s390: Convert subchannel instructions, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 109/147] target-s390: Convert STURA, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 110/147] target-s390: Convert CSP, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 111/147] target-s390: Convert STCKE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 112/147] target-s390: Convert SACF, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 113/147] target-s390: Convert STSI, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 114/147] target-s390: Convert STFL, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 115/147] target-s390: Convert LPSWE, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 116/147] target-s390: Convert SERVC,
Richard Henderson <=
- [Qemu-devel] [PATCH 117/147] target-s390: Delete dead code from old translator, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 118/147] target-s390: Implement BRANCH ON INDEX, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 119/147] target-s390: Tidy s->op_cc handling, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 120/147] target-s390: Implement COMPARE AND BRANCH, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 121/147] target-s390: Implement RISBG, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 122/147] target-s390: Implement LDGR, LGDR, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 123/147] target-s390: Implement R[NOX]SBG, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 124/147] target-s390: Implement PREFETCH, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 125/147] target-s390: Implement COMPARE RELATIVE LONG, Richard Henderson, 2012/09/27
- [Qemu-devel] [PATCH 126/147] target-s390: Implement COMPARE AND TRAP, Richard Henderson, 2012/09/27