From 56018228deac6e704a7ec8befd9e9dc69f2fe73f Mon Sep 17 00:00:00 2001

From: Blue Swirl <blauwirbel@gmail.com>

Date: Sun, 2 Sep 2012 07:33:35 +0000

Subject: [PATCH] target-s390x: rename op_helper.c to misc_helper.c

Now op_helper.c contains miscellaneous helpers, rename

it to misc_helper.c.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

[agraf: fix conflict]

Signed-off-by: Alexander Graf <agraf@suse.de>

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

---

 target-s390x/Makefile.objs |   6 +-

 target-s390x/cpu.h         |   2 +-

 target-s390x/misc_helper.c | 428 +++++++++++++++++++++++++++++++++++++++++++++

 target-s390x/op_helper.c   | 428 ---------------------------------------------

 4 files changed, 432 insertions(+), 432 deletions(-)

 create mode 100644 target-s390x/misc_helper.c

 delete mode 100644 target-s390x/op_helper.c

diff --git a/target-s390x/Makefile.objs b/target-s390x/Makefile.objs

index b9b3061..a87d26f 100644

--- a/target-s390x/Makefile.objs

+++ b/target-s390x/Makefile.objs

@@ -1,10 +1,10 @@

-obj-y += translate.o op_helper.o helper.o cpu.o interrupt.o

-obj-y += int_helper.o fpu_helper.o cc_helper.o mem_helper.o

+obj-y += translate.o helper.o cpu.o interrupt.o

+obj-y += int_helper.o fpu_helper.o cc_helper.o mem_helper.o misc_helper.o

 obj-$(CONFIG_SOFTMMU) += machine.o

 obj-$(CONFIG_KVM) += kvm.o

-$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)

 $(obj)/int_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)

 $(obj)/fpu_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)

 $(obj)/cc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)

 $(obj)/mem_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)

+$(obj)/misc_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)

diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h

index 97fde5e..0ccb551 100644

--- a/target-s390x/cpu.h

+++ b/target-s390x/cpu.h

@@ -1005,7 +1005,7 @@ uint32_t set_cc_f64(float64 v1, float64 v2);

 uint32_t set_cc_nz_f32(float32 v);

 uint32_t set_cc_nz_f64(float64 v);

-/* op_helper.c */

+/* misc_helper.c */

 void program_interrupt(CPUS390XState *env, uint32_t code, int ilc);

 #endif

diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c

new file mode 100644

index 0000000..1d5137f

--- /dev/null

+++ b/target-s390x/misc_helper.c

@@ -0,0 +1,428 @@

+/*

+ *  S/390 misc helper routines

+ *

+ *  Copyright (c) 2009 Ulrich Hecht

+ *  Copyright (c) 2009 Alexander Graf

+ *

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2 of the License, or (at your option) any later version.

+ *

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.

+ */

+

+#include "cpu.h"

+#include "memory.h"

+#include "cputlb.h"

+#include "dyngen-exec.h"

+#include "host-utils.h"

+#include "helper.h"

+#include <string.h>

+#include "kvm.h"

+#include "qemu-timer.h"

+#ifdef CONFIG_KVM

+#include <linux/kvm.h>

+#endif

+

+#if !defined(CONFIG_USER_ONLY)

+#include "softmmu_exec.h"

+#include "sysemu.h"

+#endif

+

+/* #define DEBUG_HELPER */

+#ifdef DEBUG_HELPER

+#define HELPER_LOG(x...) qemu_log(x)

+#else

+#define HELPER_LOG(x...)

+#endif

+

+/* raise an exception */

+void HELPER(exception)(uint32_t excp)

+{

+    HELPER_LOG("%s: exception %d\n", __func__, excp);

+    env->exception_index = excp;

+    cpu_loop_exit(env);

+}

+

+#ifndef CONFIG_USER_ONLY

+void program_interrupt(CPUS390XState *env, uint32_t code, int ilc)

+{

+    qemu_log("program interrupt at %#" PRIx64 "\n", env->psw.addr);

+

+    if (kvm_enabled()) {

+#ifdef CONFIG_KVM

+        kvm_s390_interrupt(env, KVM_S390_PROGRAM_INT, code);

+#endif

+    } else {

+        env->int_pgm_code = code;

+        env->int_pgm_ilc = ilc;

+        env->exception_index = EXCP_PGM;

+        cpu_loop_exit(env);

+    }

+}

+

+/*

+ * ret < 0 indicates program check, ret = 0, 1, 2, 3 -> cc

+ */

+int sclp_service_call(CPUS390XState *env, uint32_t sccb, uint64_t code)

+{

+    int r = 0;

+    int shift = 0;

+

+#ifdef DEBUG_HELPER

+    printf("sclp(0x%x, 0x%" PRIx64 ")\n", sccb, code);

+#endif

+

+    /* basic checks */

+    if (!memory_region_is_ram(phys_page_find(sccb >> TARGET_PAGE_BITS)->mr)) {

+        return -PGM_ADDRESSING;

+    }

+    if (sccb & ~0x7ffffff8ul) {

+        return -PGM_SPECIFICATION;

+    }

+

+    switch (code) {

+    case SCLP_CMDW_READ_SCP_INFO:

+    case SCLP_CMDW_READ_SCP_INFO_FORCED:

+        while ((ram_size >> (20 + shift)) > 65535) {

+            shift++;

+        }

+        stw_phys(sccb + SCP_MEM_CODE, ram_size >> (20 + shift));

+        stb_phys(sccb + SCP_INCREMENT, 1 << shift);

+        stw_phys(sccb + SCP_RESPONSE_CODE, 0x10);

+

+        s390_sclp_extint(sccb & ~3);

+        break;

+    default:

+#ifdef DEBUG_HELPER

+        printf("KVM: invalid sclp call 0x%x / 0x%" PRIx64 "x\n", sccb, code);

+#endif

+        r = 3;

+        break;

+    }

+

+    return r;

+}

+

+/* SCLP service call */

+uint32_t HELPER(servc)(uint32_t r1, uint64_t r2)

+{

+    int r;

+

+    r = sclp_service_call(env, r1, r2);

+    if (r < 0) {

+        program_interrupt(env, -r, 4);

+        return 0;

+    }

+    return r;

+}

+

+/* DIAG */

+uint64_t HELPER(diag)(uint32_t num, uint64_t mem, uint64_t code)

+{

+    uint64_t r;

+

+    switch (num) {

+    case 0x500:

+        /* KVM hypercall */

+        r = s390_virtio_hypercall(env, mem, code);

+        break;

+    case 0x44:

+        /* yield */

+        r = 0;

+        break;

+    case 0x308:

+        /* ipl */

+        r = 0;

+        break;

+    default:

+        r = -1;

+        break;

+    }

+

+    if (r) {

+        program_interrupt(env, PGM_OPERATION, ILC_LATER_INC);

+    }

+

+    return r;

+}

+

+/* Store CPU ID */

+void HELPER(stidp)(uint64_t a1)

+{

+    stq(a1, env->cpu_num);

+}

+

+/* Set Prefix */

+void HELPER(spx)(uint64_t a1)

+{

+    uint32_t prefix;

+

+    prefix = ldl(a1);

+    env->psa = prefix & 0xfffff000;

+    qemu_log("prefix: %#x\n", prefix);

+    tlb_flush_page(env, 0);

+    tlb_flush_page(env, TARGET_PAGE_SIZE);

+}

+

+/* Set Clock */

+uint32_t HELPER(sck)(uint64_t a1)

+{

+    /* XXX not implemented - is it necessary? */

+

+    return 0;

+}

+

+static inline uint64_t clock_value(CPUS390XState *env)

