* [Qemu-devel] [PATCH 07/11] cris: avoid write only variables @ 2010-10-06 21:33 Blue Swirl 2010-10-07 10:08 ` Markus Armbruster 0 siblings, 1 reply; 5+ messages in thread From: Blue Swirl @ 2010-10-06 21:33 UTC (permalink / raw) To: qemu-devel, Edgar E. Iglesias Compiling with GCC 4.6.0 20100925 produced warnings: /src/qemu/target-cris/op_helper.c: In function 'helper_movl_sreg_reg': /src/qemu/target-cris/op_helper.c:145:8: error: variable 'tlb_v' set but not used [-Werror=unused-but-set-variable] In file included from /src/qemu/target-cris/translate.c:3154:0: /src/qemu/target-cris/translate_v10.c: In function 'dec10_prep_move_m': /src/qemu/target-cris/translate_v10.c:111:22: error: variable 'rd' set but not used [-Werror=unused-but-set-variable] Fix by making the variable declarations and their uses also conditional to debug definition, delete rd. Signed-off-by: Blue Swirl <blauwirbel@gmail.com> --- target-cris/op_helper.c | 6 ++++++ target-cris/translate_v10.c | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c index a60da94..28c79b1 100644 --- a/target-cris/op_helper.c +++ b/target-cris/op_helper.c @@ -142,7 +142,9 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) uint32_t idx; uint32_t lo, hi; uint32_t vaddr; +#ifdef CRIS_OP_HELPER_DEBUG int tlb_v; +#endif idx = set = env->sregs[SFR_RW_MM_TLB_SEL]; set >>= 4; @@ -157,13 +159,17 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) vaddr = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].hi, 13, 31); vaddr <<= TARGET_PAGE_BITS; +#ifdef CRIS_OP_HELPER_DEBUG tlb_v = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].lo, 3, 3); +#endif env->tlbsets[srs - 1][set][idx].lo = lo; env->tlbsets[srs - 1][set][idx].hi = hi; +#ifdef CRIS_OP_HELPER_DEBUG D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", vaddr, tlb_v, env->pc); +#endif tlb_flush_page(env, vaddr); } } diff --git a/target-cris/translate_v10.c b/target-cris/translate_v10.c index 14e590d..6944827 100644 --- a/target-cris/translate_v10.c +++ b/target-cris/translate_v10.c @@ -108,16 +108,15 @@ static unsigned int crisv10_post_memaddr(DisasContext *dc, unsigned int size) static int dec10_prep_move_m(DisasContext *dc, int s_ext, int memsize, TCGv dst) { - unsigned int rs, rd; + unsigned int rs; uint32_t imm; int is_imm; int insn_len = 0; rs = dc->src; - rd = dc->dst; is_imm = rs == 15 && !(dc->tb_flags & PFIX_FLAG); LOG_DIS("rs=%d rd=%d is_imm=%d mode=%d pfix=%d\n", - rs, rd, is_imm, dc->mode, dc->tb_flags & PFIX_FLAG); + rs, dc->dst, is_imm, dc->mode, dc->tb_flags & PFIX_FLAG); /* Load [$rs] onto T1. */ if (is_imm) { -- 1.6.2.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH 07/11] cris: avoid write only variables 2010-10-06 21:33 [Qemu-devel] [PATCH 07/11] cris: avoid write only variables Blue Swirl @ 2010-10-07 10:08 ` Markus Armbruster 2010-10-07 11:07 ` Edgar E. Iglesias 0 siblings, 1 reply; 5+ messages in thread From: Markus Armbruster @ 2010-10-07 10:08 UTC (permalink / raw) To: Blue Swirl; +Cc: Edgar E. Iglesias, qemu-devel Blue Swirl <blauwirbel@gmail.com> writes: > Compiling with GCC 4.6.0 20100925 produced warnings: > /src/qemu/target-cris/op_helper.c: In function 'helper_movl_sreg_reg': > /src/qemu/target-cris/op_helper.c:145:8: error: variable 'tlb_v' set > but not used [-Werror=unused-but-set-variable] > In file included from /src/qemu/target-cris/translate.c:3154:0: > /src/qemu/target-cris/translate_v10.c: In function 'dec10_prep_move_m': > /src/qemu/target-cris/translate_v10.c:111:22: error: variable 'rd' set > but not used [-Werror=unused-but-set-variable] > > Fix by making the variable declarations and their uses also conditional > to debug definition, delete rd. > > Signed-off-by: Blue Swirl <blauwirbel@gmail.com> > --- > target-cris/op_helper.c | 6 ++++++ > target-cris/translate_v10.c | 5 ++--- > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c > index a60da94..28c79b1 100644 > --- a/target-cris/op_helper.c > +++ b/target-cris/op_helper.c > @@ -142,7 +142,9 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) > uint32_t idx; > uint32_t lo, hi; > uint32_t vaddr; > +#ifdef CRIS_OP_HELPER_DEBUG > int tlb_v; > +#endif > > idx = set = env->sregs[SFR_RW_MM_TLB_SEL]; > set >>= 4; > @@ -157,13 +159,17 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) > vaddr = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].hi, > 13, 31); > vaddr <<= TARGET_PAGE_BITS; > +#ifdef CRIS_OP_HELPER_DEBUG > tlb_v = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].lo, > 3, 3); > +#endif > env->tlbsets[srs - 1][set][idx].lo = lo; > env->tlbsets[srs - 1][set][idx].hi = hi; > > +#ifdef CRIS_OP_HELPER_DEBUG > D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", > vaddr, tlb_v, env->pc); > +#endif > tlb_flush_page(env, vaddr); > } > } Could we eliminate the bothersome variable instead? diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c index a60da94..94e3e27 100644 --- a/target-cris/op_helper.c +++ b/target-cris/op_helper.c @@ -142,7 +142,6 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) uint32_t idx; uint32_t lo, hi; uint32_t vaddr; - int tlb_v; idx = set = env->sregs[SFR_RW_MM_TLB_SEL]; set >>= 4; @@ -157,13 +156,14 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) vaddr = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].hi, 13, 31); vaddr <<= TARGET_PAGE_BITS; - tlb_v = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].lo, + D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", + vaddr, + EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].lo, 3, 3); + env->pc); env->tlbsets[srs - 1][set][idx].lo = lo; env->tlbsets[srs - 1][set][idx].hi = hi; - D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", - vaddr, tlb_v, env->pc); tlb_flush_page(env, vaddr); } } Untested. [...] ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH 07/11] cris: avoid write only variables 2010-10-07 10:08 ` Markus Armbruster @ 2010-10-07 11:07 ` Edgar E. Iglesias 2010-10-07 17:57 ` Blue Swirl 0 siblings, 1 reply; 5+ messages in thread From: Edgar E. Iglesias @ 2010-10-07 11:07 UTC (permalink / raw) To: Markus Armbruster; +Cc: Blue Swirl, qemu-devel On Thu, Oct 07, 2010 at 12:08:05PM +0200, Markus Armbruster wrote: > Blue Swirl <blauwirbel@gmail.com> writes: > > > Compiling with GCC 4.6.0 20100925 produced warnings: > > /src/qemu/target-cris/op_helper.c: In function 'helper_movl_sreg_reg': > > /src/qemu/target-cris/op_helper.c:145:8: error: variable 'tlb_v' set > > but not used [-Werror=unused-but-set-variable] > > In file included from /src/qemu/target-cris/translate.c:3154:0: > > /src/qemu/target-cris/translate_v10.c: In function 'dec10_prep_move_m': > > /src/qemu/target-cris/translate_v10.c:111:22: error: variable 'rd' set > > but not used [-Werror=unused-but-set-variable] > > > > Fix by making the variable declarations and their uses also conditional > > to debug definition, delete rd. > > > > Signed-off-by: Blue Swirl <blauwirbel@gmail.com> > > --- > > target-cris/op_helper.c | 6 ++++++ > > target-cris/translate_v10.c | 5 ++--- > > 2 files changed, 8 insertions(+), 3 deletions(-) > > > > diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c > > index a60da94..28c79b1 100644 > > --- a/target-cris/op_helper.c > > +++ b/target-cris/op_helper.c > > @@ -142,7 +142,9 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) > > uint32_t idx; > > uint32_t lo, hi; > > uint32_t vaddr; > > +#ifdef CRIS_OP_HELPER_DEBUG > > int tlb_v; > > +#endif > > > > idx = set = env->sregs[SFR_RW_MM_TLB_SEL]; > > set >>= 4; > > @@ -157,13 +159,17 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) > > vaddr = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].hi, > > 13, 31); > > vaddr <<= TARGET_PAGE_BITS; > > +#ifdef CRIS_OP_HELPER_DEBUG > > tlb_v = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].lo, > > 3, 3); > > +#endif > > env->tlbsets[srs - 1][set][idx].lo = lo; > > env->tlbsets[srs - 1][set][idx].hi = hi; > > > > +#ifdef CRIS_OP_HELPER_DEBUG > > D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", > > vaddr, tlb_v, env->pc); > > +#endif > > tlb_flush_page(env, vaddr); > > } > > } > > Could we eliminate the bothersome variable instead? > > diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c > index a60da94..94e3e27 100644 > --- a/target-cris/op_helper.c > +++ b/target-cris/op_helper.c > @@ -142,7 +142,6 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) > uint32_t idx; > uint32_t lo, hi; > uint32_t vaddr; > - int tlb_v; > > idx = set = env->sregs[SFR_RW_MM_TLB_SEL]; > set >>= 4; > @@ -157,13 +156,14 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) > vaddr = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].hi, > 13, 31); > vaddr <<= TARGET_PAGE_BITS; > - tlb_v = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].lo, > + D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", > + vaddr, > + EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].lo, > 3, 3); > + env->pc); > env->tlbsets[srs - 1][set][idx].lo = lo; > env->tlbsets[srs - 1][set][idx].hi = hi; > > - D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", > - vaddr, tlb_v, env->pc); > tlb_flush_page(env, vaddr); > } > } Hi, Sorry for the late answer. Markus, I agree that removing tlb_v would have been better than ifdefs, but i think that the intent I originally had in mind was that there should not be a need to flush the entry from the QEMU TLB if the old guest entry was not valid. The following patch works on my side: diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c index a60da94..be9eb06 100644 --- a/target-cris/op_helper.c +++ b/target-cris/op_helper.c @@ -164,7 +164,9 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", vaddr, tlb_v, env->pc); - tlb_flush_page(env, vaddr); + if (tlb_v) { + tlb_flush_page(env, vaddr); + } } } #endif The target-cris/translate_v10.c hunk looks good. Blue, can you incorporate the tlb_v change in your patch set? Or if you prefer, I can commit that part on my side. Cheers ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH 07/11] cris: avoid write only variables 2010-10-07 11:07 ` Edgar E. Iglesias @ 2010-10-07 17:57 ` Blue Swirl 2010-10-07 19:44 ` Edgar E. Iglesias 0 siblings, 1 reply; 5+ messages in thread From: Blue Swirl @ 2010-10-07 17:57 UTC (permalink / raw) To: Edgar E. Iglesias; +Cc: Markus Armbruster, qemu-devel On Thu, Oct 7, 2010 at 11:07 AM, Edgar E. Iglesias <edgar.iglesias@gmail.com> wrote: > On Thu, Oct 07, 2010 at 12:08:05PM +0200, Markus Armbruster wrote: >> Blue Swirl <blauwirbel@gmail.com> writes: >> >> > Compiling with GCC 4.6.0 20100925 produced warnings: >> > /src/qemu/target-cris/op_helper.c: In function 'helper_movl_sreg_reg': >> > /src/qemu/target-cris/op_helper.c:145:8: error: variable 'tlb_v' set >> > but not used [-Werror=unused-but-set-variable] >> > In file included from /src/qemu/target-cris/translate.c:3154:0: >> > /src/qemu/target-cris/translate_v10.c: In function 'dec10_prep_move_m': >> > /src/qemu/target-cris/translate_v10.c:111:22: error: variable 'rd' set >> > but not used [-Werror=unused-but-set-variable] >> > >> > Fix by making the variable declarations and their uses also conditional >> > to debug definition, delete rd. >> > >> > Signed-off-by: Blue Swirl <blauwirbel@gmail.com> >> > --- >> > target-cris/op_helper.c | 6 ++++++ >> > target-cris/translate_v10.c | 5 ++--- >> > 2 files changed, 8 insertions(+), 3 deletions(-) >> > >> > diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c >> > index a60da94..28c79b1 100644 >> > --- a/target-cris/op_helper.c >> > +++ b/target-cris/op_helper.c >> > @@ -142,7 +142,9 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) >> > uint32_t idx; >> > uint32_t lo, hi; >> > uint32_t vaddr; >> > +#ifdef CRIS_OP_HELPER_DEBUG >> > int tlb_v; >> > +#endif >> > >> > idx = set = env->sregs[SFR_RW_MM_TLB_SEL]; >> > set >>= 4; >> > @@ -157,13 +159,17 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) >> > vaddr = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].hi, >> > 13, 31); >> > vaddr <<= TARGET_PAGE_BITS; >> > +#ifdef CRIS_OP_HELPER_DEBUG >> > tlb_v = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].lo, >> > 3, 3); >> > +#endif >> > env->tlbsets[srs - 1][set][idx].lo = lo; >> > env->tlbsets[srs - 1][set][idx].hi = hi; >> > >> > +#ifdef CRIS_OP_HELPER_DEBUG >> > D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", >> > vaddr, tlb_v, env->pc); >> > +#endif >> > tlb_flush_page(env, vaddr); >> > } >> > } >> >> Could we eliminate the bothersome variable instead? >> >> diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c >> index a60da94..94e3e27 100644 >> --- a/target-cris/op_helper.c >> +++ b/target-cris/op_helper.c >> @@ -142,7 +142,6 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) >> uint32_t idx; >> uint32_t lo, hi; >> uint32_t vaddr; >> - int tlb_v; >> >> idx = set = env->sregs[SFR_RW_MM_TLB_SEL]; >> set >>= 4; >> @@ -157,13 +156,14 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) >> vaddr = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].hi, >> 13, 31); >> vaddr <<= TARGET_PAGE_BITS; >> - tlb_v = EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].lo, >> + D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", >> + vaddr, >> + EXTRACT_FIELD(env->tlbsets[srs-1][set][idx].lo, >> 3, 3); >> + env->pc); >> env->tlbsets[srs - 1][set][idx].lo = lo; >> env->tlbsets[srs - 1][set][idx].hi = hi; >> >> - D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", >> - vaddr, tlb_v, env->pc); >> tlb_flush_page(env, vaddr); >> } >> } > > Hi, > > Sorry for the late answer. Late? I think my timescale is slightly different than yours :-) > Markus, I agree that removing tlb_v would have been better than ifdefs, > but i think that the intent I originally had in mind was that there should > not be a need to flush the entry from the QEMU TLB if the old guest > entry was not valid. > > > The following patch works on my side: > > diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c > index a60da94..be9eb06 100644 > --- a/target-cris/op_helper.c > +++ b/target-cris/op_helper.c > @@ -164,7 +164,9 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) > > D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", > vaddr, tlb_v, env->pc); > - tlb_flush_page(env, vaddr); > + if (tlb_v) { > + tlb_flush_page(env, vaddr); > + } > } > } > #endif > > > The target-cris/translate_v10.c hunk looks good. > > Blue, can you incorporate the tlb_v change in your patch set? > Or if you prefer, I can commit that part on my side. Please do. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH 07/11] cris: avoid write only variables 2010-10-07 17:57 ` Blue Swirl @ 2010-10-07 19:44 ` Edgar E. Iglesias 0 siblings, 0 replies; 5+ messages in thread From: Edgar E. Iglesias @ 2010-10-07 19:44 UTC (permalink / raw) To: Blue Swirl; +Cc: Markus Armbruster, qemu-devel On Thu, Oct 07, 2010 at 05:57:30PM +0000, Blue Swirl wrote: > On Thu, Oct 7, 2010 at 11:07 AM, Edgar E. Iglesias > <edgar.iglesias@gmail.com> wrote: > > On Thu, Oct 07, 2010 at 12:08:05PM +0200, Markus Armbruster wrote: > >> Blue Swirl <blauwirbel@gmail.com> writes: > >> > >> > Compiling with GCC 4.6.0 20100925 produced warnings: [...] > > Markus, I agree that removing tlb_v would have been better than ifdefs, > > but i think that the intent I originally had in mind was that there should > > not be a need to flush the entry from the QEMU TLB if the old guest > > entry was not valid. > > > > > > The following patch works on my side: > > > > diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c > > index a60da94..be9eb06 100644 > > --- a/target-cris/op_helper.c > > +++ b/target-cris/op_helper.c > > @@ -164,7 +164,9 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg) > > > > D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", > > vaddr, tlb_v, env->pc); > > - tlb_flush_page(env, vaddr); > > + if (tlb_v) { > > + tlb_flush_page(env, vaddr); > > + } > > } > > } > > #endif > > > > > > The target-cris/translate_v10.c hunk looks good. > > > > Blue, can you incorporate the tlb_v change in your patch set? > > Or if you prefer, I can commit that part on my side. > > Please do. OK, done. Thanks ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-10-07 19:44 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-10-06 21:33 [Qemu-devel] [PATCH 07/11] cris: avoid write only variables Blue Swirl 2010-10-07 10:08 ` Markus Armbruster 2010-10-07 11:07 ` Edgar E. Iglesias 2010-10-07 17:57 ` Blue Swirl 2010-10-07 19:44 ` Edgar E. Iglesias
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).