From patchwork Sun Jun 10 03:02:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 138165 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp2609726lji; Sat, 9 Jun 2018 21:07:10 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKEmfjQTF9619GBosTayOTz7iU0+qzHkcWpEfvZKVJxaO7J2mY+t9J906ZEgV+5ii5C2KyO X-Received: by 2002:a37:1828:: with SMTP id j40-v6mr10242943qkh.11.1528603630107; Sat, 09 Jun 2018 21:07:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528603630; cv=none; d=google.com; s=arc-20160816; b=i6czX/T9RoKGXjFmXcMmm4wBcFEGlXVmHZH05U4RX6lXsVdTM4UKD9WLHx/8hpca+t CbxsXvg7cF5/S9h6BjhzkJWjbsJM1RV6CstxzOWb8UU/NNtGr5Ly89CX472RNcSI3nCP pttxJa/lXg/F96taMA7KaRyqcMLX4tpJzkFeXa5D1h5gZn/28KMspwv/dN+Jof/j1aoa MymfJj0BNG+csvU2f++GD8c5PQBYuYAVqCCd/ZWQqDlqT/9fhEVhqOXp6PazcsVF+8jg 4J/JKLC4+8qa3z1AaxXH3cg7mK1kqF2ZOyamdAy6WoBczjpYQyUScaOgml2cmv/m2fwq zo/A== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=2+oq9sV0JJybo2xdAK23iHVaq5gw1X5Q+4LvwRCYT44=; b=kwXUGPrmpfB2vAoi3340GZDM2wT4iWi49JGNoz2d75HujR4ccCw8J7MhvyHNMX14Xl HNJdzEJpapAOkGZum+/MNDEtmrkLoirAvPIk6mi7xXFlihXhn7C6c9HuatgoKr6UDIzA OIrELZDpqYNeNI0QHW65Z/popJGuMDi8QY5ppRSxqGZ/GZHllnDimnBCWCcNByJrpbm+ 8X1+/KkWlPh7H+vEaX3AsN8F4CO6ZjJzwXV+kMrh3LFT0wNFqUnKMRhrPzW86Ix7j1zS wjmyNPFFgohl15yHQC3cL10Z/U6NleKFlFRN1lrpM1FXZJKrDudf+g1S8g7UxQhLsKBs TYPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gcWhpojH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k33-v6si568312qta.311.2018.06.09.21.07.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 09 Jun 2018 21:07:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gcWhpojH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRrdF-0001o8-FV for patch@linaro.org; Sun, 10 Jun 2018 00:07:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRqfd-0004KN-LA for qemu-devel@nongnu.org; Sat, 09 Jun 2018 23:05:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRqfa-0004aS-6F for qemu-devel@nongnu.org; Sat, 09 Jun 2018 23:05:33 -0400 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]:44111) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fRqfZ-0004ZG-UL for qemu-devel@nongnu.org; Sat, 09 Jun 2018 23:05:30 -0400 Received: by mail-pl0-x241.google.com with SMTP id z9-v6so10387849plk.11 for ; Sat, 09 Jun 2018 20:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2+oq9sV0JJybo2xdAK23iHVaq5gw1X5Q+4LvwRCYT44=; b=gcWhpojH64/t7ub6zkJ37k1w0FAK0z65gNuyuYyGlag9A2+9fR2OrKL7Tm5BSwjPAt OHpDJlZcsYFPEqe8Je384ajS8R41cEYQ91JW3XWk6y8lwS3cx8VAQIcuM8+LXQC5xlPR geg0G5jG/Ys9tvPUonXZHBTCJ6fYlOD//nv9w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2+oq9sV0JJybo2xdAK23iHVaq5gw1X5Q+4LvwRCYT44=; b=gJVdMelGi15rq3Cm9/vSUMvRu1gZh+CqRq9tOteA58/7VMWTTYZ96275fVYbOl+7gb X0z3iWyUUr2z3MokJxWWYiDyulq3e6prjL5dziv0atYegSa8alWkU2LQTZr+8XhejRz3 mo49I9QvCU2K+zch/IzLyklyUnLwIxla/Iy9SBpGwy4p6RJVv6Zu3O8M7fM7gH9ZqkIa qkleyp+8FQBWJ7IPzDxUNUSLRjGLec1RMch0Pth4YnNyzRSJa2TEul+dHl2Pjl3TpfJ5 ZZ7RoX9rK0TSCuQfHUfyl0UCtDkw6GnoWmUnIzYQ2oZFy6J4RiGpXpsb2I4d+3vLPWEe bnlg== X-Gm-Message-State: APt69E1I2mh0S88g8+UHzcrq6Kk/dALCkwLL48/MlGtGQqFQ7/H2HFEL qHs2NIqLNxVdZyIGAheKErWTDRlFavg= X-Received: by 2002:a17:902:760e:: with SMTP id k14-v6mr12934140pll.310.1528599928752; Sat, 09 Jun 2018 20:05:28 -0700 (PDT) Received: from cloudburst.twiddle.net (rrcs-173-198-77-219.west.biz.rr.com. [173.198.77.219]) by smtp.gmail.com with ESMTPSA id y17-v6sm31712718pfe.33.2018.06.09.20.05.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Jun 2018 20:05:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 9 Jun 2018 17:02:00 -1000 Message-Id: <20180610030220.3777-89-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180610030220.3777-1-richard.henderson@linaro.org> References: <20180610030220.3777-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::241 Subject: [Qemu-devel] [PATCH v2 088/108] linux-user: Split out getdomainname, get_thread_area, set_thread_area 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: laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- linux-user/syscall.c | 92 +++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 43 deletions(-) -- 2.17.1 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index c37af32bb6..285612dfe5 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -9029,6 +9029,21 @@ IMPL(getsockopt) } #endif +#ifdef TARGET_NR_get_thread_area +IMPL(get_thread_area) +{ +# if defined(TARGET_I386) && defined(TARGET_ABI32) + return do_get_thread_area(cpu_env, arg1); +# elif defined(TARGET_M68K) + CPUState *cpu = ENV_GET_CPU(cpu_env); + TaskState *ts = cpu->opaque; + return ts->tp_value; +# else + return -TARGET_ENOSYS; +# endif +} +#endif + IMPL(gettid) { return get_errno(gettid()); @@ -11480,6 +11495,31 @@ IMPL(setsockopt) } #endif +#ifdef TARGET_NR_set_thread_area +IMPL(set_thread_area) +{ +# if defined(TARGET_MIPS) + ((CPUMIPSState *) cpu_env)->active_tc.CP0_UserLocal = arg1; + return 0; +# elif defined(TARGET_CRIS) + if (arg1 & 0xff) { + return -TARGET_EINVAL; + } + ((CPUCRISState *) cpu_env)->pregs[PR_PID] = arg1; + return 0; +# elif defined(TARGET_I386) && defined(TARGET_ABI32) + return do_set_thread_area(cpu_env, arg1); +# elif defined(TARGET_M68K) + CPUState *cpu = ENV_GET_CPU(cpu_env); + TaskState *ts = cpu->opaque; + ts->tp_value = arg1; + return 0; +# else + return -TARGET_ENOSYS; +# endif +} +#endif + IMPL(settimeofday) { struct timeval tv; @@ -12464,49 +12504,6 @@ static abi_long do_syscall1(void *cpu_env, unsigned num, abi_long arg1, void *p; switch(num) { -#ifdef TARGET_NR_set_thread_area - case TARGET_NR_set_thread_area: -#if defined(TARGET_MIPS) - ((CPUMIPSState *) cpu_env)->active_tc.CP0_UserLocal = arg1; - return 0; -#elif defined(TARGET_CRIS) - if (arg1 & 0xff) - ret = -TARGET_EINVAL; - else { - ((CPUCRISState *) cpu_env)->pregs[PR_PID] = arg1; - ret = 0; - } - return ret; -#elif defined(TARGET_I386) && defined(TARGET_ABI32) - return do_set_thread_area(cpu_env, arg1); -#elif defined(TARGET_M68K) - { - TaskState *ts = cpu->opaque; - ts->tp_value = arg1; - return 0; - } -#else - return -TARGET_ENOSYS; -#endif -#endif -#ifdef TARGET_NR_get_thread_area - case TARGET_NR_get_thread_area: -#if defined(TARGET_I386) && defined(TARGET_ABI32) - return do_get_thread_area(cpu_env, arg1); -#elif defined(TARGET_M68K) - { - TaskState *ts = cpu->opaque; - return ts->tp_value; - } -#else - return -TARGET_ENOSYS; -#endif -#endif -#ifdef TARGET_NR_getdomainname - case TARGET_NR_getdomainname: - return -TARGET_ENOSYS; -#endif - #ifdef TARGET_NR_clock_settime case TARGET_NR_clock_settime: { @@ -13391,6 +13388,9 @@ static impl_fn *syscall_table(unsigned num) #if defined(TARGET_NR_getdents64) && defined(__NR_getdents64) SYSCALL(getdents64); #endif +#ifdef TARGET_NR_getdomainname + SYSCALL_WITH(getdomainname, enosys); +#endif #ifdef TARGET_NR_getegid SYSCALL(getegid); #endif @@ -13452,6 +13452,9 @@ static impl_fn *syscall_table(unsigned num) #endif #ifdef TARGET_NR_getsockopt SYSCALL(getsockopt); +#endif +#ifdef TARGET_NR_get_thread_area + SYSCALL(get_thread_area); #endif SYSCALL(gettid); SYSCALL(gettimeofday); @@ -13748,6 +13751,9 @@ static impl_fn *syscall_table(unsigned num) SYSCALL(setrlimit); #ifdef TARGET_NR_setsockopt SYSCALL(setsockopt); +#endif +#ifdef TARGET_NR_set_thread_area + SYSCALL(set_thread_area); #endif SYSCALL(settimeofday); SYSCALL(setsid);