fpu: move public header file to include/fpu

[qemu.git] / target-microblaze / cpu.h

diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h
index 76f4fc4a7a40145318fc3375a6b271ef2aa5772b..4de22266ef34d6e476a24403b34dc923accf0385 100644 (file)
--- a/target-microblaze/cpu.h
+++ b/target-microblaze/cpu.h
@@ -19,13 +19,17 @@
 #ifndef CPU_MICROBLAZE_H
 #define CPU_MICROBLAZE_H
 
 #ifndef CPU_MICROBLAZE_H
 #define CPU_MICROBLAZE_H
 

+#include "config.h"
+#include "qemu-common.h"
+

 #define TARGET_LONG_BITS 32
 
 #define TARGET_LONG_BITS 32
 

-#define CPUState struct CPUMBState
+#define CPUArchState struct CPUMBState

 
 

-#include "cpu-defs.h"
-#include "softfloat.h"
+#include "exec/cpu-defs.h"
+#include "fpu/softfloat.h"

 struct CPUMBState;
 struct CPUMBState;

+typedef struct CPUMBState CPUMBState;

 #if !defined(CONFIG_USER_ONLY)
 #include "mmu.h"
 #endif
 #if !defined(CONFIG_USER_ONLY)
 #include "mmu.h"
 #endif


@@ -65,6 +69,7 @@ struct CPUMBState;
 #define MSR_DCE (1<<7) /* 0x080 */
 #define MSR_EE  (1<<8) /* 0x100 */
 #define MSR_EIP (1<<9) /* 0x200 */
 #define MSR_DCE (1<<7) /* 0x080 */
 #define MSR_EE  (1<<8) /* 0x100 */
 #define MSR_EIP (1<<9) /* 0x200 */

+#define MSR_PVR (1<<10) /* 0x400 */

 #define MSR_CC  (1<<31)
 
 /* Machine State Register (MSR) Fields */
 #define MSR_CC  (1<<31)
 
 /* Machine State Register (MSR) Fields */


@@ -92,6 +97,7 @@ struct CPUMBState;
 #define          ESR_EC_DIVZERO         5
 #define          ESR_EC_FPU             6
 #define          ESR_EC_PRIVINSN        7
 #define          ESR_EC_DIVZERO         5
 #define          ESR_EC_FPU             6
 #define          ESR_EC_PRIVINSN        7

+#define          ESR_EC_STACKPROT       7  /* Same as PRIVINSN.  */

 #define          ESR_EC_DATA_STORAGE    8
 #define          ESR_EC_INSN_STORAGE    9
 #define          ESR_EC_DATA_TLB        10
 #define          ESR_EC_DATA_STORAGE    8
 #define          ESR_EC_INSN_STORAGE    9
 #define          ESR_EC_DATA_TLB        10


@@ -224,7 +230,7 @@ struct CPUMBState;
 #define STREAM_CONTROL   (1 << 3)
 #define STREAM_NONBLOCK  (1 << 4)
 
 #define STREAM_CONTROL   (1 << 3)
 #define STREAM_NONBLOCK  (1 << 4)
 

