From patchwork Mon Aug 3 15:43:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Froyd X-Patchwork-Id: 30650 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id A9D07B6F31 for ; Tue, 4 Aug 2009 04:44:48 +1000 (EST) Received: from localhost ([127.0.0.1]:49622 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MY2Wb-0001RD-L9 for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 14:44:45 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXzoR-0007Te-Ts for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:51:00 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXzoM-0007SS-No for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:50:59 -0400 Received: from [199.232.76.173] (port=44682 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXzoM-0007SH-Hr for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:50:54 -0400 Received: from mx20.gnu.org ([199.232.41.8]:50919) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MXzoM-0006sM-3P for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:50:54 -0400 Received: from mail.codesourcery.com ([65.74.133.4]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXzoL-0004wN-BA for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:50:53 -0400 Received: (qmail 20664 invoked from network); 3 Aug 2009 15:43:30 -0000 Received: from unknown (HELO localhost) (froydnj@127.0.0.2) by mail.codesourcery.com with ESMTPA; 3 Aug 2009 15:43:30 -0000 From: Nathan Froyd To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 08:43:27 -0700 Message-Id: <1249314209-10230-6-git-send-email-froydnj@codesourcery.com> X-Mailer: git-send-email 1.6.3.2 In-Reply-To: <1249314209-10230-1-git-send-email-froydnj@codesourcery.com> References: <1249314209-10230-1-git-send-email-froydnj@codesourcery.com> X-Detected-Operating-System: by mx20.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Subject: [Qemu-devel] [PATCH 5/7] linux-user: handle POWERPC_EXCP_STCX X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We handle conditional stores as an exception so we can ensure that no other thread is changing memory out from underneath us. Signed-off-by: Nathan Froyd --- linux-user/main.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 20a2576..bc903de 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -1060,6 +1060,63 @@ do { \ log_cpu_state(env, 0); \ } while (0) +static int do_store_exclusive(CPUPPCState *env) +{ + target_ulong addr; + target_ulong page_addr; + target_ulong val; + int flags; + int segv = 0; + + addr = env->reserve_ea; + page_addr = addr & TARGET_PAGE_MASK; + start_exclusive(); + mmap_lock(); + flags = page_get_flags(page_addr); + if ((flags & PAGE_READ) == 0) { + segv = 1; + } else { + int reg = env->reserve_info & 0x1f; + int size = (env->reserve_info >> 5) & 0xf; + int stored = 0; + + if (addr == env->reserve_addr) { + switch (size) { + case 1: segv = get_user_u8(val, addr); break; + case 2: segv = get_user_u16(val, addr); break; + case 4: segv = get_user_u32(val, addr); break; +#if defined(TARGET_PPC64) + case 8: segv = get_user_u64(val, addr); break; +#endif + default: abort(); + } + if (!segv && val == env->reserve_val) { + val = env->gpr[reg]; + switch (size) { + case 1: segv = put_user_u8(val, addr); break; + case 2: segv = put_user_u16(val, addr); break; + case 4: segv = put_user_u32(val, addr); break; +#if defined(TARGET_PPC64) + case 8: segv = put_user_u64(val, addr); break; +#endif + default: abort(); + } + if (!segv) { + stored = 1; + } + } + } + env->crf[0] = (stored << 1) | xer_so; + env->reserve_addr = (target_ulong)-1; + } + if (!segv) { + env->nip += 4; + } + mmap_unlock(); + end_exclusive(); + return segv; +} + void cpu_loop(CPUPPCState *env) { target_siginfo_t info; @@ -1067,7 +1124,9 @@ void cpu_loop(CPUPPCState *env) uint32_t ret; for(;;) { + cpu_exec_start(env); trapnr = cpu_ppc_exec(env); + cpu_exec_end(env); switch(trapnr) { case POWERPC_EXCP_NONE: /* Just go on */ @@ -1447,6 +1506,15 @@ void cpu_loop(CPUPPCState *env) printf("syscall returned 0x%08x (%d)\n", ret, ret); #endif break; + case POWERPC_EXCP_STCX: + if (do_store_exclusive(env)) { + info.si_signo = TARGET_SIGSEGV; + info.si_errno = 0; + info.si_code = TARGET_SEGV_MAPERR; + info._sifields._sigfault._addr = env->nip; + queue_signal(env, info.si_signo, &info); + } + break; case EXCP_DEBUG: { int sig;