From patchwork Mon May 17 18:14:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 440190 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1342043jac; Mon, 17 May 2021 11:37:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyihRQSBCAu0IrT+93FOgn0V/3fhvaarRr+aRDQajTsfQDm8dwDfOb7JPXhyXywvRUVjMPT X-Received: by 2002:a92:ce90:: with SMTP id r16mr929217ilo.220.1621276652488; Mon, 17 May 2021 11:37:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621276652; cv=none; d=google.com; s=arc-20160816; b=O9/0mlD8pZycJM4b1YB4EZd7+aWCqG4oPd0MP6Z35qYHL+PG4/TYHCWdjN+BODiUYN cSSPtYCoFJMzeYcamQag6T56okeZLFZ4ThHHl22WpxZA0nyOYiLL086jucopAzkBTt4v PKecsMK9ZOEBXiuHFH4WUNp8X4dwT6xp4UM2N1xDDh0+tjoEfjGuKDZbhWmWVNA+4P0X +8GUnpK8g1cZEbgB8uT7IJBYJQhUTocVq+8tWwREJPExAQEnQpIryew1IpfK3WjMmenx tkZ3cU2ijOp52tAG1JdK+E+WYne0spuGBhwavlUq6fAcr78i5dl58+xrWItWpVDHTG1j Mxyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=+Bv26SxF605u1xBocVZ8U5WN7bzh+ew8VkXdHFmKrLc=; b=D86V/LINIqJIPmf52AuPHHba++Wn6ZN7yaIv9vsVay+mJKhuCtJkvrocyFyKLEwhMq P2zVnmL3oV0t5JO5y4MLICSKTkNedEBkdt0CIPZbk3gvfLTx+b50leRP+NbJC8sdNTeK NWbzbffQ0UeR1wenIbrp4Uq9a/Z035MxRNVBVbFOURdI9B4HK+Zs4kTy2Sn/LQIAesm6 zfiqPbPDI6xXKfthA4m50DL1sgVWoh9ED/R9UZYAsRASYlOntagPPWTPjjY0m6N5ZbFg qrx006APHpa77L1PQJEVpXg4b3+RJBXKuvFDkFCcWPAovkuDnvbDcGMdeQcDyEbwYg8D ZryQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n4si17103037ion.59.2021.05.17.11.37.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 May 2021 11:37:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:47256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lii7P-0007KX-UH for patch@linaro.org; Mon, 17 May 2021 14:37:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihle-0006fR-Ji for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:02 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:58513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihlQ-0004UO-O2 for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:02 -0400 Received: from quad ([82.142.31.78]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MLQgv-1m063b0Hvn-00IVxF; Mon, 17 May 2021 20:14:44 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 35/59] linux-user/s390x: Remove PSW_ADDR_AMODE Date: Mon, 17 May 2021 20:14:00 +0200 Message-Id: <20210517181424.8093-36-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517181424.8093-1-laurent@vivier.eu> References: <20210517181424.8093-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Wr5S8DKryzW8N/vKmub0WzsI8+MbbgwMxhlhxFS2DK4vwwfN/7B MVLm44pCzz5Bu+FD5ptchO7rbZbCU7phSC0Dzfw+q0o6OXXQwqarytaBpNuW+MbCXwUz5w1 ncdxw+/ynF4XtIaNc6E2XaZ3R7xy5YUcCp6+2xlNDQsvvxpL9x4zf+zHC0cgIj9dP/8nEZg Kjbnyl34dCmvk8SVEdh9A== X-UI-Out-Filterresults: notjunk:1; V03:K0:QllEDAhyNFQ=:U/QsBuE8mlh31uCPObN+o1 o8+K2ZbLu3vcmgbA202t3Bqk6/VwLKq/e41ZKlBaqnfxKycwI70GQ7Y4XgrHBvW5ds94q8p8K rUsuRUAXJ3U35QVJ7y/NoznBtJwlfalshgLvTBUut1BRxNay1hySb3xJF2kn0RYpkrXdzb3Z7 izBdnMraw2ga/Skc8sh8Eudsv9gDd6ZDIARSVcKJ+K27x+jRB09Old7O1r3rGWcvODr6fLeLJ ChZ7E3F+BCk53xRL3f6Rz1j2xBv10HbwNAonEwVgCN5envw+pbfEimx/Xt00jZzB/eDMgT0LU sH14zfqMh36l+WaJnIrrpDv4ybiTD8BBX+7uf8COuEcMLJ66SdJN+sCBr/0gnXnX3ul8UforC dDPSJ0YkMWnH2NZCodoZLj6AV0wpvfdEQZcC6us5jr+Mj2TWfgM43ONQWkAXO1MDS9RdJOsHd TJ7qGik1Fy7hUwYSm3nUTh1K2SE6DnvYy7/RNlPUFdHr3LEquAQGrRL0RvO1zzN7l1+/AO2P+ ao2lbAS8C53nvQetICSxcc= Received-SPF: none client-ip=212.227.17.10; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Laurent Vivier , David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson This is an unnecessary complication since we only support 64-bit mode. Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand Message-Id: <20210428193408.233706-4-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/s390x/signal.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) -- 2.31.1 diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c index fece8ab97b3c..1dfca71fa9b2 100644 --- a/linux-user/s390x/signal.c +++ b/linux-user/s390x/signal.c @@ -31,7 +31,6 @@ #define _SIGCONTEXT_NSIG_BPW 64 /* FIXME: 31-bit mode -> 32 */ #define _SIGCONTEXT_NSIG_WORDS (_SIGCONTEXT_NSIG / _SIGCONTEXT_NSIG_BPW) #define _SIGMASK_COPY_SIZE (sizeof(unsigned long)*_SIGCONTEXT_NSIG_WORDS) -#define PSW_ADDR_AMODE 0x0000000000000000UL /* 0x80000000UL for 31-bit */ #define S390_SYSCALL_OPCODE ((uint16_t)0x0a00) typedef struct { @@ -148,11 +147,9 @@ void setup_frame(int sig, struct target_sigaction *ka, /* Set up to return from userspace. If provided, use a stub already in userspace. */ if (ka->sa_flags & TARGET_SA_RESTORER) { - env->regs[14] = (unsigned long) - ka->sa_restorer | PSW_ADDR_AMODE; + env->regs[14] = ka->sa_restorer; } else { - env->regs[14] = (frame_addr + offsetof(sigframe, retcode)) - | PSW_ADDR_AMODE; + env->regs[14] = frame_addr + offsetof(sigframe, retcode); __put_user(S390_SYSCALL_OPCODE | TARGET_NR_sigreturn, &frame->retcode); } @@ -162,7 +159,7 @@ void setup_frame(int sig, struct target_sigaction *ka, /* Set up registers for signal handler */ env->regs[15] = frame_addr; - env->psw.addr = (target_ulong) ka->_sa_handler | PSW_ADDR_AMODE; + env->psw.addr = ka->_sa_handler; env->regs[2] = sig; //map_signal(sig); env->regs[3] = frame_addr += offsetof(typeof(*frame), sc); @@ -210,10 +207,9 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, /* Set up to return from userspace. If provided, use a stub already in userspace. */ if (ka->sa_flags & TARGET_SA_RESTORER) { - env->regs[14] = ka->sa_restorer | PSW_ADDR_AMODE; + env->regs[14] = ka->sa_restorer; } else { - env->regs[14] = (frame_addr + offsetof(typeof(*frame), retcode)) - | PSW_ADDR_AMODE; + env->regs[14] = frame_addr + offsetof(typeof(*frame), retcode); __put_user(S390_SYSCALL_OPCODE | TARGET_NR_rt_sigreturn, &frame->retcode); } @@ -223,7 +219,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, /* Set up registers for signal handler */ env->regs[15] = frame_addr; - env->psw.addr = (target_ulong) ka->_sa_handler | PSW_ADDR_AMODE; + env->psw.addr = ka->_sa_handler; env->regs[2] = sig; //map_signal(sig); env->regs[3] = frame_addr + offsetof(typeof(*frame), info); @@ -248,7 +244,6 @@ restore_sigregs(CPUS390XState *env, target_sigregs *sc) trace_user_s390x_restore_sigregs(env, (unsigned long long)sc->regs.psw.addr, (unsigned long long)env->psw.addr); __get_user(env->psw.addr, &sc->regs.psw.addr); - /* FIXME: 31-bit -> | PSW_ADDR_AMODE */ for (i = 0; i < 16; i++) { __get_user(env->aregs[i], &sc->regs.acrs[i]);