From patchwork Fri Jul 1 14:47:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rolnik X-Patchwork-Id: 643070 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 3rgzzC2Qt5z9s9c for ; Sat, 2 Jul 2016 00:57:27 +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=kaSW+hXu; dkim-atps=neutral Received: from localhost ([::1]:33871 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIzsj-0004Ft-2U for incoming@patchwork.ozlabs.org; Fri, 01 Jul 2016 10:57:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIzjU-0007t1-4n for qemu-devel@nongnu.org; Fri, 01 Jul 2016 10:47:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bIzjR-0003wN-1O for qemu-devel@nongnu.org; Fri, 01 Jul 2016 10:47:51 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:34801) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIzjQ-0003wF-NL for qemu-devel@nongnu.org; Fri, 01 Jul 2016 10:47:48 -0400 Received: by mail-wm0-x244.google.com with SMTP id 187so5850559wmz.1 for ; Fri, 01 Jul 2016 07:47:48 -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=k1TgdE+PusiX2D97r9wIOnSWGJJs4AcQJXvB6PR5tfA=; b=kaSW+hXuueULy2kMB+2YlOtxP+UXFdLvwlEDKIYDII4gsKjqP8Vs5uKHBKs4ltL99e oWgPdvm9REIhrbT16QlnU8IRvB7u0BIgq40BaTSMuMM/1taQHpo/Afbj59eRLD3PaHgv wbdIv+AfN2wo4Rnwuzu0XdYKwyalKJ0DjQr1H6B3nIJA87IiHBAfC/wnmbAEKa2+pset Fofg3/q4Y1HkYeaMNtTUaF02iaVeQGaM2+CnuE808GHcas72XNeBIDrH/9iDTkxywdY4 pNLbukmW1hkGKvIZmQZy4TvEWMUjkMPhmvzVU9FYaP/QpUgVsfVD7sGaN3nJio4tBOvJ Kllg== 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=k1TgdE+PusiX2D97r9wIOnSWGJJs4AcQJXvB6PR5tfA=; b=HMcZ8C/zY+AeSl08hnM/cVJTOlyR0xSm/arrsyGoYTa+b7C4Smh1AULccAmyFo1CeH az0dUjNxlKTcLYMZyU7mSEzjntbpshB3K7eai+aIkk2MPCp9UjB0DCbLlQPLvhMljhaM en8ssv4EjEzR7CFhDOZyuSOqmd/2mDgny1+pTB+Uf63+RVa4r8vTuByICT6yLrer5rqz LvC1CKPqUpE93zW8bNGVa46z1vT6NnmTx9mvTwY63Uc1Ls0crCQYVOF83dJwa0tsgrWH 6aMmjhbESSPEdLBAXpuvo/q5Faeeffgku9qV8oCE/nFA0WaKfsnrrUKxRA+CZWweI8gw QzZA== X-Gm-Message-State: ALyK8tIDBQhLAwVgtIE/JKRex+qpx6Gr2IDCWuhWngxvRuApI+ACrE79bSLkE8TIWubOFw== X-Received: by 10.28.47.207 with SMTP id v198mr4737085wmv.40.1467384468010; Fri, 01 Jul 2016 07:47:48 -0700 (PDT) Received: from a0999b0126e1.ant.amazon.com ([5.102.195.79]) by smtp.gmail.com with ESMTPSA id xs9sm87128wjc.11.2016.07.01.07.47.46 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Jul 2016 07:47:47 -0700 (PDT) From: Michael Rolnik To: qemu-devel@nongnu.org Date: Fri, 1 Jul 2016 17:47:26 +0300 Message-Id: <1467384450-7267-7-git-send-email-mrolnik@gmail.com> X-Mailer: git-send-email 2.4.9 (Apple Git-60) In-Reply-To: <1467384450-7267-1-git-send-email-mrolnik@gmail.com> References: <1467384450-7267-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::244 Subject: [Qemu-devel] [PATCH v9 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: 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 | 222 +++++++++++++++++++++++++++++++++++++++++++++++++--- target-avr/helper.h | 6 ++ 2 files changed, 215 insertions(+), 13 deletions(-) diff --git a/target-avr/helper.c b/target-avr/helper.c index 060b2f0..1a324cb 100644 --- a/target-avr/helper.c +++ b/target-avr/helper.c @@ -42,14 +42,14 @@ bool avr_cpu_exec_interrupt(CPUState *cs, int interrupt_request) cs->exception_index = EXCP_RESET; cc->do_interrupt(cs); - cs->interrupt_request &= ~CPU_INTERRUPT_RESET; + 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); + int index = ctz32(env->intsrc); cs->exception_index = EXCP_INT(index); cc->do_interrupt(cs); @@ -64,8 +64,8 @@ bool avr_cpu_exec_interrupt(CPUState *cs, int interrupt_request) void avr_cpu_do_interrupt(CPUState *cs) { - AVRCPU *cpu = AVR_CPU(cs); - CPUAVRState *env = &cpu->env; + AVRCPU *cpu = AVR_CPU(cs); + CPUAVRState *env = &cpu->env; uint32_t ret = env->pc_w; int vector = 0; @@ -79,14 +79,14 @@ void avr_cpu_do_interrupt(CPUState *cs) } 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); + cpu_stb_data(env, env->sp--, (ret & 0x0000ff)); + cpu_stb_data(env, env->sp--, (ret & 0x00ff00) >> 8); + cpu_stb_data(env, 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); + cpu_stb_data(env, env->sp--, (ret & 0x0000ff)); + cpu_stb_data(env, env->sp--, (ret & 0x00ff00) >> 8); } else { - stb_phys(cs->as, env->sp--, (ret & 0x0000ff)); + cpu_stb_data(env, env->sp--, (ret & 0x0000ff)); } env->pc_w = base + vector * size; @@ -124,15 +124,55 @@ void tlb_fill(CPUState *cs, target_ulong vaddr, int is_write, vaddr &= TARGET_PAGE_MASK; if (mmu_idx == MMU_CODE_IDX) { - paddr = PHYS_BASE_CODE + vaddr; + paddr = PHYS_BASE_CODE + vaddr - VIRT_BASE_CODE; prot = PAGE_READ | PAGE_EXEC; } else { - paddr = PHYS_BASE_DATA + vaddr; - prot = PAGE_READ | PAGE_WRITE; +#if VIRT_BASE_REGS == 0 + if (vaddr < VIRT_BASE_REGS + SIZE_REGS) { +#else + if (VIRT_BASE_REGS <= vaddr && vaddr < VIRT_BASE_REGS + SIZE_REGS) { +#endif + /* + this is a write into CPU registers, exit and rebuilt this TB + to use full write + */ + AVRCPU *cpu = AVR_CPU(cs); + CPUAVRState *env = &cpu->env; + env->fullwr = 1; + cpu_loop_exit_restore(cs, retaddr); + } else { + /* + this is a write into memory. nothing special + */ + paddr = PHYS_BASE_DATA + vaddr - VIRT_BASE_DATA; + prot = PAGE_READ | PAGE_WRITE; + } } 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)); + + /* + I count not find what happens on the real platform, so + it's EXCP_DEBUG for meanwhile + */ + cs->exception_index = EXCP_DEBUG; + if (qemu_loglevel_mask(LOG_UNIMP)) { + qemu_log("UNSUPPORTED\n"); + cpu_dump_state(cs, qemu_logfile, fprintf, 0); + } + cpu_loop_exit(cs); +} void helper_debug(CPUAVRState *env) { @@ -142,3 +182,159 @@ void helper_debug(CPUAVRState *env) cpu_loop_exit(cs); } +void helper_wdr(CPUAVRState *env) +{ + CPUState *cs = CPU(avr_env_get_cpu(env)); + + /* + WD is not implemented yet, placeholder + */ + cs->exception_index = EXCP_DEBUG; + cpu_loop_exit(cs); +} + +target_ulong helper_inb(CPUAVRState *env, uint32_t port) +{ + target_ulong data = 0; + + switch (port) { + case 0x38: { + data = 0xff & (env->rampD >> 16); /* RAMPD */ + break; + } + case 0x39: { + data = 0xff & (env->rampX >> 16); /* RAMPX */ + break; + } + case 0x3a: { + data = 0xff & (env->rampY >> 16); /* RAMPY */ + break; + } + case 0x3b: { + data = 0xff & (env->rampZ >> 16); /* RAMPZ */ + break; + } + case 0x3c: { + data = 0xff & (env->eind >> 16); /* EIND */ + break; + } + case 0x3d: { /* SPL */ + data = env->sp & 0x00ff; + break; + } + case 0x3e: { /* SPH */ + data = env->sp >> 8; + break; + } + case 0x3f: { /* SREG */ + data = cpu_get_sreg(env); + break; + } + default: { + /* + CPU does not know how to read this register, pass it to the + device/board + */ + + cpu_physical_memory_read(PHYS_BASE_REGS + port + OFFS_IOREGS, + &data, 1); + } + } + + if (port < IO_REGS) { + env->io[port] = data; /* make a copy for SBI, SBIC, SBIS & CBI */ + } + + return data; +} + +void helper_fullwr(CPUAVRState *env, uint32_t data, uint32_t addr) +{ +#if VIRT_BASE_REGS == 0 + if (addr <= VIRT_BASE_REGS + SIZE_REGS) { +#else + if (VIRT_BASE_REGS <= addr && addr <= VIRT_BASE_REGS + SIZE_REGS) { +#endif + /* + write CPU REGS/IO REGS/EXT IO REGS + */ + cpu_physical_memory_write(PHYS_BASE_REGS + addr - VIRT_BASE_REGS, + &data, 1); + } else { + /* + write memory + */ + cpu_physical_memory_write(PHYS_BASE_DATA + addr - VIRT_BASE_DATA, + &data, 1); + } +} + +void helper_outb(CPUAVRState *env, uint32_t port, uint32_t data) +{ + 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 0x38: { + if (avr_feature(env, AVR_FEATURE_RAMPD)) { + env->rampD = (data & 0xff) << 16; /* RAMPD */ + } + break; + } + case 0x39: { + if (avr_feature(env, AVR_FEATURE_RAMPX)) { + env->rampX = (data & 0xff) << 16; /* RAMPX */ + } + break; + } + case 0x3a: { + if (avr_feature(env, AVR_FEATURE_RAMPY)) { + env->rampY = (data & 0xff) << 16; /* RAMPY */ + } + break; + } + case 0x3b: { + if (avr_feature(env, AVR_FEATURE_RAMPZ)) { + env->rampZ = (data & 0xff) << 16; /* RAMPZ */ + } + break; + } + case 0x3c: { + env->eind = (data & 0xff) << 16; /* EIDN */ + break; + } + case 0x3d: { /* SPL */ + env->sp = (env->sp & 0xff00) | (data); + break; + } + case 0x3e: { /* SPH */ + if (avr_feature(env, AVR_FEATURE_2_BYTE_SP)) { + env->sp = (env->sp & 0x00ff) | (data << 8); + } + break; + } + case 0x3f: { /* SREG */ + cpu_set_sreg(env, data); + break; + } + default: { + /* + CPU does not know how to write this register, pass it to the + device/board + */ + cpu_physical_memory_write(PHYS_BASE_REGS + port + OFFS_IOREGS, + &data, 1); + } + } + + if (port < IO_REGS) { + env->io[port] = data; /* make a copy for SBI, SBIC, SBIS & CBI */ + } +} + diff --git a/target-avr/helper.h b/target-avr/helper.h index b5ef3bf..19e0ab7 100644 --- a/target-avr/helper.h +++ b/target-avr/helper.h @@ -18,4 +18,10 @@ * */ +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) +DEF_HELPER_3(fullwr, void, env, i32, i32)