Re: [Qemu-devel] [PATCH 6/7] nios2: Add Altera 10M50 GHRD emulation

[Dmitry Osipenko]

On 28.07.2016 15:27, Marek Vasut wrote:
> Add the Altera 10M50 Nios2 GHRD model. This allows emulating the
> 10M50 development kit with the Nios2 GHRD loaded in the FPGA. It
> is possible to boot Linux kernel and run userspace, thus far only
> from initrd as storage support is not yet implemented.
> 

[snip]

> +++ b/hw/nios2/cpu_pic.c

This file should be in the "Add architecture emulation support" patch.

> @@ -0,0 +1,74 @@
> +/*
> + * Altera Nios2 CPU PIC
> + *
> + * Copyright (c) 2016 Marek Vasut <address@hidden>
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library; if not, see
> + * <http://www.gnu.org/licenses/lgpl-2.1.html>
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qapi/error.h"
> +#include "qemu-common.h"
> +#include "cpu.h"
> +
> +#include "qemu/config-file.h"
> +
> +#include "boot.h"
> +
> +#define BINARY_DEVICE_TREE_FILE              "10m50-devboard.dtb"
> +
> +uint32_t irq_pending;
> +

Shouldn't "irq_pending" belong to the CPUNios2State?

> +static void nios2_pic_cpu_handler(void *opaque, int irq, int level)
> +{
> +    Nios2CPU *cpu = opaque;
> +    CPUNios2State *env = &cpu->env;
> +    CPUState *cs = CPU(cpu);
> +    int type = irq ? CPU_INTERRUPT_NMI : CPU_INTERRUPT_HARD;
> +
> +    if (type == CPU_INTERRUPT_HARD) {
> +        irq_pending = level;
> +
> +        if (level && (env->regs[CR_STATUS] & CR_STATUS_PIE)) {
> +            irq_pending = 0;
> +            cpu_interrupt(cs, type);
> +        } else if (!level) {
> +            irq_pending = 0;
> +            cpu_reset_interrupt(cs, type);
> +        }
> +    } else {
> +        if (level) {
> +            cpu_interrupt(cs, type);
> +        } else {
> +            cpu_reset_interrupt(cs, type);
> +        }
> +    }
> +}
> +
> +void nios2_check_interrupts(CPUNios2State *env)
> +{
> +    Nios2CPU *cpu = nios2_env_get_cpu(env);
> +    CPUState *cs = CPU(cpu);
> +
> +    if (irq_pending) {
> +        irq_pending = 0;
> +        cpu_interrupt(cs, CPU_INTERRUPT_HARD);
> +    }
> +}
> +
> +qemu_irq *nios2_cpu_pic_init(Nios2CPU *cpu)
> +{
> +    return qemu_allocate_irqs(nios2_pic_cpu_handler, cpu, 2);
> +}
> 


-- 
Dmitry