[Qemu-devel] [PULL 0/2] target-arm queue

[Qemu-devel] [PULL 0/2] target-arm queue

[Peter Maydell]

Small patchqueue, just flushing the target-arm queue before softfreeze.
Please pull.

-- PMM

The following changes since commit a6308bc2224db238e72c570482717b68246a7ce0:

  Merge remote-tracking branch 'kraxel/build.1' into staging (2013-01-10 13:26:31 -0600)

are available in the git repository at:


  git://git.linaro.org/people/pmaydell/qemu-arm.git target-arm.next

for you to fetch changes up to 314e2296dc945e286b605563d7b6e6b269d29816:

  target-arm: Fix SWI (SVC) instruction in M profile. (2013-01-11 15:21:22 +0000)

----------------------------------------------------------------
Alex_Rozenman@mentor.com (1):
      target-arm: Fix SWI (SVC) instruction in M profile.

Eduardo Habkost (1):
      target-arm: use type_register() instead of type_register_static()

 target-arm/cpu.c    |    2 +-
 target-arm/helper.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[Qemu-devel] [PATCH 1/2] target-arm: use type_register() instead of type_register_static()

[Peter Maydell]

From: Eduardo Habkost <ehabkost@redhat.com>

The type_register_static() interface is documented as:

  type_register_static:
  @info: The #TypeInfo of the new type.

  @info and all of the strings it points to should exist for the life
  time that the type is registered.

But cpu_register() uses a stack variable for the 'info' argument, so it
has to use type_register() instead of type_register_static().

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target-arm/cpu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 17875ed..94536bb 100644
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -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 = {
-- 
1.7.9.5

[Qemu-devel] [PATCH 2/2] target-arm: Fix SWI (SVC) instruction in M profile.

[Peter Maydell]

From: "Alex_Rozenman@mentor.com" <Alex_Rozenman@mentor.com>

When do_interrupt_v7m is called with EXCP_SWI, the PC already
points to the next instruction. Don't modify it here.

Signed-off-by: Alex Rozenman <Alex_Rozenman@mentor.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target-arm/helper.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target-arm/helper.c b/target-arm/helper.c
index 0525aec..66ab78e 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -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:
-- 
1.7.9.5

Re: [Qemu-devel] [PULL 0/2] target-arm queue

[Blue Swirl]

On Fri, Jan 11, 2013 at 3:36 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
> Small patchqueue, just flushing the target-arm queue before softfreeze.
> Please pull.

Thanks, pulled.

>
> -- PMM
>
> The following changes since commit a6308bc2224db238e72c570482717b68246a7ce0:
>
>   Merge remote-tracking branch 'kraxel/build.1' into staging (2013-01-10 13:26:31 -0600)
>
> are available in the git repository at:
>
>
>   git://git.linaro.org/people/pmaydell/qemu-arm.git target-arm.next
>
> for you to fetch changes up to 314e2296dc945e286b605563d7b6e6b269d29816:
>
>   target-arm: Fix SWI (SVC) instruction in M profile. (2013-01-11 15:21:22 +0000)
>
> ----------------------------------------------------------------
> Alex_Rozenman@mentor.com (1):
>       target-arm: Fix SWI (SVC) instruction in M profile.
>
> Eduardo Habkost (1):
>       target-arm: use type_register() instead of type_register_static()
>
>  target-arm/cpu.c    |    2 +-
>  target-arm/helper.c |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)