qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH 5/9] m68k: use caller supplied CPUState for interrup


From: Blue Swirl
Subject: [Qemu-devel] [PATCH 5/9] m68k: use caller supplied CPUState for interrupt related stuff
Date: Sun, 19 Jun 2011 23:59:57 +0300

Pass CPUState to do_interrupt(). This is needed by later patches.

It would be cleaner to move the function to helper.c, but there are
a few dependencies between do_interrupt() and other functions.

Signed-off-by: Blue Swirl <address@hidden>
---
 cpu-exec.c              |    4 ++--
 target-m68k/cpu.h       |    3 ++-
 target-m68k/op_helper.c |   29 ++++++++++++++++++++++++++---
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/cpu-exec.c b/cpu-exec.c
index b0e949b..64203b3 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -295,7 +295,7 @@ int cpu_exec(CPUState *env1)
 #elif defined(TARGET_CRIS)
                     do_interrupt(env);
 #elif defined(TARGET_M68K)
-                    do_interrupt(0);
+                    do_interrupt(env);
 #elif defined(TARGET_S390X)
                     do_interrupt(env);
 #endif
@@ -530,7 +530,7 @@ int cpu_exec(CPUState *env1)
                            provide/save the vector when the interrupt is
                            first signalled.  */
                         env->exception_index = env->pending_vector;
-                        do_interrupt(1);
+                        do_interrupt_m68k_hardirq(env);
                         next_tb = 0;
                     }
 #elif defined(TARGET_S390X) && !defined(CONFIG_USER_ONLY)
diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h
index b025b66..4d8ba28 100644
--- a/target-m68k/cpu.h
+++ b/target-m68k/cpu.h
@@ -119,7 +119,8 @@ void m68k_tcg_init(void);
 CPUM68KState *cpu_m68k_init(const char *cpu_model);
 int cpu_m68k_exec(CPUM68KState *s);
 void cpu_m68k_close(CPUM68KState *s);
-void do_interrupt(int is_hw);
+void do_interrupt(CPUState *env1);
+void do_interrupt_m68k_hardirq(CPUState *env1);
 /* you can call this signal handler from your SIGBUS and SIGSEGV
    signal handlers to inform the virtual CPU of exceptions. non zero
    is returned if the signal was handled by the virtual CPU.  */
diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c
index 084a182..237fc4c 100644
--- a/target-m68k/op_helper.c
+++ b/target-m68k/op_helper.c
@@ -21,9 +21,13 @@

 #if defined(CONFIG_USER_ONLY)

-void do_interrupt(int is_hw)
+void do_interrupt(CPUState *env1)
+{
+    env1->exception_index = -1;
+}
+
+void do_interrupt_m68k_hardirq(CPUState *env1)
 {
-    env->exception_index = -1;
 }

 #else
@@ -90,7 +94,7 @@ static void do_rte(void)
     env->aregs[7] = sp + 8;
 }

-void do_interrupt(int is_hw)
+static void do_interrupt_all(int is_hw)
 {
     uint32_t sp;
     uint32_t fmt;
@@ -155,6 +159,25 @@ void do_interrupt(int is_hw)
     env->pc = ldl_kernel(env->vbr + vector);
 }

+void do_interrupt(CPUState *env1)
+{
+    CPUState *saved_env;
+
+    saved_env = env;
+    env = env1;
+    do_interrupt_all(0);
+    env = saved_env;
+}
+
+void do_interrupt_m68k_hardirq(CPUState *env1)
+{
+    CPUState *saved_env;
+
+    saved_env = env;
+    env = env1;
+    do_interrupt_all(1);
+    env = saved_env;
+}
 #endif

 static void raise_exception(int tt)
-- 
1.6.2.4



reply via email to

[Prev in Thread] Current Thread [Next in Thread]