Commit b6fb3a89 authored by Oran Avraham's avatar Oran Avraham Committed by Peter Maydell
Browse files

armv7m_nvic: fix AIRCR implementation 



The returned reset value was wrong (off by one zero nibble), and
qemu didn't log unimplemented writes to the PRIGROUP field.

Signed-off-by: default avatarOran Avraham <oranav@gmail.com>
Message-id: 1403010447-4627-1-git-send-email-oranav@gmail.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 06955739

hw/intc/armv7m_nvic.c

+4 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static uint32_t nvic_readl(nvic_state *s, uint32_t offset) 
        cpu = ARM_CPU(current_cpu);

        return cpu->env.v7m.vecbase;

    case 0xd0c: /* Application Interrupt/Reset Control.  */

        return 0xfa05000;

        return 0xfa050000;

    case 0xd10: /* System Control.  */

        /* TODO: Implement SLEEPONEXIT.  */

        return 0;
@@ -346,6 +346,9 @@ static void nvic_writel(nvic_state *s, uint32_t offset, uint32_t value) 
            if (value & 5) {

                qemu_log_mask(LOG_UNIMP, "AIRCR system reset unimplemented\n");

            }

            if (value & 0x700) {

                qemu_log_mask(LOG_UNIMP, "PRIGROUP unimplemented\n");

            }

        }

        break;

    case 0xd10: /* System Control.  */