+{

+    uint64_t time;

+

+    time = env->tod_offset +

+        time2tod(qemu_get_clock_ns(vm_clock) - env->tod_basetime);

+

+    return time;

+}

+

+/* Store Clock */

+uint32_t HELPER(stck)(uint64_t a1)

+{

+    stq(a1, clock_value(env));

+

+    return 0;

+}

+

+/* Store Clock Extended */

+uint32_t HELPER(stcke)(uint64_t a1)

+{

+    stb(a1, 0);

+    /* basically the same value as stck */

+    stq(a1 + 1, clock_value(env) | env->cpu_num);

+    /* more fine grained than stck */

+    stq(a1 + 9, 0);

+    /* XXX programmable fields */

+    stw(a1 + 17, 0);

+

+    return 0;

+}

+

+/* Set Clock Comparator */

+void HELPER(sckc)(uint64_t a1)

+{

+    uint64_t time = ldq(a1);

+

+    if (time == -1ULL) {

+        return;

+    }

+

+    /* difference between now and then */

+    time -= clock_value(env);

+    /* nanoseconds */

+    time = (time * 125) >> 9;

+

+    qemu_mod_timer(env->tod_timer, qemu_get_clock_ns(vm_clock) + time);

+}

+

+/* Store Clock Comparator */

+void HELPER(stckc)(uint64_t a1)

+{

+    /* XXX implement */

+    stq(a1, 0);

+}

+

+/* Set CPU Timer */

+void HELPER(spt)(uint64_t a1)

+{

+    uint64_t time = ldq(a1);

+

+    if (time == -1ULL) {

+        return;

+    }

+

+    /* nanoseconds */

+    time = (time * 125) >> 9;

+

+    qemu_mod_timer(env->cpu_timer, qemu_get_clock_ns(vm_clock) + time);

+}

+

+/* Store CPU Timer */

+void HELPER(stpt)(uint64_t a1)

+{

+    /* XXX implement */

+    stq(a1, 0);

+}

+

+/* Store System Information */

+uint32_t HELPER(stsi)(uint64_t a0, uint32_t r0, uint32_t r1)

