accel/tcg: Fix computing of is_write for MIPS
PATCH v4 1/1 accel/tcg: Fix computing of is_write for MIPS
Detect all MIPS store instructions in cpu_signal_handler for all available MIPS versions, and set is_write if encountering such store instructions.
This fixed the error while dealing with self-modified code for MIPS.
--- accel/tcg/user-exec.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-)
accel/tcg/user-exec.c +38 -1
@@ -702,6 +702,10 @@ int cpu_signal_handler(int host_signum, void *pinfo,#elif defined(__mips__) +#if defined(__misp16) || defined(__mips_micromips) +#error "Unsupported encoding" +#endif +int cpu_signal_handler (int host_signum,void *pinfo,void *puc) {
@@ -709,9 +713,42 @@ int cpu_signal_handler(int host_signum, void *pinfo,ucontext_t *uc = puc;greg_t pc = uc->uc_mcontext.pc;int is_write; +uint32_t insn; -/* XXX: compute is_write */ +/* Detect all store instructions at program counter. */ is_write =0 ; + insn = *(uint32_t *)pc; +switch ((insn >>26 ) &077 ) { +case 050 :/* SB */ +case 051 :/* SH */ +case 052 :/* SWL */ +case 053 :/* SW */ +case 054 :/* SDL */ +case 055 :/* SDR */ +case 056 :/* SWR */ +case 070 :/* SC */ +case 071 :/* SWC1 */ +case 074 :/* SCD */ +case 075 :/* SDC1 */ +case 077 :/* SD */ +#if !defined(__mips_isa_rev) || __mips_isa_rev <6 +case 072 :/* SWC2 */ +case 076 :/* SDC2 */ +#endif + is_write =1 ; +break ; +case 023 :/* COP1X */ +/* Required in all versions of MIPS64 since +MIPS64r1 and subsequent versions of MIPS32r2. */ +switch (insn &077 ) { +case 010 :/* SWXC1 */ +case 011 :/* SDXC1 */ +case 015 :/* SDXC1 */ + is_write =1 ; + } +break ; + } +return handle_cpu_signal (pc, info, is_write, &uc->uc_sigmask); }
Signature · 1 line
2.17.1
Quoted 8 lines · Kele Huang
Detect all MIPS store instructions in
cpu_signal_handlerfor all available MIPS versions, and setis_writeif encountering such store instructions.This fixed the error while dealing with self-modified code for MIPS.
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Kele Huang <[email protected]>Signed-off-by Xu Zou <[email protected]>
I already Cc'ed the TCG MIPS maintainers twice for you, but you don't mind, so this time I won't insist.
Quoted 64 lines
--- accel/tcg/user-exec.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-)accel/tcg/user-exec.c +38
-1@@ -702,6 +702,10 @@ int cpu_signal_handler(int host_signum, void *pinfo,#elif defined(__mips__) +#if defined(__misp16) || defined(__mips_micromips) +#error "Unsupported encoding" +#endif +int cpu_signal_handler (int host_signum,void *pinfo,void *puc) {@@ -709,9 +713,42 @@ int cpu_signal_handler(int host_signum, void *pinfo,ucontext_t *uc = puc;greg_t pc = uc->uc_mcontext.pc;int is_write; +uint32_t insn; -/* XXX: compute is_write */ +/* Detect all store instructions at program counter. */ is_write =0 ; + insn = *(uint32_t *)pc; +switch ((insn >>26 ) &077 ) { +case 050 :/* SB */ +case 051 :/* SH */ +case 052 :/* SWL */ +case 053 :/* SW */ +case 054 :/* SDL */ +case 055 :/* SDR */ +case 056 :/* SWR */ +case 070 :/* SC */ +case 071 :/* SWC1 */ +case 074 :/* SCD */ +case 075 :/* SDC1 */ +case 077 :/* SD */ +#if !defined(__mips_isa_rev) || __mips_isa_rev <6 +case 072 :/* SWC2 */ +case 076 :/* SDC2 */ +#endif + is_write =1 ; +break ; +case 023 :/* COP1X */ +/* Required in all versions of MIPS64 since +MIPS64r1 and subsequent versions of MIPS32r2. */ +switch (insn &077 ) { +case 010 :/* SWXC1 */ +case 011 :/* SDXC1 */ +case 015 :/* SDXC1 */ + is_write =1 ; + } +break ; + } +return handle_cpu_signal (pc, info, is_write, &uc->uc_sigmask); }
Sorry about that, I only got maintainers by './scripts/get_maintainer.pl -f accel/tcg/user-exec.c' and missed your advice about maintainers. In another words, I thought I had Cc'ed the TCG MIPS maintainers. 😅 And sorry to maintainers. 😅
Quoted 80 lines · Philippe Mathieu-Daudé
Quoted 1 line · Kele Huang
Detect all MIPS store instructions in
cpu_signal_handlerfor allavailable
Quoted 7 lines
MIPS versions, and set
is_writeif encountering such store instructions.This fixed the error while dealing with self-modified code for MIPS.
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Kele Huang <[email protected]>Signed-off-by Xu Zou <[email protected]>I already Cc'ed the TCG MIPS maintainers twice for you, but you don't mind, so this time I won't insist.
Quoted 64 lines
--- accel/tcg/user-exec.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-)accel/tcg/user-exec.c +38
-1@@ -702,6 +702,10 @@ int cpu_signal_handler(int host_signum, void *pinfo,#elif defined(__mips__) +#if defined(__misp16) || defined(__mips_micromips) +#error "Unsupported encoding" +#endif +int cpu_signal_handler (int host_signum,void *pinfo,void *puc) {@@ -709,9 +713,42 @@ int cpu_signal_handler(int host_signum, void *pinfo,ucontext_t *uc = puc;greg_t pc = uc->uc_mcontext.pc;int is_write; +uint32_t insn; -/* XXX: compute is_write */ +/* Detect all store instructions at program counter. */ is_write =0 ; + insn = *(uint32_t *)pc; +switch ((insn >>26 ) &077 ) { +case 050 :/* SB */ +case 051 :/* SH */ +case 052 :/* SWL */ +case 053 :/* SW */ +case 054 :/* SDL */ +case 055 :/* SDR */ +case 056 :/* SWR */ +case 070 :/* SC */ +case 071 :/* SWC1 */ +case 074 :/* SCD */ +case 075 :/* SDC1 */ +case 077 :/* SD */ +#if !defined(__mips_isa_rev) || __mips_isa_rev <6 +case 072 :/* SWC2 */ +case 076 :/* SDC2 */ +#endif + is_write =1 ; +break ; +case 023 :/* COP1X */ +/* Required in all versions of MIPS64 since +MIPS64r1 and subsequent versions of MIPS32r2. */ +switch (insn &077 ) { +case 010 :/* SWXC1 */ +case 011 :/* SDXC1 */ +case 015 :/* SDXC1 */ + is_write =1 ; + } +break ; + } +return handle_cpu_signal (pc, info, is_write, &uc->uc_sigmask); }
Quoted 7 lines · Kele Huang
Sorry about that, I only got maintainers by '
./scripts/get_maintainer.pl-faccel/tcg/user-exec.c' and missed your advice about maintainers. In another words, I thought I had Cc'ed the TCG MIPS maintainers. 😅 And sorry to maintainers. 😅Quoted 2 lines
This is fine, Kele. :)
The granularity of get_maintainer.py is at file level, so this is one of the cases where you can use your own judgement and include more email addresses, even though get_maintainer.py doesn't list them. get_maintainer.py is good most of the time, but not always. But not a big deal.
Thanks for the patch! :)
I expect Richard is going to include it in his next tcg queue.
Yours,
Aleksandar
Quoted 85 lines
Quoted 82 lines · Philippe Mathieu-Daudé
Quoted 1 line · Kele Huang
Detect all MIPS store instructions in
cpu_signal_handlerfor allavailable
Quoted 7 lines
MIPS versions, and set
is_writeif encountering such store instructions.This fixed the error while dealing with self-modified code for MIPS.
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Kele Huang <[email protected]>Signed-off-by Xu Zou <[email protected]>I already Cc'ed the TCG MIPS maintainers twice for you, but you don't mind, so this time I won't insist.
accel/tcg/user-exec.c int cpu_signal_handler(int host_signum, void
Quoted 9 lines
--- accel/tcg/user-exec.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-)accel/tcg/user-exec.c +0
-0@@ -702,6 +702,10 @@ int cpu_signal_handler(int host_signum, void*pinfo,
accel/tcg/user-exec.c int cpu_signal_handler(int host_signum, void
Quoted 11 lines
accel/tcg/user-exec.c +4
-0#elif defined(__mips__) +#if defined(__misp16) || defined(__mips_micromips) +#error "Unsupported encoding" +#endif +int cpu_signal_handler (int host_signum,void *pinfo,void *puc) {@@ -709,9 +713,42 @@ int cpu_signal_handler(int host_signum, void*pinfo,
Quoted 44 lines
accel/tcg/user-exec.c +34
-1ucontext_t *uc = puc;greg_t pc = uc->uc_mcontext.pc;int is_write; +uint32_t insn; -/* XXX: compute is_write */ +/* Detect all store instructions at program counter. */ is_write =0 ; + insn = *(uint32_t *)pc; +switch ((insn >>26 ) &077 ) { +case 050 :/* SB */ +case 051 :/* SH */ +case 052 :/* SWL */ +case 053 :/* SW */ +case 054 :/* SDL */ +case 055 :/* SDR */ +case 056 :/* SWR */ +case 070 :/* SC */ +case 071 :/* SWC1 */ +case 074 :/* SCD */ +case 075 :/* SDC1 */ +case 077 :/* SD */ +#if !defined(__mips_isa_rev) || __mips_isa_rev <6 +case 072 :/* SWC2 */ +case 076 :/* SDC2 */ +#endif + is_write =1 ; +break ; +case 023 :/* COP1X */ +/* Required in all versions of MIPS64 since +MIPS64r1 and subsequent versions of MIPS32r2. */ +switch (insn &077 ) { +case 010 :/* SWXC1 */ +case 011 :/* SDXC1 */ +case 015 :/* SDXC1 */ + is_write =1 ; + } +break ; + } +return handle_cpu_signal (pc, info, is_write, &uc->uc_sigmask); }
Thank you so much!
Quoted 113 lines · Aleksandar Markovic
Quoted 7 lines · Kele Huang
Sorry about that, I only got maintainers by '
./scripts/get_maintainer.pl-faccel/tcg/user-exec.c' and missed your advice about maintainers. In another words, I thought I had Cc'ed the TCG MIPS maintainers. 😅 And sorry to maintainers. 😅Quoted 2 lines
This is fine, Kele. :)
The granularity of
get_maintainer.pyis at file level, so this is one of the cases where you can use your own judgement and include more email addresses, even thoughget_maintainer.pydoesn't list them.get_maintainer.pyis good most of the time, but not always. But not a big deal.Thanks for the patch! :)
I expect Richard is going to include it in his next tcg queue.
Yours,
AleksandarQuoted 86 lines
Quoted 83 lines · Philippe Mathieu-Daudé
Quoted 1 line · Kele Huang
Detect all MIPS store instructions in
cpu_signal_handlerfor allavailable
Quoted 1 line
MIPS versions, and set
is_writeif encountering such storeinstructions.
Quoted 6 lines
This fixed the error while dealing with self-modified code for MIPS.
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Kele Huang <[email protected]>Signed-off-by Xu Zou <[email protected]>I already Cc'ed the TCG MIPS maintainers twice for you, but you don't mind, so this time I won't insist.
accel/tcg/user-exec.c int cpu_signal_handler(int host_signum, void
Quoted 9 lines
--- accel/tcg/user-exec.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-)accel/tcg/user-exec.c +0
-0@@ -702,6 +702,10 @@ int cpu_signal_handler(int host_signum, void*pinfo,
accel/tcg/user-exec.c int cpu_signal_handler(int host_signum, void
Quoted 11 lines
accel/tcg/user-exec.c +4
-0#elif defined(__mips__) +#if defined(__misp16) || defined(__mips_micromips) +#error "Unsupported encoding" +#endif +int cpu_signal_handler (int host_signum,void *pinfo,void *puc) {@@ -709,9 +713,42 @@ int cpu_signal_handler(int host_signum, void*pinfo,
Quoted 44 lines
accel/tcg/user-exec.c +34
-1ucontext_t *uc = puc;greg_t pc = uc->uc_mcontext.pc;int is_write; +uint32_t insn; -/* XXX: compute is_write */ +/* Detect all store instructions at program counter. */ is_write =0 ; + insn = *(uint32_t *)pc; +switch ((insn >>26 ) &077 ) { +case 050 :/* SB */ +case 051 :/* SH */ +case 052 :/* SWL */ +case 053 :/* SW */ +case 054 :/* SDL */ +case 055 :/* SDR */ +case 056 :/* SWR */ +case 070 :/* SC */ +case 071 :/* SWC1 */ +case 074 :/* SCD */ +case 075 :/* SDC1 */ +case 077 :/* SD */ +#if !defined(__mips_isa_rev) || __mips_isa_rev <6 +case 072 :/* SWC2 */ +case 076 :/* SDC2 */ +#endif + is_write =1 ; +break ; +case 023 :/* COP1X */ +/* Required in all versions of MIPS64 since +MIPS64r1 and subsequent versions of MIPS32r2. */ +switch (insn &077 ) { +case 010 :/* SWXC1 */ +case 011 :/* SDXC1 */ +case 015 :/* SDXC1 */ + is_write =1 ; + } +break ; + } +return handle_cpu_signal (pc, info, is_write, &uc->uc_sigmask); }
Quoted 1 line
+ case 015: /* SDXC1 */
I just found a comment mistake about SUXC1, and I have rectified it and resent a new patch.
Quoted 119 lines · Kele Huang
Thank you so much!
Quoted 113 lines · Aleksandar Markovic
Quoted 7 lines · Kele Huang
Sorry about that, I only got maintainers by '
./scripts/get_maintainer.pl-faccel/tcg/user-exec.c' and missed your advice about maintainers. In another words, I thought I had Cc'ed the TCG MIPS maintainers. 😅 And sorry to maintainers. 😅Quoted 2 lines
This is fine, Kele. :)
The granularity of
get_maintainer.pyis at file level, so this is one of the cases where you can use your own judgement and include more email addresses, even thoughget_maintainer.pydoesn't list them.get_maintainer.pyis good most of the time, but not always. But not a big deal.Thanks for the patch! :)
I expect Richard is going to include it in his next tcg queue.
Yours,
AleksandarQuoted 86 lines
Quoted 83 lines · Philippe Mathieu-Daudé
Quoted 1 line · Kele Huang
Detect all MIPS store instructions in
cpu_signal_handlerfor allavailable
Quoted 1 line
MIPS versions, and set
is_writeif encountering such storeinstructions.
Quoted 6 lines
This fixed the error while dealing with self-modified code for MIPS.
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Kele Huang <[email protected]>Signed-off-by Xu Zou <[email protected]>I already Cc'ed the TCG MIPS maintainers twice for you, but you don't mind, so this time I won't insist.
accel/tcg/user-exec.c int cpu_signal_handler(int host_signum, void
Quoted 9 lines
--- accel/tcg/user-exec.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-)accel/tcg/user-exec.c +0
-0@@ -702,6 +702,10 @@ int cpu_signal_handler(int host_signum, void*pinfo,
accel/tcg/user-exec.c int cpu_signal_handler(int host_signum, void
Quoted 11 lines
accel/tcg/user-exec.c +4
-0#elif defined(__mips__) +#if defined(__misp16) || defined(__mips_micromips) +#error "Unsupported encoding" +#endif +int cpu_signal_handler (int host_signum,void *pinfo,void *puc) {@@ -709,9 +713,42 @@ int cpu_signal_handler(int host_signum, void*pinfo,
Quoted 44 lines
accel/tcg/user-exec.c +34
-1ucontext_t *uc = puc;greg_t pc = uc->uc_mcontext.pc;int is_write; +uint32_t insn; -/* XXX: compute is_write */ +/* Detect all store instructions at program counter. */ is_write =0 ; + insn = *(uint32_t *)pc; +switch ((insn >>26 ) &077 ) { +case 050 :/* SB */ +case 051 :/* SH */ +case 052 :/* SWL */ +case 053 :/* SW */ +case 054 :/* SDL */ +case 055 :/* SDR */ +case 056 :/* SWR */ +case 070 :/* SC */ +case 071 :/* SWC1 */ +case 074 :/* SCD */ +case 075 :/* SDC1 */ +case 077 :/* SD */ +#if !defined(__mips_isa_rev) || __mips_isa_rev <6 +case 072 :/* SWC2 */ +case 076 :/* SDC2 */ +#endif + is_write =1 ; +break ; +case 023 :/* COP1X */ +/* Required in all versions of MIPS64 since +MIPS64r1 and subsequent versions of MIPS32r2. */ +switch (insn &077 ) { +case 010 :/* SWXC1 */ +case 011 :/* SDXC1 */ +case 015 :/* SDXC1 */ + is_write =1 ; + } +break ; + } +return handle_cpu_signal (pc, info, is_write, &uc->uc_sigmask); }