From patchwork Tue Jun 14 18:09:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rolnik X-Patchwork-Id: 635471 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 3rTdGZ749Yz9t1W for ; Wed, 15 Jun 2016 04:19:50 +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=QDtlWLz/; dkim-atps=neutral Received: from localhost ([::1]:37340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCswG-0003sl-M8 for incoming@patchwork.ozlabs.org; Tue, 14 Jun 2016 14:19:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCsmm-0002lf-A0 for qemu-devel@nongnu.org; Tue, 14 Jun 2016 14:10:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCsmi-00019s-1J for qemu-devel@nongnu.org; Tue, 14 Jun 2016 14:09:59 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:32848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCsmh-00019Y-R6 for qemu-devel@nongnu.org; Tue, 14 Jun 2016 14:09:55 -0400 Received: by mail-wm0-x242.google.com with SMTP id r5so413456wmr.0 for ; Tue, 14 Jun 2016 11:09:55 -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=duuyAHzCbhgtWmpBL7Fr31edt3LFwLL+R4Kqfi29+g0=; b=QDtlWLz/PLaRoxJREgn3DDXFugIubMSwJO7XyJzLeRu24uYmXgw+atnC9PYyZc5elr DQU636kUQtD/qx0dgzbGYPKTnEKYdML1przsv15eAhOQpZrP08MqgiYxE20NeF34HnoN u1u+0298IDd1VD/hl5leR/T/g1F3PTytKBPSMqIVrycVSSpvaaRW1kFPgE3xHbCcLPOI idFcVHNh8S4QzHd4TSAI2zY5ZFlZZxNI7O+HelK6PpsXccjJ7JIy/iQsny8UoeLba6dM KbPDRsf/6rfSA2Q8hXsbZ4i9cECUd6yZLtnm5kmbU6cNAyQkMFy8Ggjzl4azCwxTxFDt oj8g== 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=duuyAHzCbhgtWmpBL7Fr31edt3LFwLL+R4Kqfi29+g0=; b=NqiNUP7asZqvBJvh5RD/OPUVuseLvZ+FgjbC4smnf6DiyFPKGl1cEb7RTkukXBOyfs jIf/gy7Yed7xg0VRwSuvCFXzkE0Pe6b5hOhvkFvk/n7aHZGjyALdBgiMEIjsoeK2CHAx p1n3idhZPDhk35TNuPDWYTKiWo5q3/sbdRi3SrVGtggMmsb67gJrnHFqnVREFtUH46E5 gtKV9g/HcRRSuoLPrAsojXDK9WLiHdr/H3JUoCXghYqmqbMlje6Elf78NEy5vm/pgMo7 dmcf/Ix1GfDBmzssJoCRHTBBuRVuWx6su8kjlgCUGjdPPEQVdB6jQfS4kLIL8JtGj+OE X4wA== X-Gm-Message-State: ALyK8tIHacEEry0msAv0iO5USuferNgZdIA/A1XBEmg8hxbV/3XhRrS7BfHJUz1faz85XQ== X-Received: by 10.194.90.177 with SMTP id bx17mr7395808wjb.107.1465927795165; Tue, 14 Jun 2016 11:09:55 -0700 (PDT) Received: from a0999b0126e1.ant.amazon.com ([5.102.195.79]) by smtp.gmail.com with ESMTPSA id el4sm1443037wjd.23.2016.06.14.11.09.53 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Jun 2016 11:09:54 -0700 (PDT) From: Michael Rolnik To: qemu-devel@nongnu.org Date: Tue, 14 Jun 2016 21:09:32 +0300 Message-Id: <1465927779-83200-6-git-send-email-mrolnik@gmail.com> X-Mailer: git-send-email 2.4.9 (Apple Git-60) In-Reply-To: <1465927779-83200-1-git-send-email-mrolnik@gmail.com> References: <1465927779-83200-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::242 Subject: [Qemu-devel] [PATCH v7 05/12] 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 ad8f83e..f96fa27 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,