ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-lm32/microblaze: Drop second CPU{LM32, MB}State typedef 

Commit 9b9a970a23
(target-lm32/microblaze: Typedef struct CPU{MB,LM32}State)
introduced necessary typedefs for cpu_mmu_index() and mmu.h
respectively.

On some GCC versions this leads to "error: redefinition of typedef".

Drop the original typedef to hopefully fix the build.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Andreas Färber 2012-03-15 01:19:42 +01:00 committed by Anthony Liguori
parent aea6ff7fa0
commit ae7d54d489
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target-lm32/cpu.h
View File

@ -149,7 +149,7 @@ enum {
LM32_FLAG_IGNORE_MSB = 1, LM32_FLAG_IGNORE_MSB = 1,
}; };
typedef struct CPULM32State { struct CPULM32State {
/* general registers */ /* general registers */
uint32_t regs[32]; uint32_t regs[32];
@ -182,7 +182,7 @@ typedef struct CPULM32State {
uint8_t num_bps; uint8_t num_bps;
uint8_t num_wps; uint8_t num_wps;
} CPULM32State; };
CPULM32State *cpu_lm32_init(const char *cpu_model); CPULM32State *cpu_lm32_init(const char *cpu_model);

4
target-microblaze/cpu.h
View File

@ -230,7 +230,7 @@ typedef struct CPUMBState CPUMBState;
#define STREAM_CONTROL (1 << 3) #define STREAM_CONTROL (1 << 3)
#define STREAM_NONBLOCK (1 << 4) #define STREAM_NONBLOCK (1 << 4)
typedef struct CPUMBState { struct CPUMBState {
uint32_t debug; uint32_t debug;
uint32_t btaken; uint32_t btaken;
uint32_t btarget; uint32_t btarget;
@ -264,7 +264,7 @@ typedef struct CPUMBState {
#endif #endif
CPU_COMMON CPU_COMMON
} CPUMBState; };
CPUMBState *cpu_mb_init(const char *cpu_model); CPUMBState *cpu_mb_init(const char *cpu_model);
int cpu_mb_exec(CPUMBState *s); int cpu_mb_exec(CPUMBState *s);