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

linux-user/arm/nwfpe: rename REG_PC to ARM_REG_PC 

The REG_PC constant used in the ARM nwfpe code is fine in the kernel
but when used in qemu can clash with a definition in the host system
include files (in particular on Ubuntu Lucid SPARC, including signal.h
will define a REG_PC). Rename the constant to avoid this issue.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Peter Maydell 2011-04-20 11:19:15 +01:00 committed by Aurelien Jarno
parent f2dd89d0c7
commit 7cb4db8f41
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-user/arm/nwfpe/fpa11.c
View File

@ -144,7 +144,7 @@ unsigned int EmulateAll(unsigned int opcode, FPA11* qfpa, CPUARMState* qregs)
#if 0 #if 0
fprintf(stderr,"emulating FP insn 0x%08x, PC=0x%08x\n", fprintf(stderr,"emulating FP insn 0x%08x, PC=0x%08x\n",
opcode, qregs[REG_PC]); opcode, qregs[ARM_REG_PC]);
#endif #endif
fpa11 = GET_FPA11(); fpa11 = GET_FPA11();

2
linux-user/arm/nwfpe/fpa11.h
View File

@ -111,7 +111,7 @@ static inline void writeConditionCodes(unsigned int x)
cpsr_write(user_registers,x,CPSR_NZCV); cpsr_write(user_registers,x,CPSR_NZCV);
} }
#define REG_PC 15 #define ARM_REG_PC 15
unsigned int EmulateAll(unsigned int opcode, FPA11* qfpa, CPUARMState* qregs); unsigned int EmulateAll(unsigned int opcode, FPA11* qfpa, CPUARMState* qregs);

8
linux-user/arm/nwfpe/fpa11_cpdt.c
View File

@ -220,7 +220,7 @@ static unsigned int PerformLDF(const unsigned int opcode)
//printk("PerformLDF(0x%08x), Fd = 0x%08x\n",opcode,getFd(opcode)); //printk("PerformLDF(0x%08x), Fd = 0x%08x\n",opcode,getFd(opcode));
pBase = readRegister(getRn(opcode)); pBase = readRegister(getRn(opcode));
if (REG_PC == getRn(opcode)) if (ARM_REG_PC == getRn(opcode))
{ {
pBase += 8; pBase += 8;
write_back = 0; write_back = 0;
@ -256,7 +256,7 @@ static unsigned int PerformSTF(const unsigned int opcode)
SetRoundingMode(ROUND_TO_NEAREST); SetRoundingMode(ROUND_TO_NEAREST);
pBase = readRegister(getRn(opcode)); pBase = readRegister(getRn(opcode));
if (REG_PC == getRn(opcode)) if (ARM_REG_PC == getRn(opcode))
{ {
pBase += 8; pBase += 8;
write_back = 0; write_back = 0;
@ -289,7 +289,7 @@ static unsigned int PerformLFM(const unsigned int opcode)
target_ulong pBase, pAddress, pFinal; target_ulong pBase, pAddress, pFinal;
pBase = readRegister(getRn(opcode)); pBase = readRegister(getRn(opcode));
if (REG_PC == getRn(opcode)) if (ARM_REG_PC == getRn(opcode))
{ {
pBase += 8; pBase += 8;
write_back = 0; write_back = 0;
@ -322,7 +322,7 @@ static unsigned int PerformSFM(const unsigned int opcode)
target_ulong pBase, pAddress, pFinal; target_ulong pBase, pAddress, pFinal;
pBase = readRegister(getRn(opcode)); pBase = readRegister(getRn(opcode));
if (REG_PC == getRn(opcode)) if (ARM_REG_PC == getRn(opcode))
{ {
pBase += 8; pBase += 8;
write_back = 0; write_back = 0;