Skip to contentSkip to conversation

Move softmmu code into common headert

PATCH New Paul Brook 1 participant 1 message Oct 29, 2005

lore
Share & tools
lore

Paul Brook

author
#0 lore raw

PATCH 1/1 Move softmmu code into common headert

The attached patch moves a chunk of duplicated softmmu code from target-*/exec.h into a common softmmu_exec.h file.

Paul

Index: target-arm/exec.h
===================================================================
RCS file: /cvsroot/qemu/qemu/target-arm/exec.h,v
retrieving revision 1.5

exec.h +7 -1
diff -u -p -r1.5 exec.h
@@ -41,7 +41,8 @@ static inline int compute_cpsr(void)
     int ZF;
     ZF = (env->NZF == 0);
     return env->cpsr | (env->NZF & 0x80000000) | (ZF << 30) | 
-        (env->CF << 29) | ((env->VF & 0x80000000) >> 3) | (env->QF << 27);
+        (env->CF << 29) | ((env->VF & 0x80000000) >> 3) | (env->QF << 27)
+        | (env->GE << 16);
 }
 
 static inline void env_to_regs(void)
@@ -59,6 +60,10 @@ int cpu_arm_handle_mmu_fault (CPUState *
 
 void cpu_lock(void);
 void cpu_unlock(void);
+void helper_mark_exclusive(CPUARMState *, uint32_t addr);
+int helper_test_exclusive(CPUARMState *, uint32_t addr);
+void helper_clrex(CPUARMState *env);
+
 void cpu_loop_exit(void);
 
 void raise_exception(int);
@@ -75,3 +80,4 @@ void do_vfp_cmpes(void);
 void do_vfp_cmped(void);
 void do_vfp_set_fpscr(void);
 void do_vfp_get_fpscr(void);
+

Index: target-i386/exec.h
===================================================================
RCS file: /cvsroot/qemu/qemu/target-i386/exec.h,v
retrieving revision 1.26

exec.h +1 -64

73 lines not on this page · raw message

Index: target-mips/exec.h
===================================================================
RCS file: /cvsroot/qemu/qemu/target-mips/exec.h,v
retrieving revision 1.3

exec.h +1 -65

72 lines not on this page · raw message

Index: target-ppc/exec.h
===================================================================
RCS file: /cvsroot/qemu/qemu/target-ppc/exec.h,v
retrieving revision 1.12

exec.h +1 -66

74 lines not on this page · raw message

Index: target-sparc/exec.h
===================================================================
RCS file: /cvsroot/qemu/qemu/target-sparc/exec.h,v retrieving revision 1.13

exec.h +1 -65

72 lines not on this page · raw message

Index: softmmu_exec.h
===================================================================
RCS file: softmmu_exec.h

softmmu_exec.h new file +65 -0

65 lines not on this page · raw message