From patchwork Mon Aug 24 16:17:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 510156 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 08A09140280 for ; Tue, 25 Aug 2015 02:26:07 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=P9o1ft2s; dkim-atps=neutral Received: from localhost ([::1]:55037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZTuZQ-00069J-Sa for incoming@patchwork.ozlabs.org; Mon, 24 Aug 2015 12:26:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZTuSW-0002dC-3D for qemu-devel@nongnu.org; Mon, 24 Aug 2015 12:19:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZTuSV-0002vX-4p for qemu-devel@nongnu.org; Mon, 24 Aug 2015 12:18:56 -0400 Received: from mail-qg0-x229.google.com ([2607:f8b0:400d:c04::229]:34180) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZTuSV-0002vL-01 for qemu-devel@nongnu.org; Mon, 24 Aug 2015 12:18:55 -0400 Received: by qgeg42 with SMTP id g42so90042765qge.1 for ; Mon, 24 Aug 2015 09:18:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=mK4pc0zSnrys3Gu6kLngx1QUzkJmr+fMZWY6rSMFa1U=; b=P9o1ft2sf/EksTBfZ0mKtV7lzmp7iYd3oICcjnxdgYfXnz3SEeoyjCV4l8aNbtRFTf 6SQgD85lAG3kfbFXrx/tZyjTBB0n6U7Vjoiu+7zDxXxBsc6YFKidKKwGn1pdBAItuhqH Pg4ysDUpW4o3myknjRS8z80ebX/zsYaLooJFSZrf+aHLhWDFPno5ViJwKCULKNZqywg2 4Csq2ieoJnY3GwELrZ8+p+hkredG2SLkn/Y9VYQR7KNy5wklG815BzTti3rUfn23sG2Q sBU5HbK97K8QSW/ZCAcC67TnO3p4mP4yi010K35bze9ewHBgmk3hhItPmQ5YjwSYrFk/ lrKg== X-Received: by 10.140.235.209 with SMTP id g200mr58044455qhc.80.1440433134587; Mon, 24 Aug 2015 09:18:54 -0700 (PDT) Received: from bigtime.com ([75.147.178.105]) by smtp.gmail.com with ESMTPSA id g76sm11445818qhc.33.2015.08.24.09.18.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Aug 2015 09:18:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 24 Aug 2015 09:17:38 -0700 Message-Id: <1440433079-14458-13-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1440433079-14458-1-git-send-email-rth@twiddle.net> References: <1440433079-14458-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::229 Cc: walt@tilera.com, cmetcalf@ezchip.com, xili_gchen_5257@hotmail.com, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH v14 12/33] target-tilegx: Generate SEGV properly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- linux-user/main.c | 3 +++ target-tilegx/cpu.c | 5 ++++- target-tilegx/cpu.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c index 2d4b0b4..5ca09d2 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3685,6 +3685,9 @@ void cpu_loop(CPUTLGState *env) case TILEGX_EXCP_REG_UDN_ACCESS: gen_sigill_reg(env); break; + case TILEGX_EXCP_SEGV: + gen_sigsegv_mapper(env, env->excaddr); + break; default: fprintf(stderr, "trapnr is %d[0x%x].\n", trapnr, trapnr); g_assert_not_reached(); diff --git a/target-tilegx/cpu.c b/target-tilegx/cpu.c index 87aee24..78b73e4 100644 --- a/target-tilegx/cpu.c +++ b/target-tilegx/cpu.c @@ -119,7 +119,10 @@ static void tilegx_cpu_do_interrupt(CPUState *cs) static int tilegx_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, int mmu_idx) { - cpu_dump_state(cs, stderr, fprintf, 0); + TileGXCPU *cpu = TILEGX_CPU(cs); + + cs->exception_index = TILEGX_EXCP_SEGV; + cpu->env.excaddr = address; return 1; } diff --git a/target-tilegx/cpu.h b/target-tilegx/cpu.h index 2c86cd3..3a62d20 100644 --- a/target-tilegx/cpu.h +++ b/target-tilegx/cpu.h @@ -60,6 +60,7 @@ enum { typedef enum { TILEGX_EXCP_NONE = 0, TILEGX_EXCP_SYSCALL = 1, + TILEGX_EXCP_SEGV = 2, TILEGX_EXCP_OPCODE_UNKNOWN = 0x101, TILEGX_EXCP_OPCODE_UNIMPLEMENTED = 0x102, TILEGX_EXCP_OPCODE_CMPEXCH = 0x103, @@ -87,6 +88,7 @@ typedef struct CPUTLGState { #if defined(CONFIG_USER_ONLY) uint32_t excparam; /* exception parameter */ + uint64_t excaddr; /* exception address */ #endif CPU_COMMON