+{

+    int cc = 0;

+    int sel1, sel2;

+

+    if ((r0 & STSI_LEVEL_MASK) <= STSI_LEVEL_3 &&

+        ((r0 & STSI_R0_RESERVED_MASK) || (r1 & STSI_R1_RESERVED_MASK))) {

+        /* valid function code, invalid reserved bits */

+        program_interrupt(env, PGM_SPECIFICATION, 2);

+    }

+

+    sel1 = r0 & STSI_R0_SEL1_MASK;

+    sel2 = r1 & STSI_R1_SEL2_MASK;

+

+    /* XXX: spec exception if sysib is not 4k-aligned */

+

+    switch (r0 & STSI_LEVEL_MASK) {

+    case STSI_LEVEL_1:

+        if ((sel1 == 1) && (sel2 == 1)) {

+            /* Basic Machine Configuration */

+            struct sysib_111 sysib;

+

+            memset(&sysib, 0, sizeof(sysib));

+            ebcdic_put(sysib.manuf, "QEMU            ", 16);

+            /* same as machine type number in STORE CPU ID */

+            ebcdic_put(sysib.type, "QEMU", 4);

+            /* same as model number in STORE CPU ID */

+            ebcdic_put(sysib.model, "QEMU            ", 16);

+            ebcdic_put(sysib.sequence, "QEMU            ", 16);

+            ebcdic_put(sysib.plant, "QEMU", 4);

+            cpu_physical_memory_rw(a0, (uint8_t *)&sysib, sizeof(sysib), 1);

+        } else if ((sel1 == 2) && (sel2 == 1)) {

+            /* Basic Machine CPU */

+            struct sysib_121 sysib;

+

+            memset(&sysib, 0, sizeof(sysib));

+            /* XXX make different for different CPUs? */

+            ebcdic_put(sysib.sequence, "QEMUQEMUQEMUQEMU", 16);

+            ebcdic_put(sysib.plant, "QEMU", 4);

+            stw_p(&sysib.cpu_addr, env->cpu_num);

+            cpu_physical_memory_rw(a0, (uint8_t *)&sysib, sizeof(sysib), 1);

+        } else if ((sel1 == 2) && (sel2 == 2)) {

+            /* Basic Machine CPUs */

+            struct sysib_122 sysib;

+

+            memset(&sysib, 0, sizeof(sysib));

+            stl_p(&sysib.capability, 0x443afc29);

+            /* XXX change when SMP comes */

+            stw_p(&sysib.total_cpus, 1);

+            stw_p(&sysib.active_cpus, 1);

+            stw_p(&sysib.standby_cpus, 0);

+            stw_p(&sysib.reserved_cpus, 0);

+            cpu_physical_memory_rw(a0, (uint8_t *)&sysib, sizeof(sysib), 1);

+        } else {

+            cc = 3;

+        }

+        break;

+    case STSI_LEVEL_2:

+        {

+            if ((sel1 == 2) && (sel2 == 1)) {

+                /* LPAR CPU */

+                struct sysib_221 sysib;

+

+                memset(&sysib, 0, sizeof(sysib));

+                /* XXX make different for different CPUs? */

+                ebcdic_put(sysib.sequence, "QEMUQEMUQEMUQEMU", 16);

+                ebcdic_put(sysib.plant, "QEMU", 4);

+                stw_p(&sysib.cpu_addr, env->cpu_num);

+                stw_p(&sysib.cpu_id, 0);

+                cpu_physical_memory_rw(a0, (uint8_t *)&sysib, sizeof(sysib), 1);

+            } else if ((sel1 == 2) && (sel2 == 2)) {

+                /* LPAR CPUs */

+                struct sysib_222 sysib;

+

+                memset(&sysib, 0, sizeof(sysib));

+                stw_p(&sysib.lpar_num, 0);

+                sysib.lcpuc = 0;

+                /* XXX change when SMP comes */

+                stw_p(&sysib.total_cpus, 1);

+                stw_p(&sysib.conf_cpus, 1);

+                stw_p(&sysib.standby_cpus, 0);

+                stw_p(&sysib.reserved_cpus, 0);

+                ebcdic_put(sysib.name, "QEMU    ", 8);

+                stl_p(&sysib.caf, 1000);

+                stw_p(&sysib.dedicated_cpus, 0);

+                stw_p(&sysib.shared_cpus, 0);

+                cpu_physical_memory_rw(a0, (uint8_t *)&sysib, sizeof(sysib), 1);

+            } else {

+                cc = 3;

+            }

+            break;

+        }

+    case STSI_LEVEL_3:

+        {

+            if ((sel1 == 2) && (sel2 == 2)) {

+                /* VM CPUs */

+                struct sysib_322 sysib;

+

+                memset(&sysib, 0, sizeof(sysib));

+                sysib.count = 1;

+                /* XXX change when SMP comes */

+                stw_p(&sysib.vm[0].total_cpus, 1);

+                stw_p(&sysib.vm[0].conf_cpus, 1);

+                stw_p(&sysib.vm[0].standby_cpus, 0);

+                stw_p(&sysib.vm[0].reserved_cpus, 0);

+                ebcdic_put(sysib.vm[0].name, "KVMguest", 8);

+                stl_p(&sysib.vm[0].caf, 1000);

+                ebcdic_put(sysib.vm[0].cpi, "KVM/Linux       ", 16);

+                cpu_physical_memory_rw(a0, (uint8_t *)&sysib, sizeof(sysib), 1);

+            } else {

+                cc = 3;

+            }

+            break;

+        }

+    case STSI_LEVEL_CURRENT:

+        env->regs[0] = STSI_LEVEL_3;

+        break;

+    default:

+        cc = 3;

+        break;

+    }

+

+    return cc;

+}

