| Message ID | 20230309201604.3885359-2-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/m68k: Reject immediate as destination | expand |
Le 09/03/2023 à 21:16, Richard Henderson a écrit : > In theory this should never happen, as all such instructions > are illegal. This is checked in e.g. gen_lea_mode and > gen_ea_mode_fp but not here. In case something higher up > isn't checking modes properly, return NULL_QREG. This will > result in an illegal instruction exception being raised. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/m68k/translate.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/target/m68k/translate.c b/target/m68k/translate.c > index 422f4652f1..e16c608ef8 100644 > --- a/target/m68k/translate.c > +++ b/target/m68k/translate.c > @@ -894,6 +894,10 @@ static TCGv gen_ea_mode(CPUM68KState *env, DisasContext *s, int mode, int reg0, > case 3: /* pc index+displacement. */ > goto do_indirect; > case 4: /* Immediate. */ > + /* Should never be used for an output or RMW input. */ > + if (what == EA_STORE || addrp) { > + return NULL_QREG; > + } > /* Sign extend values for consistency. */ > switch (opsize) { > case OS_BYTE: Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Le 09/03/2023 à 21:16, Richard Henderson a écrit : > In theory this should never happen, as all such instructions > are illegal. This is checked in e.g. gen_lea_mode and > gen_ea_mode_fp but not here. In case something higher up > isn't checking modes properly, return NULL_QREG. This will > result in an illegal instruction exception being raised. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/m68k/translate.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/target/m68k/translate.c b/target/m68k/translate.c > index 422f4652f1..e16c608ef8 100644 > --- a/target/m68k/translate.c > +++ b/target/m68k/translate.c > @@ -894,6 +894,10 @@ static TCGv gen_ea_mode(CPUM68KState *env, DisasContext *s, int mode, int reg0, > case 3: /* pc index+displacement. */ > goto do_indirect; > case 4: /* Immediate. */ > + /* Should never be used for an output or RMW input. */ > + if (what == EA_STORE || addrp) { > + return NULL_QREG; > + } > /* Sign extend values for consistency. */ > switch (opsize) { > case OS_BYTE: Reviewed-by: Laurent Vivier <laurent@vivier.eu>
diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 422f4652f1..e16c608ef8 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -894,6 +894,10 @@ static TCGv gen_ea_mode(CPUM68KState *env, DisasContext *s, int mode, int reg0, case 3: /* pc index+displacement. */ goto do_indirect; case 4: /* Immediate. */ + /* Should never be used for an output or RMW input. */ + if (what == EA_STORE || addrp) { + return NULL_QREG; + } /* Sign extend values for consistency. */ switch (opsize) { case OS_BYTE:
In theory this should never happen, as all such instructions are illegal. This is checked in e.g. gen_lea_mode and gen_ea_mode_fp but not here. In case something higher up isn't checking modes properly, return NULL_QREG. This will result in an illegal instruction exception being raised. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/m68k/translate.c | 4 ++++ 1 file changed, 4 insertions(+)