-typedef struct CPUMBState {
+struct CPUMBState {

     uint32_t debug;
     uint32_t btaken;
     uint32_t btarget;
     uint32_t debug;
     uint32_t btaken;
     uint32_t btarget;


@@ -234,6 +240,12 @@ typedef struct CPUMBState {
     uint32_t regs[33];
     uint32_t sregs[24];
     float_status fp_status;
     uint32_t regs[33];
     uint32_t sregs[24];
     float_status fp_status;

+    /* Stack protectors. Yes, it's a hw feature.  */
+    uint32_t slr, shr;
+
+    /* lwx/swx reserved address */
+#define RES_ADDR_NONE 0xffffffff /* Use 0xffffffff to indicate no reservation */
+    uint32_t res_addr;

 
     /* Internal flags.  */
 #define IMM_FLAG       4
 
     /* Internal flags.  */
 #define IMM_FLAG       4


@@ -242,7 +254,7 @@ typedef struct CPUMBState {
 #define DRTE_FLAG      (1 << 17)
 #define DRTB_FLAG      (1 << 18)
 #define D_FLAG         (1 << 19)  /* Bit in ESR.  */
 #define DRTE_FLAG      (1 << 17)
 #define DRTB_FLAG      (1 << 18)
 #define D_FLAG         (1 << 19)  /* Bit in ESR.  */

-/* TB dependant CPUState.  */
+/* TB dependent CPUMBState.  */

 #define IFLAGS_TB_MASK  (D_FLAG | IMM_FLAG | DRTI_FLAG | DRTE_FLAG | DRTB_FLAG)
     uint32_t iflags;
 
 #define IFLAGS_TB_MASK  (D_FLAG | IMM_FLAG | DRTI_FLAG | DRTE_FLAG | DRTB_FLAG)
     uint32_t iflags;
 


@@ -256,12 +268,14 @@ typedef struct CPUMBState {
 #endif
 
     CPU_COMMON
 #endif
 
     CPU_COMMON

-} CPUMBState;
+};
+
+#include "cpu-qom.h"

 
 

-CPUState *cpu_mb_init(const char *cpu_model);
-int cpu_mb_exec(CPUState *s);
-void cpu_mb_close(CPUState *s);
-void do_interrupt(CPUState *env);
+MicroBlazeCPU *cpu_mb_init(const char *cpu_model);
+int cpu_mb_exec(CPUMBState *s);
+void cpu_mb_close(CPUMBState *s);
+void do_interrupt(CPUMBState *env);

 /* 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.  */
 /* 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.  */


@@ -281,7 +295,15 @@ enum {
 #define TARGET_PHYS_ADDR_SPACE_BITS 32
 #define TARGET_VIRT_ADDR_SPACE_BITS 32
 
 #define TARGET_PHYS_ADDR_SPACE_BITS 32
 #define TARGET_VIRT_ADDR_SPACE_BITS 32
 

-#define cpu_init cpu_mb_init
+static inline CPUMBState *cpu_init(const char *cpu_model)
+{
+    MicroBlazeCPU *cpu = cpu_mb_init(cpu_model);
+    if (cpu == NULL) {
+        return NULL;
+    }
+    return &cpu->env;
+}
+

 #define cpu_exec cpu_mb_exec
 #define cpu_gen_code cpu_mb_gen_code
 #define cpu_signal_handler cpu_mb_signal_handler
 #define cpu_exec cpu_mb_exec
 #define cpu_gen_code cpu_mb_gen_code
 #define cpu_signal_handler cpu_mb_signal_handler


@@ -297,7 +319,7 @@ enum {
 #define MMU_USER_IDX    2
 /* See NB_MMU_MODES further up the file.  */
 
 #define MMU_USER_IDX    2
 /* See NB_MMU_MODES further up the file.  */
 

-static inline int cpu_mmu_index (CPUState *env)
+static inline int cpu_mmu_index (CPUMBState *env)

 {
         /* Are we in nommu mode?.  */
         if (!(env->sregs[SR_MSR] & MSR_VM))
 {
         /* Are we in nommu mode?.  */
         if (!(env->sregs[SR_MSR] & MSR_VM))


@@ -308,12 +330,12 @@ static inline int cpu_mmu_index (CPUState *env)
         return MMU_KERNEL_IDX;
 }
 
         return MMU_KERNEL_IDX;
 }
 

-int cpu_mb_handle_mmu_fault(CPUState *env, target_ulong address, int rw,
-                            int mmu_idx, int is_softmmu);
+int cpu_mb_handle_mmu_fault(CPUMBState *env, target_ulong address, int rw,
+                            int mmu_idx);

 #define cpu_handle_mmu_fault cpu_mb_handle_mmu_fault
 
 #if defined(CONFIG_USER_ONLY)
 #define cpu_handle_mmu_fault cpu_mb_handle_mmu_fault
 
 #if defined(CONFIG_USER_ONLY)

-static inline void cpu_clone_regs(CPUState *env, target_ulong newsp)
+static inline void cpu_clone_regs(CPUMBState *env, target_ulong newsp)

 {
     if (newsp)
         env->regs[R_SP] = newsp;
 {
     if (newsp)
         env->regs[R_SP] = newsp;


@@ -321,23 +343,24 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp)
 }
 #endif
 
 }
 #endif
 

-static inline void cpu_set_tls(CPUState *env, target_ulong newtls)
+static inline void cpu_set_tls(CPUMBState *env, target_ulong newtls)

 {
 {

+    env->regs[21] = newtls;

 }
 
 }
 

-static inline int cpu_interrupts_enabled(CPUState *env)
+static inline int cpu_interrupts_enabled(CPUMBState *env)

 {
     return env->sregs[SR_MSR] & MSR_IE;
 }
 
 {
     return env->sregs[SR_MSR] & MSR_IE;
 }
 

-#include "cpu-all.h"
+#include "exec/cpu-all.h"

 
 

-static inline target_ulong cpu_get_pc(CPUState *env)
+static inline target_ulong cpu_get_pc(CPUMBState *env)

 {
     return env->sregs[SR_PC];
 }
 
 {
     return env->sregs[SR_PC];
 }
 

-static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
+static inline void cpu_get_tb_cpu_state(CPUMBState *env, target_ulong *pc,

                                         target_ulong *cs_base, int *flags)
 {
     *pc = env->sregs[SR_PC];
                                         target_ulong *cs_base, int *flags)
 {
     *pc = env->sregs[SR_PC];


@@ -347,18 +370,20 @@ static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
 }
 
 #if !defined(CONFIG_USER_ONLY)
 }
 
 #if !defined(CONFIG_USER_ONLY)

-void cpu_unassigned_access(CPUState *env1, target_phys_addr_t addr,
+void cpu_unassigned_access(CPUMBState *env1, hwaddr addr,

                            int is_write, int is_exec, int is_asi, int size);
 #endif
 
                            int is_write, int is_exec, int is_asi, int size);
 #endif
 

-static inline bool cpu_has_work(CPUState *env)
+static inline bool cpu_has_work(CPUState *cpu)

 {
 {

+    CPUMBState *env = &MICROBLAZE_CPU(cpu)->env;
+

     return env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI);
 }
 
     return env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI);
 }
 

-#include "exec-all.h"
+#include "exec/exec-all.h"

 
 

-static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
+static inline void cpu_pc_from_tb(CPUMBState *env, TranslationBlock *tb)

 {
     env->sregs[SR_PC] = tb->pc;
 }
 {
     env->sregs[SR_PC] = tb->pc;
 }