+

+uint32_t HELPER(sigp)(uint64_t order_code, uint32_t r1, uint64_t cpu_addr)

+{

+    int cc = 0;

+

+    HELPER_LOG("%s: %016" PRIx64 " %08x %016" PRIx64 "\n",

+               __func__, order_code, r1, cpu_addr);

+

+    /* Remember: Use "R1 or R1 + 1, whichever is the odd-numbered register"

+       as parameter (input). Status (output) is always R1. */

+

+    switch (order_code) {

+    case SIGP_SET_ARCH:

+        /* switch arch */

+        break;

+    case SIGP_SENSE:

+        /* enumerate CPU status */

+        if (cpu_addr) {

+            /* XXX implement when SMP comes */

+            return 3;

+        }

+        env->regs[r1] &= 0xffffffff00000000ULL;

+        cc = 1;

+        break;

+#if !defined(CONFIG_USER_ONLY)

+    case SIGP_RESTART:

+        qemu_system_reset_request();

+        cpu_loop_exit(env);

+        break;

+    case SIGP_STOP:

+        qemu_system_shutdown_request();

+        cpu_loop_exit(env);

+        break;

+#endif

+    default:

+        /* unknown sigp */

+        fprintf(stderr, "XXX unknown sigp: 0x%" PRIx64 "\n", order_code);

+        cc = 3;

+    }

+

+    return cc;

+}

+#endif

diff --git a/target-s390x/op_helper.c b/target-s390x/op_helper.c

deleted file mode 100644

index bb8dbf5..0000000

--- a/target-s390x/op_helper.c

+++ /dev/null

@@ -1,428 +0,0 @@

-/*

- *  S/390 helper routines

- *

- *  Copyright (c) 2009 Ulrich Hecht

- *  Copyright (c) 2009 Alexander Graf

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with this library; if not, see <http://www.gnu.org/licenses/>.

- */

-

-#include "cpu.h"

-#include "memory.h"

-#include "cputlb.h"

-#include "dyngen-exec.h"

-#include "host-utils.h"

-#include "helper.h"

-#include <string.h>

-#include "kvm.h"

-#include "qemu-timer.h"

-#ifdef CONFIG_KVM

-#include <linux/kvm.h>

-#endif

-

-#if !defined(CONFIG_USER_ONLY)

-#include "softmmu_exec.h"

-#include "sysemu.h"

-#endif

-

-/* #define DEBUG_HELPER */

-#ifdef DEBUG_HELPER

-#define HELPER_LOG(x...) qemu_log(x)

-#else

-#define HELPER_LOG(x...)

-#endif

-

-/* raise an exception */

-void HELPER(exception)(uint32_t excp)

-{

-    HELPER_LOG("%s: exception %d\n", __func__, excp);

-    env->exception_index = excp;

-    cpu_loop_exit(env);

-}

-

-#ifndef CONFIG_USER_ONLY

-void program_interrupt(CPUS390XState *env, uint32_t code, int ilc)

-{

-    qemu_log("program interrupt at %#" PRIx64 "\n", env->psw.addr);

-

-    if (kvm_enabled()) {

-#ifdef CONFIG_KVM

-        kvm_s390_interrupt(env, KVM_S390_PROGRAM_INT, code);

-#endif

-    } else {

-        env->int_pgm_code = code;

-        env->int_pgm_ilc = ilc;

-        env->exception_index = EXCP_PGM;

-        cpu_loop_exit(env);

-    }

-}

-

-/*

- * ret < 0 indicates program check, ret = 0, 1, 2, 3 -> cc

- */

-int sclp_service_call(CPUS390XState *env, uint32_t sccb, uint64_t code)

