yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-22 19:40:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/m68k: fix set_cc_op()

Browse source 
The first call of set_cc_op() in a new translation sequence
is done with old_op set to CC_OP_DYNAMIC (-1).

This will do an out of bound access to the array cc_op_live[].

We fix that by adding an entry in cc_op_live[] for CC_OP_DYNAMIC.

Backports commit 7deddf96e94f3e1eb3677db0ea7b53e61751b544 from qemu
This commit is contained in:
Laurent Vivier 2018-03-05 14:44:33 -05:00 committed by Lioncash
parent cd93d4eb52
commit 4db1e153ae
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qemu/target/m68k/cpu.h
View file

@ -180,7 +180,7 @@ void cpu_m68k_set_fpcr(CPUM68KState *env, uint32_t val);
typedef enum {
/* Translator only -- use env->cc_op. */
CC_OP_DYNAMIC = -1,
CC_OP_DYNAMIC,
/* Each flag bit computed into cc_[xcnvz]. */
CC_OP_FLAGS,

1
qemu/target/m68k/translate.c
View file

@ -192,6 +192,7 @@ typedef void (*disas_proc)(CPUM68KState *env, DisasContext *s, uint16_t insn);
#endif
static const uint8_t cc_op_live[CC_OP_NB] = {
CCF_C | CCF_V | CCF_Z | CCF_N | CCF_X,
CCF_C | CCF_V | CCF_Z | CCF_N | CCF_X,
CCF_X | CCF_N | CCF_V,
CCF_X | CCF_N | CCF_V,