Commit 63fb2590 authored by Blue Swirl's avatar Blue Swirl
Browse files

Merge branch 'target-arm.next' of git://git.linaro.org/people/pmaydell/qemu-arm 

* 'target-arm.next' of git://git.linaro.org/people/pmaydell/qemu-arm:
  target-arm: Fix SWI (SVC) instruction in M profile.
  target-arm: use type_register() instead of type_register_static()
parents 02e079c7 314e2296

target-arm/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ static void cpu_register(const ARMCPUInfo *info) 
        .class_size = sizeof(ARMCPUClass),

    };



    type_register_static(&type_info);

    type_register(&type_info);

}



static const TypeInfo arm_cpu_type_info = {

target-arm/helper.c

+1 −1
Original line number Diff line number Diff line
@@ -1736,7 +1736,7 @@ static void do_interrupt_v7m(CPUARMState *env) 
        armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_USAGE);

        return;

    case EXCP_SWI:

        env->regs[15] += 2;

        /* The PC already points to the next instruction.  */

        armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_SVC);

        return;

    case EXCP_PREFETCH_ABORT: