[Qemu-devel] [4612] Push common interrupt variables to cpu-defs.h (Glauber Costa)

[Fabrice Bellard]

Revision: 4612
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4612
Author:   bellard
Date:     2008-05-29 10:08:06 +0000 (Thu, 29 May 2008)

Log Message:
-----------
Push common interrupt variables to cpu-defs.h (Glauber Costa)

Modified Paths:
--------------
    trunk/cpu-defs.h
    trunk/target-alpha/cpu.h
    trunk/target-arm/cpu.h
    trunk/target-cris/cpu.h
    trunk/target-i386/cpu.h
    trunk/target-m68k/cpu.h
    trunk/target-mips/cpu.h
    trunk/target-ppc/cpu.h
    trunk/target-sh4/cpu.h
    trunk/target-sparc/cpu.h

Modified: trunk/cpu-defs.h
===================================================================
--- trunk/cpu-defs.h    2008-05-29 09:35:57 UTC (rev 4611)
+++ trunk/cpu-defs.h    2008-05-29 10:08:06 UTC (rev 4612)
@@ -160,6 +160,10 @@
     int nb_watchpoints;                                                 \
     int watchpoint_hit;                                                 \
                                                                         \
+    /* Core interrupt code */                                           \
+    jmp_buf jmp_env;                                                    \
+    int exception_index;                                                \
+                                                                        \
     void *next_cpu; /* next CPU sharing TB cache */                     \
     int cpu_index; /* CPU index (informative) */                        \
     /* user data */                                                     \

Modified: trunk/target-alpha/cpu.h
===================================================================
--- trunk/target-alpha/cpu.h    2008-05-29 09:35:57 UTC (rev 4611)
+++ trunk/target-alpha/cpu.h    2008-05-29 10:08:06 UTC (rev 4612)
@@ -282,11 +282,9 @@
     /* Those resources are used only in Qemu core */
     CPU_COMMON
 
-    jmp_buf jmp_env;
     int user_mode_only; /* user mode only simulation */
     uint32_t hflags;
 
-    int exception_index;
     int error_code;
     int interrupt_request;
 

Modified: trunk/target-arm/cpu.h
===================================================================
--- trunk/target-arm/cpu.h      2008-05-29 09:35:57 UTC (rev 4611)
+++ trunk/target-arm/cpu.h      2008-05-29 10:08:06 UTC (rev 4612)
@@ -157,8 +157,6 @@
     void *irq_opaque;
 
     /* exception/interrupt handling */
-    jmp_buf jmp_env;
-    int exception_index;
     int interrupt_request;
     int user_mode_only;
 

Modified: trunk/target-cris/cpu.h
===================================================================
--- trunk/target-cris/cpu.h     2008-05-29 09:35:57 UTC (rev 4611)
+++ trunk/target-cris/cpu.h     2008-05-29 10:08:06 UTC (rev 4612)
@@ -123,7 +123,6 @@
        /* X flag at the time of cc snapshot.  */
        int cc_x;
 
-       int exception_index;
        int interrupt_request;
        int interrupt_vector;
        int fault_vector;
@@ -158,7 +157,6 @@
        int features;
        int user_mode_only;
 
-       jmp_buf jmp_env;
        CPU_COMMON
 } CPUCRISState;
 

Modified: trunk/target-i386/cpu.h
===================================================================
--- trunk/target-i386/cpu.h     2008-05-29 09:35:57 UTC (rev 4611)
+++ trunk/target-i386/cpu.h     2008-05-29 10:08:06 UTC (rev 4612)
@@ -552,8 +552,6 @@
     uint64_t pat;
 
     /* exception/interrupt handling */
-    jmp_buf jmp_env;
-    int exception_index;
     int error_code;
     int exception_is_int;
     target_ulong exception_next_eip;

Modified: trunk/target-m68k/cpu.h
===================================================================
--- trunk/target-m68k/cpu.h     2008-05-29 09:35:57 UTC (rev 4611)
+++ trunk/target-m68k/cpu.h     2008-05-29 10:08:06 UTC (rev 4612)
@@ -104,8 +104,6 @@
     uint32_t t1;
 
     /* exception/interrupt handling */
-    jmp_buf jmp_env;
-    int exception_index;
     int interrupt_request;
     int user_mode_only;
 

Modified: trunk/target-mips/cpu.h
===================================================================
--- trunk/target-mips/cpu.h     2008-05-29 09:35:57 UTC (rev 4611)
+++ trunk/target-mips/cpu.h     2008-05-29 10:08:06 UTC (rev 4612)
@@ -412,8 +412,6 @@
     int32_t CP0_DESAVE;
     /* Qemu */
     int interrupt_request;
-    jmp_buf jmp_env;
-    int exception_index;
     int error_code;
     int user_mode_only; /* user mode only simulation */
     uint32_t hflags;    /* CPU State */

Modified: trunk/target-ppc/cpu.h
===================================================================
--- trunk/target-ppc/cpu.h      2008-05-29 09:35:57 UTC (rev 4611)
+++ trunk/target-ppc/cpu.h      2008-05-29 10:08:06 UTC (rev 4612)
@@ -646,7 +646,6 @@
     int bfd_mach;
     uint32_t flags;
 
-    int exception_index;
     int error_code;
     int interrupt_request;
     uint32_t pending_interrupts;
@@ -672,7 +671,6 @@
     opc_handler_t *opcodes[0x40];
 
     /* Those resources are used only in Qemu core */
-    jmp_buf jmp_env;
     int user_mode_only; /* user mode only simulation */
     target_ulong hflags;      /* hflags is a MSR & HFLAGS_MASK         */
     target_ulong hflags_nmsr; /* specific hflags, not comming from MSR */

Modified: trunk/target-sh4/cpu.h
===================================================================
--- trunk/target-sh4/cpu.h      2008-05-29 09:35:57 UTC (rev 4611)
+++ trunk/target-sh4/cpu.h      2008-05-29 10:08:06 UTC (rev 4612)
@@ -114,10 +114,8 @@
     uint32_t expevt;           /* exception event register */
     uint32_t intevt;           /* interrupt event register */
 
-    jmp_buf jmp_env;
     int user_mode_only;
     int interrupt_request;
-    int exception_index;
      CPU_COMMON tlb_t utlb[UTLB_SIZE]; /* unified translation table */
     tlb_t itlb[ITLB_SIZE];     /* instruction translation table */
     void *intc_handle;

Modified: trunk/target-sparc/cpu.h
===================================================================
--- trunk/target-sparc/cpu.h    2008-05-29 09:35:57 UTC (rev 4611)
+++ trunk/target-sparc/cpu.h    2008-05-29 10:08:06 UTC (rev 4612)
@@ -214,9 +214,7 @@
     uint32_t pil_in;   /* incoming interrupt level bitmap */
     int      psref;    /* enable fpu */
     target_ulong version;
-    jmp_buf  jmp_env;
     int user_mode_only;
-    int exception_index;
     int interrupt_index;
     int interrupt_request;
     uint32_t mmu_bm;