From nobody Tue Feb 10 17:53:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522092392077837.9556232467625; Mon, 26 Mar 2018 12:26:32 -0700 (PDT) Received: from localhost ([::1]:58707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0XlH-0003g8-52 for importer@patchew.org; Mon, 26 Mar 2018 15:26:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0Xbz-0003Ug-Ru for qemu-devel@nongnu.org; Mon, 26 Mar 2018 15:16:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0Xbx-0001hL-R1 for qemu-devel@nongnu.org; Mon, 26 Mar 2018 15:16:55 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:50923) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f0Xbx-0001h0-Fm; Mon, 26 Mar 2018 15:16:53 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Mcctw-1fI4UZ0tE0-00Hfaz; Mon, 26 Mar 2018 21:16:39 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 26 Mar 2018 21:15:59 +0200 Message-Id: <20180326191603.10217-16-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180326191603.10217-1-laurent@vivier.eu> References: <20180326191603.10217-1-laurent@vivier.eu> X-Provags-ID: V03:K0:7JOkf6lUH8ezScNKaR2fVA5L8VLEcQiNPmRcYicFbuhHaDy97Dq vGc43OACXd2QdK6ruN4gdT95WLoh2/Qe9Ksrh+ht3M1zJPDCrDnLNgSSRwN+B0eLkwxa93/ Poe8GgLi6dcOvI+oBYZOqScgzVhfbpepNbqocxPCtK79jRfdtk5hNNA94Ijt3jZdvayLVVh hLwVmNaJGCsUue4mfCZnA== X-UI-Out-Filterresults: notjunk:1;V01:K0:/xvCL0RcvQo=:o7Dt2h695Ub48CkE+oKVWq TLDZwDZz+OzTmjMaM5mwKU4svLRr4Sddlr9O6Q6hdj3oDZe900THYOndMSvoKM9ySi6O+gqEh Z4bJ9jkjEzPaFbIwDjZaqZbLVYSYXMg0GTyhukFIkZwtvtPYBRiGQbuvKUOsZ72gaCGiYvIeE AmDtaNeuZLj9LmnlmcMANTeYORikd+x+8Be4nrZWMY9tVGLYgUjI0S/1I+Q5ItoLF1kSgckfM jovrQfH/B3GDAYGowOmRwMmmZe+iwLWZeUPru1ormIak7UmtYGq5amv+64dfcoQug+ygPE6j7 xUG5EUAFDNzIycJfDz+oEcKj3FSKLyMV5HpLopFm5LHpVG+tqpA7bdfO4/eVyg4G1DekxSJZx pRWkBwKTyZtbTMVqXnyo9qQ1PHl2g9WoqzPX5vIFzqCUfB/lnPA78a6z3HSFHIP9Z1bZ/a6it EmdytkMNvSikx8aiQ2jo4d7kyyzBvrbAgCkbr6rexumr55w53sVr4h9PqrA/GK/1asyWMIj1n zNLNeI+8QHOypUHGfrseyZ02dnIBrczabI5XpcwjgUEE9OEdlqcWs2BwhgmDJQe6eKTAw3U/m hHYJs3pzKFIoizPIQNaQbERgZ56IyvkW6kT56VUdaS0Crs8sLrPajNYiZKZmdsZfNnogKhFSF /UEmMP7PHRnUBT3k8VykV7mcK+I4fudF4+JyuP6zT9r4vfduKLuriIL4LjHawtbGmJg1TbqVL roYEm5bbsG7l3dn8OlBkYd5KR/OEYzkRUx7Bdg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.131 Subject: [Qemu-devel] [PATCH for 2.13 15/19] linux-user: move s390x cpu loop to s390x directory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Riku Voipio , Cornelia Huck , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" No code change, only move code from main.c to s390x/cpu_loop.c. Signed-off-by: Laurent Vivier Acked-by: Cornelia Huck --- linux-user/main.c | 146 ----------------------------------------= ---- linux-user/s390x/cpu_loop.c | 139 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+), 146 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index a3c68dad36..9693383009 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -149,143 +149,6 @@ void fork_end(int child) } } =20 -#ifdef TARGET_S390X - -/* s390x masks the fault address it reports in si_addr for SIGSEGV and SIG= BUS */ -#define S390X_FAIL_ADDR_MASK -4096LL - -void cpu_loop(CPUS390XState *env) -{ - CPUState *cs =3D CPU(s390_env_get_cpu(env)); - int trapnr, n, sig; - target_siginfo_t info; - target_ulong addr; - abi_long ret; - - while (1) { - cpu_exec_start(cs); - trapnr =3D cpu_exec(cs); - cpu_exec_end(cs); - process_queued_cpu_work(cs); - - switch (trapnr) { - case EXCP_INTERRUPT: - /* Just indicate that signals should be handled asap. */ - break; - - case EXCP_SVC: - n =3D env->int_svc_code; - if (!n) { - /* syscalls > 255 */ - n =3D env->regs[1]; - } - env->psw.addr +=3D env->int_svc_ilen; - ret =3D do_syscall(env, n, env->regs[2], env->regs[3], - env->regs[4], env->regs[5], - env->regs[6], env->regs[7], 0, 0); - if (ret =3D=3D -TARGET_ERESTARTSYS) { - env->psw.addr -=3D env->int_svc_ilen; - } else if (ret !=3D -TARGET_QEMU_ESIGRETURN) { - env->regs[2] =3D ret; - } - break; - - case EXCP_DEBUG: - sig =3D gdb_handlesig(cs, TARGET_SIGTRAP); - if (sig) { - n =3D TARGET_TRAP_BRKPT; - goto do_signal_pc; - } - break; - case EXCP_PGM: - n =3D env->int_pgm_code; - switch (n) { - case PGM_OPERATION: - case PGM_PRIVILEGED: - sig =3D TARGET_SIGILL; - n =3D TARGET_ILL_ILLOPC; - goto do_signal_pc; - case PGM_PROTECTION: - case PGM_ADDRESSING: - sig =3D TARGET_SIGSEGV; - /* XXX: check env->error_code */ - n =3D TARGET_SEGV_MAPERR; - addr =3D env->__excp_addr & S390X_FAIL_ADDR_MASK; - goto do_signal; - case PGM_EXECUTE: - case PGM_SPECIFICATION: - case PGM_SPECIAL_OP: - case PGM_OPERAND: - do_sigill_opn: - sig =3D TARGET_SIGILL; - n =3D TARGET_ILL_ILLOPN; - goto do_signal_pc; - - case PGM_FIXPT_OVERFLOW: - sig =3D TARGET_SIGFPE; - n =3D TARGET_FPE_INTOVF; - goto do_signal_pc; - case PGM_FIXPT_DIVIDE: - sig =3D TARGET_SIGFPE; - n =3D TARGET_FPE_INTDIV; - goto do_signal_pc; - - case PGM_DATA: - n =3D (env->fpc >> 8) & 0xff; - if (n =3D=3D 0xff) { - /* compare-and-trap */ - goto do_sigill_opn; - } else { - /* An IEEE exception, simulated or otherwise. */ - if (n & 0x80) { - n =3D TARGET_FPE_FLTINV; - } else if (n & 0x40) { - n =3D TARGET_FPE_FLTDIV; - } else if (n & 0x20) { - n =3D TARGET_FPE_FLTOVF; - } else if (n & 0x10) { - n =3D TARGET_FPE_FLTUND; - } else if (n & 0x08) { - n =3D TARGET_FPE_FLTRES; - } else { - /* ??? Quantum exception; BFP, DFP error. */ - goto do_sigill_opn; - } - sig =3D TARGET_SIGFPE; - goto do_signal_pc; - } - - default: - fprintf(stderr, "Unhandled program exception: %#x\n", n); - cpu_dump_state(cs, stderr, fprintf, 0); - exit(EXIT_FAILURE); - } - break; - - do_signal_pc: - addr =3D env->psw.addr; - do_signal: - info.si_signo =3D sig; - info.si_errno =3D 0; - info.si_code =3D n; - info._sifields._sigfault._addr =3D addr; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - break; - - case EXCP_ATOMIC: - cpu_exec_step_atomic(cs); - break; - default: - fprintf(stderr, "Unhandled trap: 0x%x\n", trapnr); - cpu_dump_state(cs, stderr, fprintf, 0); - exit(EXIT_FAILURE); - } - process_pending_signals (env); - } -} - -#endif /* TARGET_S390X */ - #ifdef TARGET_TILEGX =20 static void gen_sigill_reg(CPUTLGState *env) @@ -1717,15 +1580,6 @@ int main(int argc, char **argv, char **envp) env->pc =3D regs->sepc; env->gpr[xSP] =3D regs->sp; } -#elif defined(TARGET_S390X) - { - int i; - for (i =3D 0; i < 16; i++) { - env->regs[i] =3D regs->gprs[i]; - } - env->psw.mask =3D regs->psw.mask; - env->psw.addr =3D regs->psw.addr; - } #elif defined(TARGET_TILEGX) { int i; diff --git a/linux-user/s390x/cpu_loop.c b/linux-user/s390x/cpu_loop.c index b7700a5561..99f5f1594f 100644 --- a/linux-user/s390x/cpu_loop.c +++ b/linux-user/s390x/cpu_loop.c @@ -21,6 +21,145 @@ #include "qemu.h" #include "cpu_loop-common.h" =20 +/* s390x masks the fault address it reports in si_addr for SIGSEGV and SIG= BUS */ +#define S390X_FAIL_ADDR_MASK -4096LL + +void cpu_loop(CPUS390XState *env) +{ + CPUState *cs =3D CPU(s390_env_get_cpu(env)); + int trapnr, n, sig; + target_siginfo_t info; + target_ulong addr; + abi_long ret; + + while (1) { + cpu_exec_start(cs); + trapnr =3D cpu_exec(cs); + cpu_exec_end(cs); + process_queued_cpu_work(cs); + + switch (trapnr) { + case EXCP_INTERRUPT: + /* Just indicate that signals should be handled asap. */ + break; + + case EXCP_SVC: + n =3D env->int_svc_code; + if (!n) { + /* syscalls > 255 */ + n =3D env->regs[1]; + } + env->psw.addr +=3D env->int_svc_ilen; + ret =3D do_syscall(env, n, env->regs[2], env->regs[3], + env->regs[4], env->regs[5], + env->regs[6], env->regs[7], 0, 0); + if (ret =3D=3D -TARGET_ERESTARTSYS) { + env->psw.addr -=3D env->int_svc_ilen; + } else if (ret !=3D -TARGET_QEMU_ESIGRETURN) { + env->regs[2] =3D ret; + } + break; + + case EXCP_DEBUG: + sig =3D gdb_handlesig(cs, TARGET_SIGTRAP); + if (sig) { + n =3D TARGET_TRAP_BRKPT; + goto do_signal_pc; + } + break; + case EXCP_PGM: + n =3D env->int_pgm_code; + switch (n) { + case PGM_OPERATION: + case PGM_PRIVILEGED: + sig =3D TARGET_SIGILL; + n =3D TARGET_ILL_ILLOPC; + goto do_signal_pc; + case PGM_PROTECTION: + case PGM_ADDRESSING: + sig =3D TARGET_SIGSEGV; + /* XXX: check env->error_code */ + n =3D TARGET_SEGV_MAPERR; + addr =3D env->__excp_addr & S390X_FAIL_ADDR_MASK; + goto do_signal; + case PGM_EXECUTE: + case PGM_SPECIFICATION: + case PGM_SPECIAL_OP: + case PGM_OPERAND: + do_sigill_opn: + sig =3D TARGET_SIGILL; + n =3D TARGET_ILL_ILLOPN; + goto do_signal_pc; + + case PGM_FIXPT_OVERFLOW: + sig =3D TARGET_SIGFPE; + n =3D TARGET_FPE_INTOVF; + goto do_signal_pc; + case PGM_FIXPT_DIVIDE: + sig =3D TARGET_SIGFPE; + n =3D TARGET_FPE_INTDIV; + goto do_signal_pc; + + case PGM_DATA: + n =3D (env->fpc >> 8) & 0xff; + if (n =3D=3D 0xff) { + /* compare-and-trap */ + goto do_sigill_opn; + } else { + /* An IEEE exception, simulated or otherwise. */ + if (n & 0x80) { + n =3D TARGET_FPE_FLTINV; + } else if (n & 0x40) { + n =3D TARGET_FPE_FLTDIV; + } else if (n & 0x20) { + n =3D TARGET_FPE_FLTOVF; + } else if (n & 0x10) { + n =3D TARGET_FPE_FLTUND; + } else if (n & 0x08) { + n =3D TARGET_FPE_FLTRES; + } else { + /* ??? Quantum exception; BFP, DFP error. */ + goto do_sigill_opn; + } + sig =3D TARGET_SIGFPE; + goto do_signal_pc; + } + + default: + fprintf(stderr, "Unhandled program exception: %#x\n", n); + cpu_dump_state(cs, stderr, fprintf, 0); + exit(EXIT_FAILURE); + } + break; + + do_signal_pc: + addr =3D env->psw.addr; + do_signal: + info.si_signo =3D sig; + info.si_errno =3D 0; + info.si_code =3D n; + info._sifields._sigfault._addr =3D addr; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; + + case EXCP_ATOMIC: + cpu_exec_step_atomic(cs); + break; + default: + fprintf(stderr, "Unhandled trap: 0x%x\n", trapnr); + cpu_dump_state(cs, stderr, fprintf, 0); + exit(EXIT_FAILURE); + } + process_pending_signals (env); + } +} + void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) { + int i; + for (i =3D 0; i < 16; i++) { + env->regs[i] =3D regs->gprs[i]; + } + env->psw.mask =3D regs->psw.mask; + env->psw.addr =3D regs->psw.addr; } --=20 2.14.3