* [Qemu-devel] [PATCH] linux-user/arm/nwfpe: rename REG_PC to ARM_REG_PC
@ 2011-04-20 10:19 Peter Maydell
2011-04-25 20:15 ` Aurelien Jarno
0 siblings, 1 reply; 2+ messages in thread
From: Peter Maydell @ 2011-04-20 10:19 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, patches
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>
---
linux-user/arm/nwfpe/fpa11.c | 2 +-
linux-user/arm/nwfpe/fpa11.h | 2 +-
linux-user/arm/nwfpe/fpa11_cpdt.c | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/linux-user/arm/nwfpe/fpa11.c b/linux-user/arm/nwfpe/fpa11.c
index 0a87c43..eebd93f 100644
--- a/linux-user/arm/nwfpe/fpa11.c
+++ b/linux-user/arm/nwfpe/fpa11.c
@@ -144,7 +144,7 @@ unsigned int EmulateAll(unsigned int opcode, FPA11* qfpa, CPUARMState* qregs)
#if 0
fprintf(stderr,"emulating FP insn 0x%08x, PC=0x%08x\n",
- opcode, qregs[REG_PC]);
+ opcode, qregs[ARM_REG_PC]);
#endif
fpa11 = GET_FPA11();
diff --git a/linux-user/arm/nwfpe/fpa11.h b/linux-user/arm/nwfpe/fpa11.h
index f17647b..002b3cb 100644
--- a/linux-user/arm/nwfpe/fpa11.h
+++ b/linux-user/arm/nwfpe/fpa11.h
@@ -111,7 +111,7 @@ static inline void writeConditionCodes(unsigned int x)
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);
diff --git a/linux-user/arm/nwfpe/fpa11_cpdt.c b/linux-user/arm/nwfpe/fpa11_cpdt.c
index b12e27d..3e7a938 100644
--- a/linux-user/arm/nwfpe/fpa11_cpdt.c
+++ b/linux-user/arm/nwfpe/fpa11_cpdt.c
@@ -220,7 +220,7 @@ static unsigned int PerformLDF(const unsigned int opcode)
//printk("PerformLDF(0x%08x), Fd = 0x%08x\n",opcode,getFd(opcode));
pBase = readRegister(getRn(opcode));
- if (REG_PC == getRn(opcode))
+ if (ARM_REG_PC == getRn(opcode))
{
pBase += 8;
write_back = 0;
@@ -256,7 +256,7 @@ static unsigned int PerformSTF(const unsigned int opcode)
SetRoundingMode(ROUND_TO_NEAREST);
pBase = readRegister(getRn(opcode));
- if (REG_PC == getRn(opcode))
+ if (ARM_REG_PC == getRn(opcode))
{
pBase += 8;
write_back = 0;
@@ -289,7 +289,7 @@ static unsigned int PerformLFM(const unsigned int opcode)
target_ulong pBase, pAddress, pFinal;
pBase = readRegister(getRn(opcode));
- if (REG_PC == getRn(opcode))
+ if (ARM_REG_PC == getRn(opcode))
{
pBase += 8;
write_back = 0;
@@ -322,7 +322,7 @@ static unsigned int PerformSFM(const unsigned int opcode)
target_ulong pBase, pAddress, pFinal;
pBase = readRegister(getRn(opcode));
- if (REG_PC == getRn(opcode))
+ if (ARM_REG_PC == getRn(opcode))
{
pBase += 8;
write_back = 0;
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] linux-user/arm/nwfpe: rename REG_PC to ARM_REG_PC
2011-04-20 10:19 [Qemu-devel] [PATCH] linux-user/arm/nwfpe: rename REG_PC to ARM_REG_PC Peter Maydell
@ 2011-04-25 20:15 ` Aurelien Jarno
0 siblings, 0 replies; 2+ messages in thread
From: Aurelien Jarno @ 2011-04-25 20:15 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-trivial, qemu-devel, patches
On Wed, Apr 20, 2011 at 11:19:15AM +0100, Peter Maydell wrote:
> 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>
> ---
> linux-user/arm/nwfpe/fpa11.c | 2 +-
> linux-user/arm/nwfpe/fpa11.h | 2 +-
> linux-user/arm/nwfpe/fpa11_cpdt.c | 8 ++++----
> 3 files changed, 6 insertions(+), 6 deletions(-)
Thanks, applied.
> diff --git a/linux-user/arm/nwfpe/fpa11.c b/linux-user/arm/nwfpe/fpa11.c
> index 0a87c43..eebd93f 100644
> --- a/linux-user/arm/nwfpe/fpa11.c
> +++ b/linux-user/arm/nwfpe/fpa11.c
> @@ -144,7 +144,7 @@ unsigned int EmulateAll(unsigned int opcode, FPA11* qfpa, CPUARMState* qregs)
>
> #if 0
> fprintf(stderr,"emulating FP insn 0x%08x, PC=0x%08x\n",
> - opcode, qregs[REG_PC]);
> + opcode, qregs[ARM_REG_PC]);
> #endif
> fpa11 = GET_FPA11();
>
> diff --git a/linux-user/arm/nwfpe/fpa11.h b/linux-user/arm/nwfpe/fpa11.h
> index f17647b..002b3cb 100644
> --- a/linux-user/arm/nwfpe/fpa11.h
> +++ b/linux-user/arm/nwfpe/fpa11.h
> @@ -111,7 +111,7 @@ static inline void writeConditionCodes(unsigned int x)
> 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);
>
> diff --git a/linux-user/arm/nwfpe/fpa11_cpdt.c b/linux-user/arm/nwfpe/fpa11_cpdt.c
> index b12e27d..3e7a938 100644
> --- a/linux-user/arm/nwfpe/fpa11_cpdt.c
> +++ b/linux-user/arm/nwfpe/fpa11_cpdt.c
> @@ -220,7 +220,7 @@ static unsigned int PerformLDF(const unsigned int opcode)
> //printk("PerformLDF(0x%08x), Fd = 0x%08x\n",opcode,getFd(opcode));
>
> pBase = readRegister(getRn(opcode));
> - if (REG_PC == getRn(opcode))
> + if (ARM_REG_PC == getRn(opcode))
> {
> pBase += 8;
> write_back = 0;
> @@ -256,7 +256,7 @@ static unsigned int PerformSTF(const unsigned int opcode)
> SetRoundingMode(ROUND_TO_NEAREST);
>
> pBase = readRegister(getRn(opcode));
> - if (REG_PC == getRn(opcode))
> + if (ARM_REG_PC == getRn(opcode))
> {
> pBase += 8;
> write_back = 0;
> @@ -289,7 +289,7 @@ static unsigned int PerformLFM(const unsigned int opcode)
> target_ulong pBase, pAddress, pFinal;
>
> pBase = readRegister(getRn(opcode));
> - if (REG_PC == getRn(opcode))
> + if (ARM_REG_PC == getRn(opcode))
> {
> pBase += 8;
> write_back = 0;
> @@ -322,7 +322,7 @@ static unsigned int PerformSFM(const unsigned int opcode)
> target_ulong pBase, pAddress, pFinal;
>
> pBase = readRegister(getRn(opcode));
> - if (REG_PC == getRn(opcode))
> + if (ARM_REG_PC == getRn(opcode))
> {
> pBase += 8;
> write_back = 0;
> --
> 1.7.1
>
>
>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-25 21:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-20 10:19 [Qemu-devel] [PATCH] linux-user/arm/nwfpe: rename REG_PC to ARM_REG_PC Peter Maydell
2011-04-25 20:15 ` Aurelien Jarno
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.