From patchwork Tue Jul 26 03:50:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rolnik X-Patchwork-Id: 652573 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 3rz45s702Bz9t1S for ; Tue, 26 Jul 2016 13:55:29 +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=WG6CA9u9; dkim-atps=neutral Received: from localhost ([::1]:37277 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRtSq-0008QB-1I for incoming@patchwork.ozlabs.org; Mon, 25 Jul 2016 23:55:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRtOO-0004at-5i for qemu-devel@nongnu.org; Mon, 25 Jul 2016 23:50:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bRtOM-0001RS-7W for qemu-devel@nongnu.org; Mon, 25 Jul 2016 23:50:51 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:36416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRtOM-0001RK-0Q for qemu-devel@nongnu.org; Mon, 25 Jul 2016 23:50:50 -0400 Received: by mail-wm0-x243.google.com with SMTP id x83so19371740wma.3 for ; Mon, 25 Jul 2016 20:50:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+JO1KfqOlRFO5lhKVw2enuZgONSwVt1Oc5aWWALm41w=; b=WG6CA9u9vLXlHu84igVvNrlMPaMh9ySKk0FJFHmI4+b12Be19XyzDdm76LJYsKTSI8 RMHuMNQLY6TCvniv1IRxAw9UPQvpyavxZzQt0gEKXUsohfBcOlawUH17WsGwEY5nG11Q 7xwI8BEtgH0g+E785eNtzICwwuUQGxVaK7D1izSJYCVUqRL19mabn5FzdcByNNSL3TqV OtqgYUApaENPjiygPWIxbemjBuaoYkRchbCfU27JXK7oPlzeMNeEToMFc7SjXBuzGLBT VHOsV0zhxlJ2AIDdzZ3kz+VJlZd5wEuoUsOc6jjlRZSX9J2OxKUPWearcA9tCWhkhntk k25g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+JO1KfqOlRFO5lhKVw2enuZgONSwVt1Oc5aWWALm41w=; b=fEwdtmLiUT0lvrpjbbhrxcdKiimhCJF8g4zctFlc5bGpsO1TqWR6DZ8O7RzfhOr/Ii 6kiYV18dGvpSyNheTY3FgIRDTWqMli1I3QLaa0orYimSR9+F+i1ahjqNuCaZ56DTZSjs wcgtWXi7jBTQJ9ozPVXxabixbjBJ0hfCj9M1VZmxe9nB8xQYff+7IvhbTjk0JSm2NPBu XxEXA8AqYpfMY50fHWAoK7ROJEvA7Ebgxa+tfuhmAglC2yxVbqPkjGbqD4Gf7g1MuH7x g36IbPCzBqSobCDt/c69rGlj2icxl9QDkJIQbkh/XX7vJE0qsUiBm0UDid6L8jMzOZEL yzgg== X-Gm-Message-State: AEkoousyMBMO2+S95kEa37EFGBSDp0aUxgzXR5DgrVgRFPTW3sN6JXKDxNRXDif1OuYhaQ== X-Received: by 10.194.70.68 with SMTP id k4mr20966540wju.59.1469505049365; Mon, 25 Jul 2016 20:50:49 -0700 (PDT) Received: from a0999b0126e1.ant.amazon.com ([31.210.187.232]) by smtp.gmail.com with ESMTPSA id g8sm18860757wjj.48.2016.07.25.20.50.48 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Jul 2016 20:50:48 -0700 (PDT) From: Michael Rolnik To: qemu-devel@nongnu.org Date: Tue, 26 Jul 2016 06:50:10 +0300 Message-Id: <1469505014-62480-6-git-send-email-mrolnik@gmail.com> X-Mailer: git-send-email 2.4.9 (Apple Git-60) In-Reply-To: <1469505014-62480-1-git-send-email-mrolnik@gmail.com> References: <1469505014-62480-1-git-send-email-mrolnik@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH v13 5/9] target-avr: adding AVR interrupt handling 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@linaro.org, Michael Rolnik , rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Michael Rolnik --- target-avr/helper.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/target-avr/helper.c b/target-avr/helper.c index 3984fc8..1e5d97d 100644 --- a/target-avr/helper.c +++ b/target-avr/helper.c @@ -31,11 +31,68 @@ bool avr_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { - return false; + CPUClass *cc = CPU_GET_CLASS(cs); + AVRCPU *cpu = AVR_CPU(cs); + CPUAVRState *env = &cpu->env; + + bool ret = false; + + if (interrupt_request & CPU_INTERRUPT_RESET) { + if (cpu_interrupts_enabled(env)) { + cs->exception_index = EXCP_RESET; + cc->do_interrupt(cs); + + cs->interrupt_request &= ~CPU_INTERRUPT_RESET; + + ret = true; + } + } + if (interrupt_request & CPU_INTERRUPT_HARD) { + if (cpu_interrupts_enabled(env) && env->intsrc != 0) { + int index = ctz32(env->intsrc); + cs->exception_index = EXCP_INT(index); + cc->do_interrupt(cs); + + env->intsrc &= env->intsrc - 1; /* clear the interrupt */ + cs->interrupt_request &= ~CPU_INTERRUPT_HARD; + + ret = true; + } + } + return ret; } void avr_cpu_do_interrupt(CPUState *cs) { + AVRCPU *cpu = AVR_CPU(cs); + CPUAVRState *env = &cpu->env; + + uint32_t ret = env->pc_w; + int vector = 0; + int size = avr_feature(env, AVR_FEATURE_JMP_CALL) ? 2 : 1; + int base = 0; /* TODO: where to get it */ + + if (cs->exception_index == EXCP_RESET) { + vector = 0; + } else if (env->intsrc != 0) { + vector = ctz32(env->intsrc) + 1; + } + + if (avr_feature(env, AVR_FEATURE_3_BYTE_PC)) { + stb_phys(cs->as, env->sp--, (ret & 0x0000ff)); + stb_phys(cs->as, env->sp--, (ret & 0x00ff00) >> 8); + stb_phys(cs->as, env->sp--, (ret & 0xff0000) >> 16); + } else if (avr_feature(env, AVR_FEATURE_2_BYTE_PC)) { + stb_phys(cs->as, env->sp--, (ret & 0x0000ff)); + stb_phys(cs->as, env->sp--, (ret & 0x00ff00) >> 8); + } else { + stb_phys(cs->as, env->sp--, (ret & 0x0000ff)); + } + + env->pc_w = base + vector * size; + env->sregI = 0; /* clear Global Interrupt Flag */ + + cs->exception_index = -1; } int avr_cpu_memory_rw_debug(CPUState *cs, vaddr addr, uint8_t *buf,