diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-03-02 15:38:17 -1000 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2024-03-22 00:32:00 +0300 |
| commit | efbcf7cead5e0969ec6df32b13dac3278bf3d62d (patch) | |
| tree | 04ff547f01298bcba05081b505e726aefc8371f9 /target/hppa/translate.c | |
| parent | f6f4703c5a0b2172a9bf8f9fa45b291cc93a2c3e (diff) | |
target/hppa: Fix assemble_11a insns for wide mode
Tested-by: Helge Deller <deller@gmx.de>
Reviewed-by: Helge Deller <deller@gmx.de>
Reported-by: Sven Schnelle <svens@stackframe.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
(cherry picked from commit 4768c28edd4097ebef42822e15b4a43026b15376)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'target/hppa/translate.c')
| -rw-r--r-- | target/hppa/translate.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 5d9f448acd..8c7a2fd331 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -121,12 +121,6 @@ static int expand_shl2(DisasContext *ctx, int val) return val << 2; } -/* Used for fp memory ops. */ -static int expand_shl3(DisasContext *ctx, int val) -{ - return val << 3; -} - /* Used for assemble_21. */ static int expand_shl11(DisasContext *ctx, int val) { @@ -144,6 +138,23 @@ static int assemble_6(DisasContext *ctx, int val) return (val ^ 31) + 1; } +/* Expander for assemble_16a(s,cat(im10a,0),i). */ +static int expand_11a(DisasContext *ctx, int val) +{ + /* + * @val is bit 0 and bits [4:15]. + * Swizzle thing around depending on PSW.W. + */ + int im10a = extract32(val, 1, 10); + int s = extract32(val, 11, 2); + int i = (-(val & 1) << 13) | (im10a << 3); + + if (ctx->tb_flags & PSW_W) { + i ^= s << 13; + } + return i; +} + /* Expander for assemble_16(s,im14). */ static int expand_16(DisasContext *ctx, int val) { |