-{

-    int r = 0;

-    int shift = 0;

-

-#ifdef DEBUG_HELPER

-    printf("sclp(0x%x, 0x%" PRIx64 ")\n", sccb, code);

-#endif

-

-    /* basic checks */

-    if (!memory_region_is_ram(phys_page_find(sccb >> TARGET_PAGE_BITS)->mr)) {

-        return -PGM_ADDRESSING;

-    }

-    if (sccb & ~0x7ffffff8ul) {

-        return -PGM_SPECIFICATION;

-    }

-

-    switch (code) {

-    case SCLP_CMDW_READ_SCP_INFO:

-    case SCLP_CMDW_READ_SCP_INFO_FORCED:

-        while ((ram_size >> (20 + shift)) > 65535) {

-            shift++;

-        }

-        stw_phys(sccb + SCP_MEM_CODE, ram_size >> (20 + shift));

-        stb_phys(sccb + SCP_INCREMENT, 1 << shift);

-        stw_phys(sccb + SCP_RESPONSE_CODE, 0x10);

-

-        s390_sclp_extint(sccb & ~3);

-        break;

-    default:

-#ifdef DEBUG_HELPER

-        printf("KVM: invalid sclp call 0x%x / 0x%" PRIx64 "x\n", sccb, code);

-#endif

-        r = 3;

-        break;

-    }

-

-    return r;

-}

-

-/* SCLP service call */

-uint32_t HELPER(servc)(uint32_t r1, uint64_t r2)

-{

-    int r;

-

-    r = sclp_service_call(env, r1, r2);

-    if (r < 0) {

-        program_interrupt(env, -r, 4);

-        return 0;

-    }

-    return r;

-}

-

-/* DIAG */

-uint64_t HELPER(diag)(uint32_t num, uint64_t mem, uint64_t code)

-{

-    uint64_t r;

-

-    switch (num) {

-    case 0x500:

-        /* KVM hypercall */

-        r = s390_virtio_hypercall(env, mem, code);

-        break;

-    case 0x44:

-        /* yield */

-        r = 0;

-        break;

-    case 0x308:

-        /* ipl */

-        r = 0;

-        break;

-    default:

-        r = -1;

-        break;

-    }

-

-    if (r) {

-        program_interrupt(env, PGM_OPERATION, ILC_LATER_INC);

-    }

-

-    return r;

-}

-

-/* Store CPU ID */

-void HELPER(stidp)(uint64_t a1)

-{

-    stq(a1, env->cpu_num);

-}

-

-/* Set Prefix */

-void HELPER(spx)(uint64_t a1)

-{

-    uint32_t prefix;

-

-    prefix = ldl(a1);

-    env->psa = prefix & 0xfffff000;

-    qemu_log("prefix: %#x\n", prefix);

-    tlb_flush_page(env, 0);

-    tlb_flush_page(env, TARGET_PAGE_SIZE);

-}

-

-/* Set Clock */

-uint32_t HELPER(sck)(uint64_t a1)

-{

-    /* XXX not implemented - is it necessary? */

-

-    return 0;

-}

-

-static inline uint64_t clock_value(CPUS390XState *env)

-{

-    uint64_t time;

-

-    time = env->tod_offset +

-        time2tod(qemu_get_clock_ns(vm_clock) - env->tod_basetime);

-

-    return time;

-}

-

-/* Store Clock */

-uint32_t HELPER(stck)(uint64_t a1)

-{

-    stq(a1, clock_value(env));

-

-    return 0;

-}

-

-/* Store Clock Extended */

-uint32_t HELPER(stcke)(uint64_t a1)

-{

-    stb(a1, 0);

-    /* basically the same value as stck */

-    stq(a1 + 1, clock_value(env) | env->cpu_num);

-    /* more fine grained than stck */

-    stq(a1 + 9, 0);

-    /* XXX programmable fields */

-    stw(a1 + 17, 0);

-

-    return 0;

-}

-

-/* Set Clock Comparator */

-void HELPER(sckc)(uint64_t a1)

-{

-    uint64_t time = ldq(a1);

-

-    if (time == -1ULL) {

-        return;

-    }

-

-    /* difference between now and then */