diff options
| author | Laurent Vivier | 2017-12-21 17:05:58 +0100 |
|---|---|---|
| committer | Laurent Vivier | 2017-12-21 20:11:28 +0100 |
| commit | 7deddf96e94f3e1eb3677db0ea7b53e61751b544 (patch) | |
| tree | 70ea4fbc4ae5e0a184eef4f28a8931f44dc53abf /target/m68k | |
| parent | target/m68k: add monitor.c (diff) | |
| download | qemu-7deddf96e94f3e1eb3677db0ea7b53e61751b544.tar.gz qemu-7deddf96e94f3e1eb3677db0ea7b53e61751b544.tar.xz qemu-7deddf96e94f3e1eb3677db0ea7b53e61751b544.zip | |
target/m68k: fix set_cc_op()
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.
Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20171221160558.14151-1-laurent@vivier.eu>
Diffstat (limited to 'target/m68k')
| -rw-r--r-- | target/m68k/cpu.h | 2 | ||||
| -rw-r--r-- | target/m68k/translate.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index afae5f68ac..5d03764eab 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -182,7 +182,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, diff --git a/target/m68k/translate.c b/target/m68k/translate.c index dfb2d5dad2..bbda7399ec 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -202,6 +202,7 @@ typedef void (*disas_proc)(CPUM68KState *env, DisasContext *s, uint16_t insn); #endif static const uint8_t cc_op_live[CC_OP_NB] = { + [CC_OP_DYNAMIC] = CCF_C | CCF_V | CCF_Z | CCF_N | CCF_X, [CC_OP_FLAGS] = CCF_C | CCF_V | CCF_Z | CCF_N | CCF_X, [CC_OP_ADDB ... CC_OP_ADDL] = CCF_X | CCF_N | CCF_V, [CC_OP_SUBB ... CC_OP_SUBL] = CCF_X | CCF_N | CCF_V, |