[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 8/8] s390x: factor out common ioinst handler logi
From: |
Halil Pasic |
Subject: |
[Qemu-devel] [PATCH v2 8/8] s390x: factor out common ioinst handler logic |
Date: |
Wed, 4 Oct 2017 17:41:44 +0200 |
Some of ioinst the handlers look very much the same: they basically
delegate the work to the appropriate css function (doing some always the
same stuff before and after the call to the appropriate css function).
Let us create a template and get rid of some code.
Signed-off-by: Halil Pasic <address@hidden>
Suggested-by: Marc Hartmayer <address@hidden>
---
target/s390x/ioinst.c | 59 ++++++++++++---------------------------------------
1 file changed, 14 insertions(+), 45 deletions(-)
diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c
index 0c256baa70..9c7d6a222c 100644
--- a/target/s390x/ioinst.c
+++ b/target/s390x/ioinst.c
@@ -38,7 +38,10 @@ int ioinst_disassemble_sch_ident(uint32_t value, int *m, int
*cssid, int *ssid,
return 0;
}
-void ioinst_handle_xsch(S390CPU *cpu, uint64_t reg1)
+/* many ionst handlers look the same: they just delegate to a some css func */
+static void ioinst_handler_template_sch(S390CPU *cpu, uint64_t reg1,
+ const char *iname,
+ IOInstEnding (*handler_css)(SubchDev *))
{
int cssid, ssid, schid, m;
SubchDev *sch;
@@ -47,49 +50,28 @@ void ioinst_handle_xsch(S390CPU *cpu, uint64_t reg1)
program_interrupt(&cpu->env, PGM_OPERAND, 4);
return;
}
- trace_ioinst_sch_id("xsch", cssid, ssid, schid);
+ trace_ioinst_sch_id(iname, cssid, ssid, schid);
sch = css_find_subch(m, cssid, ssid, schid);
if (!sch || !css_subch_visible(sch)) {
setcc(cpu, 3);
return;
}
- setcc(cpu, css_do_xsch(sch).cc);
+ setcc(cpu, handler_css(sch).cc);
}
-void ioinst_handle_csch(S390CPU *cpu, uint64_t reg1)
+void ioinst_handle_xsch(S390CPU *cpu, uint64_t reg1)
{
- int cssid, ssid, schid, m;
- SubchDev *sch;
+ ioinst_handler_template_sch(cpu, reg1, "xsch", css_do_xsch);
+}
- if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) {
- program_interrupt(&cpu->env, PGM_OPERAND, 4);
- return;
- }
- trace_ioinst_sch_id("csch", cssid, ssid, schid);
- sch = css_find_subch(m, cssid, ssid, schid);
- if (!sch || !css_subch_visible(sch)) {
- setcc(cpu, 3);
- return;
- }
- setcc(cpu, css_do_csch(sch).cc);
+void ioinst_handle_csch(S390CPU *cpu, uint64_t reg1)
+{
+ ioinst_handler_template_sch(cpu, reg1, "csch", css_do_csch);
}
void ioinst_handle_hsch(S390CPU *cpu, uint64_t reg1)
{
- int cssid, ssid, schid, m;
- SubchDev *sch;
-
- if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) {
- program_interrupt(&cpu->env, PGM_OPERAND, 4);
- return;
- }
- trace_ioinst_sch_id("hsch", cssid, ssid, schid);
- sch = css_find_subch(m, cssid, ssid, schid);
- if (!sch || !css_subch_visible(sch)) {
- setcc(cpu, 3);
- return;
- }
- setcc(cpu, css_do_hsch(sch).cc);
+ ioinst_handler_template_sch(cpu, reg1, "hsch", css_do_hsch);
}
static int ioinst_schib_valid(SCHIB *schib)
@@ -707,20 +689,7 @@ void ioinst_handle_schm(S390CPU *cpu, uint64_t reg1,
uint64_t reg2,
void ioinst_handle_rsch(S390CPU *cpu, uint64_t reg1)
{
- int cssid, ssid, schid, m;
- SubchDev *sch;
-
- if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) {
- program_interrupt(&cpu->env, PGM_OPERAND, 4);
- return;
- }
- trace_ioinst_sch_id("rsch", cssid, ssid, schid);
- sch = css_find_subch(m, cssid, ssid, schid);
- if (!sch || !css_subch_visible(sch)) {
- setcc(cpu, 3);
- return;
- }
- setcc(cpu, css_do_rsch(sch).cc);
+ ioinst_handler_template_sch(cpu, reg1, "rsch", css_do_rsch);
}
#define RCHP_REG1_RES(_reg) (_reg & 0x00000000ff00ff00)
--
2.13.5
[Qemu-devel] [PATCH v2 4/8] s390x: refactor error handling for XSCH handler, Halil Pasic, 2017/10/04
[Qemu-devel] [PATCH v2 1/8] s390x/css: be more consistent if broken beyond repair, Halil Pasic, 2017/10/04
[Qemu-devel] [PATCH v2 8/8] s390x: factor out common ioinst handler logic,
Halil Pasic <=
[Qemu-devel] [PATCH v2 6/8] s390x: refactor error handling for HSCH handler, Halil Pasic, 2017/10/04
[Qemu-devel] [PATCH v2 7/8] s390x: refactor error handling for MSCH handler, Halil Pasic, 2017/10/04