| Submitter | David Gibson |
|---|---|
| Date | Aug. 10, 2011, 5:22 a.m. |
| Message ID | <20110810052242.GP23511@yookeroo.fritz.box> |
| Download | mbox | patch |
| Permalink | /patch/109331/ |
| State | New |
| Headers | show |
Comments
Am 10.08.2011 um 07:22 schrieb David Gibson <david@gibson.dropbear.id.au>: > Hi Alex, > > I realised there was a bug in the CFAR patch in my recent qemu patch > series which breaks the build for ppc32 targets. > > There is a patch to fix it below, but I'm not sure if you want this > standalone, or if you'd prefer I fold it into the CFAR patch replacing > the one you have now. > > Please advise :) I'd prefer it folded in, but let me review the other few patches first :) Alex > > From 44096d5c32d3d4de2a6d600dc5d8c1539e79c85d Mon Sep 17 00:00:00 2001 > From: David Gibson <david@gibson.dropbear.id.au> > Date: Fri, 5 Aug 2011 16:49:45 +1000 > Subject: [PATCH] Fixup for 32-bit compile errors due to CFAR > > --- > target-ppc/translate_init.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c > index 510d9dd..35ce8bf 100644 > --- a/target-ppc/translate_init.c > +++ b/target-ppc/translate_init.c > @@ -130,6 +130,7 @@ static void spr_write_lr (void *opaque, int sprn, int gprn) > } > > /* CFAR */ > +#if defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY) > static void spr_read_cfar (void *opaque, int gprn, int sprn) > { > tcg_gen_mov_tl(cpu_gpr[gprn], cpu_cfar); > @@ -139,6 +140,7 @@ static void spr_write_cfar (void *opaque, int sprn, int gprn) > { > tcg_gen_mov_tl(cpu_cfar, cpu_gpr[gprn]); > } > +#endif /* defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY) */ > > /* CTR */ > static void spr_read_ctr (void *opaque, int gprn, int sprn) > -- > 1.7.5.4 > > > > -- > David Gibson | I'll have my music baroque, and my code > david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ > | _way_ _around_! > http://www.ozlabs.org/~dgibson
Patch
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 510d9dd..35ce8bf 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -130,6 +130,7 @@ static void spr_write_lr (void *opaque, int sprn, int gprn) } /* CFAR */ +#if defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY) static void spr_read_cfar (void *opaque, int gprn, int sprn) { tcg_gen_mov_tl(cpu_gpr[gprn], cpu_cfar); @@ -139,6 +140,7 @@ static void spr_write_cfar (void *opaque, int sprn, int gprn) { tcg_gen_mov_tl(cpu_cfar, cpu_gpr[gprn]); } +#endif /* defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY) */ /* CTR */ static void spr_read_ctr (void *opaque, int gprn, int sprn)
Hi Alex, I realised there was a bug in the CFAR patch in my recent qemu patch series which breaks the build for ppc32 targets. There is a patch to fix it below, but I'm not sure if you want this standalone, or if you'd prefer I fold it into the CFAR patch replacing the one you have now. Please advise :) From 44096d5c32d3d4de2a6d600dc5d8c1539e79c85d Mon Sep 17 00:00:00 2001 From: David Gibson <david@gibson.dropbear.id.au> Date: Fri, 5 Aug 2011 16:49:45 +1000 Subject: [PATCH] Fixup for 32-bit compile errors due to CFAR --- target-ppc/translate_init.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)