From patchwork Thu Jun 2 20:04:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rolnik X-Patchwork-Id: 9151127 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4B19E60751 for ; Thu, 2 Jun 2016 20:05:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35D9328327 for ; Thu, 2 Jun 2016 20:05:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A7DF28329; Thu, 2 Jun 2016 20:05:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7DA1028327 for ; Thu, 2 Jun 2016 20:05:00 +0000 (UTC) Received: from localhost ([::1]:50071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8YrS-0003Pr-HC for patchwork-qemu-devel@patchwork.kernel.org; Thu, 02 Jun 2016 16:04:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8Yqx-0003Pa-KB for qemu-devel@nongnu.org; Thu, 02 Jun 2016 16:04:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8Yqw-0003B7-2M for qemu-devel@nongnu.org; Thu, 02 Jun 2016 16:04:27 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:36569) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8Yqv-0003Ad-Or for qemu-devel@nongnu.org; Thu, 02 Jun 2016 16:04:26 -0400 Received: by mail-wm0-x244.google.com with SMTP id a20so7023699wma.3 for ; Thu, 02 Jun 2016 13:04:25 -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=AZS6xYdvraabJbKxjuUg2B1RMc+/zk+HSgIeYyx6+RI=; b=jqEbswEZuf09PDaNyOJDjcXfp59KZMIatpqEhi0K26hpweit2aEq0k9U05YX79NAhT hxVET1oKomeBKsWjUdKv0OQ+FJBwT7h0z9TY7LHdScaDH4/MftYJRlWl6z0ogRw9lP99 JSg7/SIKol+nwuHo8UgzLhy+qJ680ColSFWr84DQ5N7NIFwx0MTqGRkeCtuuEUHhDNCk RVGR08zUQFcLTYOLZ4zJXXVZFlpMR7NNWBT9TzYJeCvqvYMtEWVQWGCk2E0shv27uPXh Pzn8C0/GaRzkHbUaSUZ4SSFEQKJlmbyOtx3XtYE3+Q/PEFT/Xv71xbgAM3JaHPzbBcUe UwUA== 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=AZS6xYdvraabJbKxjuUg2B1RMc+/zk+HSgIeYyx6+RI=; b=X09yMvtc8GEeCGPdKLIiUrrdZ6mswfg2AvPfiAX6z74wfUhD3Iyyu9Ar1uAKfZl5zJ NJxFMHD8S9maH2GS4E9myI/Xqg5D4irEPyo6fzBKHeENCzjZITL7JoynZ+XuqN45HPqJ Xe+lzJYqLqgRmyi9Yj6zqNrQMFn4PoV+pysNqIrZ6IxhcJRKzCo2UE7Dz3wKm2fwYd+a LcjmhnAaUF6pe6KO+5kSWnHFu6DUwPKJWivueVhB1bqAYuXlC2Ax4Ks5glbSyeVLCJM7 ed7j+7EK8C3U2r5qFAe9ldKTCsjOPt7F42lmKw55oc+5QGSJXZtduz5fH0IGT+7Ta3qe oBFA== X-Gm-Message-State: ALyK8tKsBWWHMl8v15jFSJlAqPsSZiwIoxFcqL4JoEwnvUyOK2/VJcLbv2Jcwn0QGiC7/A== X-Received: by 10.194.125.210 with SMTP id ms18mr10266960wjb.163.1464897865133; Thu, 02 Jun 2016 13:04:25 -0700 (PDT) Received: from a0999b0126e1.ant.amazon.com ([94.230.86.227]) by smtp.gmail.com with ESMTPSA id lf9sm2114488wjc.44.2016.06.02.13.04.23 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 02 Jun 2016 13:04:24 -0700 (PDT) From: Michael Rolnik X-Google-Original-From: Michael Rolnik To: qemu-devel@nongnu.org Date: Thu, 2 Jun 2016 23:04:02 +0300 Message-Id: <1464897846-97364-6-git-send-email-rolnik@amazon.com> X-Mailer: git-send-email 2.4.9 (Apple Git-60) In-Reply-To: <1464897846-97364-1-git-send-email-rolnik@amazon.com> References: <1464897846-97364-1-git-send-email-rolnik@amazon.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PATCH 06/10] target-avr: adding helpers for IN, OUT, SLEEP, WBR & unsupported instructions 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: Michael Rolnik , Michael Rolnik Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Michael Rolnik --- target-avr/helper.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++ target-avr/helper.h | 5 +++ 2 files changed, 108 insertions(+) diff --git a/target-avr/helper.c b/target-avr/helper.c index ed22b37..450f598 100644 --- a/target-avr/helper.c +++ b/target-avr/helper.c @@ -155,6 +155,23 @@ void tlb_fill( tlb_set_page_with_attrs(cs, vaddr, paddr, attrs, prot, mmu_idx, page_size); } +void helper_sleep( + CPUAVRState *env) +{ + CPUState *cs = CPU(avr_env_get_cpu(env)); + + cs->exception_index = EXCP_HLT; + cpu_loop_exit(cs); +} +void helper_unsupported( + CPUAVRState *env) +{ + CPUState *cs = CPU(avr_env_get_cpu(env)); + + cs->exception_index = EXCP_DEBUG; + cpu_dump_state(cs, stderr, fprintf, 0); + cpu_loop_exit(cs); +} void helper_debug( CPUAVRState *env) @@ -165,3 +182,89 @@ void helper_debug( cpu_loop_exit(cs); } +void helper_wdr( + CPUAVRState *env) +{ + CPUState *cs = CPU(avr_env_get_cpu(env)); + + cs->exception_index = EXCP_DEBUG; + cpu_loop_exit(cs); +} + +target_ulong helper_inb( + CPUAVRState *env, + uint32_t port) +{ + printf("in: io[%02x]\n", port); + + switch (port) { + case 0x3b: { + return env->rampZ; /* RAMPZ */ + } + case 0x3d: { /* SPL */ + return env->sp & 0x00ff; + } + case 0x3e: { /* SPH */ + return env->sp >> 8; + } + case 0x3f: { /* SREG */ + uint8_t sreg; + sreg = (env->sregC & 0x01) << 0 + | (env->sregZ & 0x01) << 1 + | (env->sregN & 0x01) << 2 + | (env->sregV & 0x01) << 3 + | (env->sregS & 0x01) << 4 + | (env->sregH & 0x01) << 5 + | (env->sregT & 0x01) << 6 + | (env->sregI & 0x01) << 7; + return sreg; + } + } + return 0; +} + +void helper_outb( + CPUAVRState *env, + uint32_t port, + uint32_t data) +{ + printf("out:%02x -> io[%02x]\n", data, port); + + data &= 0x000000ff; + + switch (port) { + case 0x04: { + qemu_irq irq; + CPUState *cpu = CPU(avr_env_get_cpu(env)); + irq = qdev_get_gpio_in(DEVICE(cpu), 3); + qemu_set_irq(irq, 1); + break; + } + case 0x3b: { + env->rampZ = data & 0x01; /* RAMPZ */ + break; + } + case 0x3d: { /* SPL */ + if (avr_feature(env, AVR_FEATURE_2_BYTE_SP)) { + env->sp = (env->sp & 0xff00) | (data); + } + break; + } + case 0x3e: { /* SPH */ + env->sp = (env->sp & 0x00ff) | (data << 8); + break; + } + case 0x3f: { /* SREG */ + env->sregC = (data >> 0) & 0x01; + env->sregZ = (data >> 1) & 0x01; + env->sregN = (data >> 2) & 0x01; + env->sregV = (data >> 3) & 0x01; + env->sregS = (data >> 4) & 0x01; + env->sregH = (data >> 5) & 0x01; + env->sregT = (data >> 6) & 0x01; + env->sregI = (data >> 7) & 0x01; + break; + } + } +} + diff --git a/target-avr/helper.h b/target-avr/helper.h index 017e076..5a08cfd 100644 --- a/target-avr/helper.h +++ b/target-avr/helper.h @@ -18,4 +18,9 @@ * */ +DEF_HELPER_1(wdr, void, env) DEF_HELPER_1(debug, void, env) +DEF_HELPER_1(sleep, void, env) +DEF_HELPER_1(unsupported, void, env) +DEF_HELPER_3(outb, void, env, i32, i32) +DEF_HELPER_2(inb, tl, env, i32)