commit 852088c7e08182c2de563872d558309815cbfa0d
author David 'Digit' Turner <digit@android.com> Sat Dec 14 23:04:12 2013 +0100
committer David 'Digit' Turner <digit@android.com> Wed Jan 08 07:32:47 2014 +0100
tree cc28c9238b9e678664e4d308acd3b9e58ad15872
parent 1c31e3e43ce4cca85a707dfff631e5e102fdeced

Move headers to include/exec/

Change-Id: Ife43f9cd12a02aa98f408043b0cccb9fe45a9ff7

target-mips/cpu.h

diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index 46519e3..3fe52ce 100644
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -9,7 +9,7 @@
 
 #include "config.h"
 #include "mips-defs.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 #include "softfloat.h"
 
 // uint_fast8_t and uint_fast16_t not in <sys/int_types.h>
@@ -548,8 +548,8 @@
     return r;
 }
 
-#include "cpu-all.h"
-#include "exec-all.h"
+#include "exec/cpu-all.h"
+#include "exec/exec-all.h"
 
 /* Memory access type :
  * may be needed for precise access rights control and precise exceptions.

target-mips/exec.h

diff --git a/target-mips/exec.h b/target-mips/exec.h
index 0d55790..3590748 100644
--- a/target-mips/exec.h
+++ b/target-mips/exec.h
@@ -6,15 +6,15 @@
 #include "config.h"
 #include "mips-defs.h"
 #include "dyngen-exec.h"
-#include "cpu-defs.h"
+#include "exec/cpu-defs.h"
 
 GLOBAL_REGISTER_VARIABLE_DECL struct CPUMIPSState *env asm(AREG0);
 
 #include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 #if !defined(CONFIG_USER_ONLY)
-#include "softmmu_exec.h"
+#include "exec/softmmu_exec.h"
 #endif /* !defined(CONFIG_USER_ONLY) */
 
 void dump_fpu(CPUState *env);

target-mips/helper.c

diff --git a/target-mips/helper.c b/target-mips/helper.c
index c69a8bd..6179159 100644
--- a/target-mips/helper.c
+++ b/target-mips/helper.c
@@ -24,7 +24,7 @@
 #include <signal.h>
 
 #include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 enum {
     TLBRET_DIRTY = -4,

target-mips/helper.h

diff --git a/target-mips/helper.h b/target-mips/helper.h
index ab47b1a..d0041d9 100644
--- a/target-mips/helper.h
+++ b/target-mips/helper.h
@@ -1,4 +1,4 @@
-#include "def-helper.h"
+#include "exec/def-helper.h"
 
 DEF_HELPER_2(raise_exception_err, void, i32, int)
 DEF_HELPER_1(raise_exception, void, i32)
@@ -279,4 +279,4 @@
 DEF_HELPER_1(pmon, void, int)
 DEF_HELPER_0(wait, void)
 
-#include "def-helper.h"
+#include "exec/def-helper.h"

target-mips/machine.c

diff --git a/target-mips/machine.c b/target-mips/machine.c
index 04985b1..714be20 100644
--- a/target-mips/machine.c
+++ b/target-mips/machine.c
@@ -1,7 +1,7 @@
 #include "hw/hw.h"
 #include "hw/boards.h"
 
-#include "exec-all.h"
+#include "exec/exec-all.h"
 
 static void save_tc(QEMUFile *f, TCState *tc)
 {

target-mips/op_helper.c

diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index f0f98a8..4a393f6 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -1886,16 +1886,16 @@
 #define ALIGNED_ONLY
 
 #define SHIFT 0
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 1
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 2
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 #define SHIFT 3
-#include "softmmu_template.h"
+#include "exec/softmmu_template.h"
 
 static void do_unaligned_access (target_ulong addr, int is_write, int is_user, void *retaddr)
 {

target-mips/translate.c

diff --git a/target-mips/translate.c b/target-mips/translate.c
index ebbebc8..c2d6805 100755
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -26,7 +26,7 @@
 #include <inttypes.h>
 
 #include "cpu.h"
-#include "exec-all.h"
+#include "exec/exec-all.h"
 #include "disas.h"
 #include "tcg-op.h"
 #include "qemu-common.h"
@@ -433,7 +433,7 @@
 static TCGv_i32 hflags;
 static TCGv_i32 fpu_fcr0, fpu_fcr31;
 
-#include "gen-icount.h"
+#include "exec/gen-icount.h"
 
 #define gen_helper_0i(name, arg) do {                             \
     TCGv_i32 helper_tmp = tcg_const_i32(arg);                     \