* [Qemu-devel] [PATCH] target-mips: Use EXCP_SC rather than a magic number
@ 2012-12-10 16:15 陳韋任 (Wei-Ren Chen)
2012-12-20 1:23 ` 陳韋任 (Wei-Ren Chen)
2013-01-01 11:03 ` Aurelien Jarno
0 siblings, 2 replies; 6+ messages in thread
From: 陳韋任 (Wei-Ren Chen) @ 2012-12-10 16:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Johnson, Eric, Aurelien Jarno
From the discussion on the ML [1], the exception limit defined by
magic number 0x100 is actually EXCP_SC defined in cpu.h. Replace the
magic number with EXCP_SC. Remove "#if 1 .. #endif" as well.
[1] http://lists.gnu.org/archive/html/qemu-devel/2012-11/msg03080.html
Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
---
target-mips/op_helper.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index f45d494..98a445c 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -39,10 +39,10 @@ static inline void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env,
uintptr_t pc)
{
TranslationBlock *tb;
-#if 1
- if (exception < 0x100)
+ if (exception < EXCP_SC) {
qemu_log("%s: %d %d\n", __func__, exception, error_code);
-#endif
+ }
+
env->exception_index = exception;
env->error_code = error_code;
--
1.7.3.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] target-mips: Use EXCP_SC rather than a magic number
2012-12-10 16:15 [Qemu-devel] [PATCH] target-mips: Use EXCP_SC rather than a magic number 陳韋任 (Wei-Ren Chen)
@ 2012-12-20 1:23 ` 陳韋任 (Wei-Ren Chen)
2012-12-20 1:59 ` li guang
2013-01-01 11:03 ` Aurelien Jarno
1 sibling, 1 reply; 6+ messages in thread
From: 陳韋任 (Wei-Ren Chen) @ 2012-12-20 1:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Johnson, Eric, Aurelien Jarno
ping? :-)
On Tue, Dec 11, 2012 at 12:15:55AM +0800, 陳韋任 (Wei-Ren Chen) wrote:
> From the discussion on the ML [1], the exception limit defined by
> magic number 0x100 is actually EXCP_SC defined in cpu.h. Replace the
> magic number with EXCP_SC. Remove "#if 1 .. #endif" as well.
>
> [1] http://lists.gnu.org/archive/html/qemu-devel/2012-11/msg03080.html
>
> Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
> ---
> target-mips/op_helper.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
> index f45d494..98a445c 100644
> --- a/target-mips/op_helper.c
> +++ b/target-mips/op_helper.c
> @@ -39,10 +39,10 @@ static inline void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env,
> uintptr_t pc)
> {
> TranslationBlock *tb;
> -#if 1
> - if (exception < 0x100)
> + if (exception < EXCP_SC) {
> qemu_log("%s: %d %d\n", __func__, exception, error_code);
> -#endif
> + }
> +
> env->exception_index = exception;
> env->error_code = error_code;
>
> --
> 1.7.3.4
--
Wei-Ren Chen (陳韋任)
Computer Systems Lab, Institute of Information Science,
Academia Sinica, Taiwan (R.O.C.)
Tel:886-2-2788-3799 #1667
Homepage: http://people.cs.nctu.edu.tw/~chenwj
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] target-mips: Use EXCP_SC rather than a magic number
2012-12-20 1:23 ` 陳韋任 (Wei-Ren Chen)
@ 2012-12-20 1:59 ` li guang
2012-12-20 2:14 ` 陳韋任 (Wei-Ren Chen)
0 siblings, 1 reply; 6+ messages in thread
From: li guang @ 2012-12-20 1:59 UTC (permalink / raw)
To: 陳韋任 (Wei-Ren Chen)
Cc: qemu-devel, Aurelien Jarno, Johnson, Eric
在 2012-12-20四的 09:23 +0800，陳韋任 (Wei-Ren Chen)写道：
> ping? :-)
>
> On Tue, Dec 11, 2012 at 12:15:55AM +0800, 陳韋任 (Wei-Ren Chen) wrote:
> > From the discussion on the ML [1], the exception limit defined by
> > magic number 0x100 is actually EXCP_SC defined in cpu.h. Replace the
> > magic number with EXCP_SC. Remove "#if 1 .. #endif" as well.
> >
> > [1] http://lists.gnu.org/archive/html/qemu-devel/2012-11/msg03080.html
> >
> > Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
> > ---
> > target-mips/op_helper.c | 6 +++---
> > 1 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
> > index f45d494..98a445c 100644
> > --- a/target-mips/op_helper.c
> > +++ b/target-mips/op_helper.c
> > @@ -39,10 +39,10 @@ static inline void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env,
> > uintptr_t pc)
> > {
> > TranslationBlock *tb;
> > -#if 1
> > - if (exception < 0x100)
> > + if (exception < EXCP_SC) {
> > qemu_log("%s: %d %d\n", __func__, exception, error_code);
> > -#endif
> > + }
> > +
seems original '#if 1, #endif' statement
is for temporary debug only,
so maybe can be concealed out entirely.
for log purpose, every exception code
will log when 'do_interrupt' for MIPS
if log is enabled.
> > env->exception_index = exception;
> > env->error_code = error_code;
> >
> > --
> > 1.7.3.4
>
--
regards!
li guang
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] target-mips: Use EXCP_SC rather than a magic number
2012-12-20 1:59 ` li guang
@ 2012-12-20 2:14 ` 陳韋任 (Wei-Ren Chen)
2013-01-01 11:07 ` Aurelien Jarno
0 siblings, 1 reply; 6+ messages in thread
From: 陳韋任 (Wei-Ren Chen) @ 2012-12-20 2:14 UTC (permalink / raw)
To: li guang
Cc: Aurelien Jarno, qemu-devel,
陳韋任 (Wei-Ren Chen), Johnson, Eric
Hi Li,
> > > Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
> > > ---
> > > target-mips/op_helper.c | 6 +++---
> > > 1 files changed, 3 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
> > > index f45d494..98a445c 100644
> > > --- a/target-mips/op_helper.c
> > > +++ b/target-mips/op_helper.c
> > > @@ -39,10 +39,10 @@ static inline void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env,
> > > uintptr_t pc)
> > > {
> > > TranslationBlock *tb;
> > > -#if 1
> > > - if (exception < 0x100)
> > > + if (exception < EXCP_SC) {
> > > qemu_log("%s: %d %d\n", __func__, exception, error_code);
> > > -#endif
> > > + }
> > > +
>
> seems original '#if 1, #endif' statement
> is for temporary debug only,
> so maybe can be concealed out entirely.
> for log purpose, every exception code
> will log when 'do_interrupt' for MIPS
> if log is enabled.
Thanks for your feedback. You mean the code snippet below?
--- target-mips/helper.c
void do_interrupt (CPUMIPSState *env)
{
...
if (qemu_log_enabled() && env->exception_index != EXCP_EXT_INTERRUPT) {
if (env->exception_index < 0 || env->exception_index > EXCP_LAST)
name = "unknown";
else
name = excp_names[env->exception_index];
qemu_log("%s enter: PC " TARGET_FMT_lx " EPC " TARGET_FMT_lx " %s exception\n",
__func__, env->active_tc.PC, env->CP0_EPC, name);
}
...
}
Maybe we can do this way?
---
diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index 31602ac..507a213 100644
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -616,9 +616,9 @@ enum {
EXCP_DSPDIS,
EXCP_LAST = EXCP_DSPDIS,
+ /* Dummy exception for conditional stores. */
+ EXCP_SC = EXCP_LAST,
};
-/* Dummy exception for conditional stores. */
-#define EXCP_SC 0x100
/*
* This is an interrnally generated WAKE request line.
---
Aurelien, Johnson, thoughts? :)
Regards,
chenwj
--
Wei-Ren Chen (陳韋任)
Computer Systems Lab, Institute of Information Science,
Academia Sinica, Taiwan (R.O.C.)
Tel:886-2-2788-3799 #1667
Homepage: http://people.cs.nctu.edu.tw/~chenwj
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] target-mips: Use EXCP_SC rather than a magic number
2012-12-10 16:15 [Qemu-devel] [PATCH] target-mips: Use EXCP_SC rather than a magic number 陳韋任 (Wei-Ren Chen)
2012-12-20 1:23 ` 陳韋任 (Wei-Ren Chen)
@ 2013-01-01 11:03 ` Aurelien Jarno
1 sibling, 0 replies; 6+ messages in thread
From: Aurelien Jarno @ 2013-01-01 11:03 UTC (permalink / raw)
To: 陳韋任 (Wei-Ren Chen); +Cc: qemu-devel, Johnson, Eric
On Tue, Dec 11, 2012 at 12:15:55AM +0800, 陳韋任 (Wei-Ren Chen) wrote:
> From the discussion on the ML [1], the exception limit defined by
> magic number 0x100 is actually EXCP_SC defined in cpu.h. Replace the
> magic number with EXCP_SC. Remove "#if 1 .. #endif" as well.
>
> [1] http://lists.gnu.org/archive/html/qemu-devel/2012-11/msg03080.html
>
> Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
> ---
> target-mips/op_helper.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
> index f45d494..98a445c 100644
> --- a/target-mips/op_helper.c
> +++ b/target-mips/op_helper.c
> @@ -39,10 +39,10 @@ static inline void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env,
> uintptr_t pc)
> {
> TranslationBlock *tb;
> -#if 1
> - if (exception < 0x100)
> + if (exception < EXCP_SC) {
> qemu_log("%s: %d %d\n", __func__, exception, error_code);
> -#endif
> + }
> +
> env->exception_index = exception;
> env->error_code = error_code;
>
Thanks, applied.
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] target-mips: Use EXCP_SC rather than a magic number
2012-12-20 2:14 ` 陳韋任 (Wei-Ren Chen)
@ 2013-01-01 11:07 ` Aurelien Jarno
0 siblings, 0 replies; 6+ messages in thread
From: Aurelien Jarno @ 2013-01-01 11:07 UTC (permalink / raw)
To: 陳韋任 (Wei-Ren Chen)
Cc: qemu-devel, li guang, Johnson, Eric
On Thu, Dec 20, 2012 at 10:14:20AM +0800, 陳韋任 (Wei-Ren Chen) wrote:
> Hi Li,
>
> > > > Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
> > > > ---
> > > > target-mips/op_helper.c | 6 +++---
> > > > 1 files changed, 3 insertions(+), 3 deletions(-)
> > > >
> > > > diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
> > > > index f45d494..98a445c 100644
> > > > --- a/target-mips/op_helper.c
> > > > +++ b/target-mips/op_helper.c
> > > > @@ -39,10 +39,10 @@ static inline void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env,
> > > > uintptr_t pc)
> > > > {
> > > > TranslationBlock *tb;
> > > > -#if 1
> > > > - if (exception < 0x100)
> > > > + if (exception < EXCP_SC) {
> > > > qemu_log("%s: %d %d\n", __func__, exception, error_code);
> > > > -#endif
> > > > + }
> > > > +
> >
> > seems original '#if 1, #endif' statement
> > is for temporary debug only,
> > so maybe can be concealed out entirely.
> > for log purpose, every exception code
> > will log when 'do_interrupt' for MIPS
> > if log is enabled.
>
> Thanks for your feedback. You mean the code snippet below?
>
> --- target-mips/helper.c
> void do_interrupt (CPUMIPSState *env)
> {
> ...
>
> if (qemu_log_enabled() && env->exception_index != EXCP_EXT_INTERRUPT) {
> if (env->exception_index < 0 || env->exception_index > EXCP_LAST)
> name = "unknown";
> else
> name = excp_names[env->exception_index];
>
> qemu_log("%s enter: PC " TARGET_FMT_lx " EPC " TARGET_FMT_lx " %s exception\n",
> __func__, env->active_tc.PC, env->CP0_EPC, name);
> }
>
> ...
> }
>
I don't think this is necessary to add a qemu_log_enabled(), this is
already something included in qemu_log().
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-01 11:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-10 16:15 [Qemu-devel] [PATCH] target-mips: Use EXCP_SC rather than a magic number 陳韋任 (Wei-Ren Chen)
2012-12-20 1:23 ` 陳韋任 (Wei-Ren Chen)
2012-12-20 1:59 ` li guang
2012-12-20 2:14 ` 陳韋任 (Wei-Ren Chen)
2013-01-01 11:07 ` Aurelien Jarno
2013-01-01 11:03 ` Aurelien Jarno
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).