openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix illegal instruction exception number 

-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJb2uTZAAoJEPMMOL0/L748kSsQAJkKQ01pLaR5pmsKPXW4C65t
 TANizrw7KfPn2nehSTfB0kgkgh+rkg4zGP2QOjoChmG1lAm6VMovvRZ+nzCF7grd
 np4rkpLG+8rtW4Tryox39K/67LfZxpVI27rOwV4ER5t/bGNXa9GM9RxEHpdqt9jL
 1MiTit4HN3h6ZhiRYavnn/73kSDrHIGovYylIv09knDY9+k/N/xV4lX2QoPYPAKi
 xi3UwT1MH+0/S4IOnE/u7/uNSlx2fWFIRKTw4djqgZcG6G7cBkOKYxForUC5hdUM
 sCYx0lzMVYnn0mhcql2NTV8sjlfiGnITVbzjqhCab4+l4pajNrhOGI+8fhhZY4jX
 vBTRy4+ZkrSk7/2uSI1k20W4LtGq77ml7BW3yBvjgDf0maGHYW4xKktq4KR340/w
 EB10WwNLbTDVqyCyNPw9rhrt/blwbilfLvQBS7RT+MViTgrl5zyEJ+4k7/l3+IK7
 INFamae71MjiBnjJrdgcyDUGXx+3voXU3BbfG+kFTgaSpux2gbepU2fjDyvVxg9w
 NjIfsA7C5HYQRlb0VFjBKiGxkshcLldpt/TZiw6JqLLQNlRF1X5rCwuvvaYeqFv8
 cwnHUGTl3DuxxMUwNsnOUOyzQFVfszznCeD0QkxLYNL5xyUIZJ5EB0oM8mcCCyF3
 lkM3juYLKbCAuP4Zwlks
 =GIJx
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-3.1-pull-request' into staging

Fix illegal instruction exception number

# gpg: Signature made Thu 01 Nov 2018 11:34:49 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier/tags/m68k-for-3.1-pull-request:
  target/m68k: use EXCP_ILLEGAL instead of EXCP_UNSUPPORTED

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-11-02 11:27:46 +00:00
parent 2959fb7fe5 b9f8e55bf7
commit fbdd2b2b03
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
linux-user/m68k/cpu_loop.c
View File

@ -55,7 +55,6 @@ void cpu_loop(CPUM68KState *env)
break;
case EXCP_LINEA:
case EXCP_LINEF:
case EXCP_UNSUPPORTED:
do_sigill:
info.si_signo = TARGET_SIGILL;
info.si_errno = 0;

1
target/m68k/cpu.h
View File

@ -70,7 +70,6 @@
#define EXCP_MMU_CONF 56 /* MMU Configuration Error */
#define EXCP_MMU_ILLEGAL 57 /* MMU Illegal Operation Error */
#define EXCP_MMU_ACCESS 58 /* MMU Access Level Violation Error */
#define EXCP_UNSUPPORTED 61
#define EXCP_RTE 0x100
#define EXCP_HALT_INSN 0x101

6
target/m68k/translate.c
View File

@ -1553,7 +1553,7 @@ DISAS_INSN(undef)
but actually illegal for CPU32 or pre-68020. */
qemu_log_mask(LOG_UNIMP, "Illegal instruction: %04x @ %08x\n",
insn, s->base.pc_next);
gen_exception(s, s->base.pc_next, EXCP_UNSUPPORTED);
gen_exception(s, s->base.pc_next, EXCP_ILLEGAL);
}
DISAS_INSN(mulw)
@ -2800,7 +2800,7 @@ DISAS_INSN(mull)
if (ext & 0x400) {
if (!m68k_feature(s->env, M68K_FEATURE_QUAD_MULDIV)) {
gen_exception(s, s->base.pc_next, EXCP_UNSUPPORTED);
gen_exception(s, s->base.pc_next, EXCP_ILLEGAL);
return;
}
@ -4510,7 +4510,7 @@ DISAS_INSN(strldsr)
addr = s->pc - 2;
ext = read_im16(env, s);
if (ext != 0x46FC) {
gen_exception(s, addr, EXCP_UNSUPPORTED);
gen_exception(s, addr, EXCP_ILLEGAL);
return;
}
ext = read_im16(env, s);