ppc: Add support for 'mffsl' instruction
PATCH v4 1/1 ppc: Add support for 'mffsl' instruction
From: "Paul A. Clarke" <[email protected]>
ISA 3.0B added a set of Floating-Point Status and Control Register (FPSCR)
instructions: mffsce, mffscdrn, mffscdrni, mffscrn, mffscrni, mffsl. This patch adds support for 'mffsl'.
'mffsl' is identical to 'mffs', except it only returns mode, status, and enable bits from the FPSCR.
On CPUs without support for 'mffsl' (below ISA 3.0), the 'mffsl' instruction will execute identically to 'mffs'.
Note: I renamed FPSCR_RN to FPSCR_RN0 so I could create an FPSCR_RN mask which is both bits of the FPSCR rounding mode, as defined in the ISA.
I also fixed a typo in the definition of FPSCR_FR.
v4:
- nit: added some braces to resolve a checkpatch complaint.
v3:
- Changed tcg_gen_and_i64 to tcg_gen_andi_i64, eliminating the need for a temporary, per review from Richard Henderson.
v2:
- I found that I copied too much of the 'mffs' implementation. The 'Rc' condition code bits are not needed for 'mffsl'. Removed.
- I now free the (renamed) 'tmask' temporary.
- I now bail early for older ISA to the original 'mffs' implementation.
--- disas/ppc.c | 5 +++++ target/ppc/cpu.h | 15 ++++++++++----- target/ppc/fpu_helper.c | 4 ++-- target/ppc/translate/fp-impl.inc.c | 22 ++++++++++++++++++++++ target/ppc/translate/fp-ops.inc.c | 4 +++- 5 files changed, 42 insertions(+), 8 deletions(-)
disas/ppc.c +5 -0
@@ -1765,6 +1765,9 @@ extract_tbr (unsigned long insn,/* An X_MASK with the RA and RB fields fixed. */ #define XRARB_MASK (X_MASK | RA_MASK | RB_MASK) +/* An X form instruction with the RA field fixed. */ +#define XRA (op, xop, ra) (X((op), (xop)) | (((ra) << 16) & XRA_MASK)) +/* An XRARB_MASK, but with the L bit clear. */ #define XRLARB_MASK (XRARB_MASK & ~((unsigned long) 1 << 16))
@@ -4998,6 +5001,8 @@ const struct powerpc_opcode powerpc_opcodes[] = { { "ddivq", XRC(63,546,0), X_MASK, POWER6, { FRT, FRA, FRB } }, { "ddivq.", XRC(63,546,1), X_MASK, POWER6, { FRT, FRA, FRB } }, +{ "mffsl", XRA(63,583,12), XRARB_MASK, POWER9, { FRT } }, + { "mffs", XRC(63,583,0), XRARB_MASK, COM, { FRT } }, { "mffs.", XRC(63,583,1), XRARB_MASK, COM, { FRT } },
target/ppc/cpu.h +10 -5
@@ -591,7 +591,7 @@ enum {#define FPSCR_XE 3/* Floating-point inexact exception enable */ #define FPSCR_NI 2/* Floating-point non-IEEE mode */ #define FPSCR_RN1 1 -#define FPSCR_RN 0/* Floating-point rounding control */ +#define FPSCR_RN0 0/* Floating-point rounding control */ #define fpscr_fex (((env->fpscr) >> FPSCR_FEX) & 0x1)#define fpscr_vx (((env->fpscr) >> FPSCR_VX) & 0x1)#define fpscr_ox (((env->fpscr) >> FPSCR_OX) & 0x1)
@@ -614,7 +614,7 @@ enum {#define fpscr_ze (((env->fpscr) >> FPSCR_ZE) & 0x1)#define fpscr_xe (((env->fpscr) >> FPSCR_XE) & 0x1)#define fpscr_ni (((env->fpscr) >> FPSCR_NI) & 0x1) -#define fpscr_rn (((env->fpscr) >> FPSCR_RN) & 0x3) +#define fpscr_rn (((env->fpscr) >> FPSCR_RN0) & 0x3)/* Invalid operation exception summary */ #define fpscr_ix ((env->fpscr) & ((1 << FPSCR_VXSNAN) | (1 << FPSCR_VXISI) | \ (1 << FPSCR_VXIDI) | (1 << FPSCR_VXZDZ) | \
@@ -640,7 +640,7 @@ enum {#define FP_VXZDZ (1ull << FPSCR_VXZDZ)#define FP_VXIMZ (1ull << FPSCR_VXIMZ)#define FP_VXVC (1ull << FPSCR_VXVC) -#define FP_FR (1ull << FSPCR_FR) +#define FP_FR (1ull << FPSCR_FR)#define FP_FI (1ull << FPSCR_FI)#define FP_C (1ull << FPSCR_C)#define FP_FL (1ull << FPSCR_FL)
@@ -648,7 +648,7 @@ enum {#define FP_FE (1ull << FPSCR_FE)#define FP_FU (1ull << FPSCR_FU)#define FP_FPCC (FP_FL | FP_FG | FP_FE | FP_FU) -#define FP_FPRF (FP_C | FP_FL | FP_FG | FP_FE | FP_FU) +#define FP_FPRF (FP_C | FP_FPCC)#define FP_VXSOFT (1ull << FPSCR_VXSOFT)#define FP_VXSQRT (1ull << FPSCR_VXSQRT)#define FP_VXCVI (1ull << FPSCR_VXCVI)
@@ -659,7 +659,12 @@ enum {#define FP_XE (1ull << FPSCR_XE)#define FP_NI (1ull << FPSCR_NI)#define FP_RN1 (1ull << FPSCR_RN1) -#define FP_RN (1ull << FPSCR_RN) +#define FP_RN0 (1ull << FPSCR_RN0) +#define FP_RN (FP_RN1 | FP_RN0) + +#define FP_MODE FP_RN +#define FP_ENABLES (FP_VE | FP_OE | FP_UE | FP_ZE | FP_XE) +#define FP_STATUS (FP_FR | FP_FI | FP_FPRF)/* the exception bits which can be cleared by mcrfs - includes FX */ #define FP_EX_CLEAR_BITS (FP_FX | FP_OX | FP_UX | FP_ZX | \
target/ppc/fpu_helper.c +2 -2
@@ -403,7 +403,7 @@ void helper_fpscr_clrbit(CPUPPCState *env, uint32_t bit)if (prev ==1 ) {switch (bit) {case FPSCR_RN1 : -case FPSCR_RN : +case FPSCR_RN0 :fpscr_set_rounding_mode (env);break ;case FPSCR_VXSNAN :
@@ -557,7 +557,7 @@ void helper_fpscr_setbit(CPUPPCState *env, uint32_t bit) }break ;case FPSCR_RN1 : -case FPSCR_RN : +case FPSCR_RN0 :fpscr_set_rounding_mode (env);break ;default :
target/ppc/translate/fp-impl.inc.c +22 -0
@@ -617,6 +617,28 @@ static void gen_mffs(DisasContext *ctx)tcg_temp_free_i64 (t0); } +/* mffsl */ +static void gen_mffsl (DisasContext *ctx) +{ +TCGv_i64 t0; + +if (unlikely (!(ctx->insns_flags2 &PPC2_ISA300 ))) { +return gen_mffs (ctx); + } + +if (unlikely (!ctx->fpu_enabled)) { +gen_exception (ctx,POWERPC_EXCP_FPU ); +return ; + } + t0 =tcg_temp_new_i64 (); +gen_reset_fpstatus (); +tcg_gen_extu_tl_i64 (t0, cpu_fpscr); +/* Mask everything except mode, status, and enables. */ +tcg_gen_andi_i64 (t0, t0,FP_MODE |FP_STATUS |FP_ENABLES ); +set_fpr (rD (ctx->opcode), t0); +tcg_temp_free_i64 (t0); +} +/* mtfsb0 */ static void gen_mtfsb0 (DisasContext *ctx) {
target/ppc/translate/fp-ops.inc.c +3 -1
@@ -104,7 +104,9 @@ GEN_HANDLER_E(fcpsgn, 0x3F, 0x08, 0x00, 0x00000000, PPC_NONE, PPC2_ISA205),GEN_HANDLER_E (fmrgew,0x3F ,0x06 ,0x1E ,0x00000001 ,PPC_NONE ,PPC2_VSX207 ),GEN_HANDLER_E (fmrgow,0x3F ,0x06 ,0x1A ,0x00000001 ,PPC_NONE ,PPC2_VSX207 ),GEN_HANDLER (mcrfs,0x3F ,0x00 ,0x02 ,0x0063F801 ,PPC_FLOAT ), -GEN_HANDLER (mffs,0x3F ,0x07 ,0x12 ,0x001FF800 ,PPC_FLOAT ), +GEN_HANDLER_E_2 (mffs,0x3F ,0x07 ,0x12 ,0x00 ,0x00000000 ,PPC_FLOAT ,PPC_NONE ), +GEN_HANDLER_E_2 (mffsl,0x3F ,0x07 ,0x12 ,0x18 ,0x00000000 ,PPC_FLOAT , +PPC2_ISA300 ),GEN_HANDLER (mtfsb0,0x3F ,0x06 ,0x02 ,0x001FF800 ,PPC_FLOAT ),GEN_HANDLER (mtfsb1,0x3F ,0x06 ,0x01 ,0x001FF800 ,PPC_FLOAT ), GEN_HANDLER(mtfsf, 0x3F, 0x07, 0x16, 0x00000000, PPC_FLOAT),
Signature · 1 line
1.8.3.1
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Type: series
Subject: [Qemu-devel] [PATCH v4] ppc: Add support for 'mffsl' instruction
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
* [new tag] patchew/[email protected] -> patchew/[email protected]
Submodule 'capstone' (https://git.qemu.org/git/capstone.git) registered for path 'capstone'
Submodule 'dtc' (https://git.qemu.org/git/dtc.git) registered for path 'dtc'
Submodule 'roms/QemuMacDrivers' (https://git.qemu.org/git/QemuMacDrivers.git) registered for path 'roms/QemuMacDrivers' Submodule 'roms/SLOF' (https://git.qemu.org/git/SLOF.git) registered for path 'roms/SLOF'
Submodule 'roms/edk2' (https://git.qemu.org/git/edk2.git) registered for path 'roms/edk2'
Submodule 'roms/ipxe' (https://git.qemu.org/git/ipxe.git) registered for path 'roms/ipxe'
Submodule 'roms/openbios' (https://git.qemu.org/git/openbios.git) registered for path 'roms/openbios'
Submodule 'roms/openhackware' (https://git.qemu.org/git/openhackware.git) registered for path 'roms/openhackware'
Submodule 'roms/opensbi' (https://git.qemu.org/git/opensbi.git) registered for path 'roms/opensbi'
Submodule 'roms/qemu-palcode' (https://git.qemu.org/git/qemu-palcode.git) registered for path 'roms/qemu-palcode'
Submodule 'roms/seabios' (https://git.qemu.org/git/seabios.git/) registered for path 'roms/seabios'
Submodule 'roms/seabios-hppa' (https://git.qemu.org/git/seabios-hppa.git) registered for path 'roms/seabios-hppa'
Submodule 'roms/sgabios' (https://git.qemu.org/git/sgabios.git) registered for path 'roms/sgabios'
Submodule 'roms/skiboot' (https://git.qemu.org/git/skiboot.git) registered for path 'roms/skiboot'
Submodule 'roms/u-boot' (https://git.qemu.org/git/u-boot.git) registered for path 'roms/u-boot'
Submodule 'roms/u-boot-sam460ex' (https://git.qemu.org/git/u-boot-sam460ex.git) registered for path 'roms/u-boot-sam460ex' Submodule 'slirp' (https://git.qemu.org/git/libslirp.git) registered for path 'slirp'
Submodule 'tests/fp/berkeley-softfloat-3' (https://git.qemu.org/git/berkeley-softfloat-3.git) registered for path 'tests/fp/berkeley-softfloat-3' Submodule 'tests/fp/berkeley-testfloat-3' (https://git.qemu.org/git/berkeley-testfloat-3.git) registered for path 'tests/fp/berkeley-testfloat-3' Submodule 'ui/keycodemapdb' (https://git.qemu.org/git/keycodemapdb.git) registered for path 'ui/keycodemapdb'
Cloning into 'capstone'...
Submodule path 'capstone': checked out '22ead3e0bfdb87516656453336160e0a37b066bf'
Cloning into 'dtc'...
Submodule path 'dtc': checked out '88f18909db731a627456f26d779445f84e449536'
Cloning into 'roms/QemuMacDrivers'...
Submodule path 'roms/QemuMacDrivers': checked out '90c488d5f4a407342247b9ea869df1c2d9c8e266'
Cloning into 'roms/SLOF'...
Submodule path 'roms/SLOF': checked out 'ba1ab360eebe6338bb8d7d83a9220ccf7e213af3'
Cloning into 'roms/edk2'...
Submodule path 'roms/edk2': checked out '20d2e5a125e34fc8501026613a71549b2a1a3e54'
Submodule 'SoftFloat' (https://github.com/ucb-bar/berkeley-softfloat-3.git) registered for path 'ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3' Submodule 'CryptoPkg/Library/OpensslLib/openssl' (https://github.com/openssl/openssl) registered for path 'CryptoPkg/Library/OpensslLib/openssl' Cloning into 'ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3'...
Submodule path 'roms/edk2/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3': checked out 'b64af41c3276f97f0e181920400ee056b9c88037' Cloning into 'CryptoPkg/Library/OpensslLib/openssl'...
Submodule path 'roms/edk2/CryptoPkg/Library/OpensslLib/openssl': checked out '50eaac9f3337667259de725451f201e784599687' Submodule 'boringssl' (https://boringssl.googlesource.com/boringssl) registered for path 'boringssl'
Submodule 'krb5' (https://github.com/krb5/krb5) registered for path 'krb5'
Submodule 'pyca.cryptography' (https://github.com/pyca/cryptography.git) registered for path 'pyca-cryptography'
Cloning into 'boringssl'...
Submodule path 'roms/edk2/CryptoPkg/Library/OpensslLib/openssl/boringssl': checked out '2070f8ad9151dc8f3a73bffaa146b5e6937a583f' Cloning into 'krb5'...
Submodule path 'roms/edk2/CryptoPkg/Library/OpensslLib/openssl/krb5': checked out 'b9ad6c49505c96a088326b62a52568e3484f2168' Cloning into 'pyca-cryptography'...
Submodule path 'roms/edk2/CryptoPkg/Library/OpensslLib/openssl/pyca-cryptography': checked out '09403100de2f6f1cdd0d484dcb8e620f1c335c8f' Cloning into 'roms/ipxe'...
Submodule path 'roms/ipxe': checked out 'de4565cbe76ea9f7913a01f331be3ee901bb6e17'
Cloning into 'roms/openbios'...
Submodule path 'roms/openbios': checked out 'c79e0ecb84f4f1ee3f73f521622e264edd1bf174'
Cloning into 'roms/openhackware'...
Submodule path 'roms/openhackware': checked out 'c559da7c8eec5e45ef1f67978827af6f0b9546f5'
Cloning into 'roms/opensbi'...
Submodule path 'roms/opensbi': checked out 'ce228ee0919deb9957192d723eecc8aaae2697c6'
Cloning into 'roms/qemu-palcode'...
Submodule path 'roms/qemu-palcode': checked out 'bf0e13698872450164fa7040da36a95d2d4b326f'
Cloning into 'roms/seabios'...
Submodule path 'roms/seabios': checked out 'a5cab58e9a3fb6e168aba919c5669bea406573b4'
Cloning into 'roms/seabios-hppa'...
Submodule path 'roms/seabios-hppa': checked out '0f4fe84658165e96ce35870fd19fc634e182e77b'
Cloning into 'roms/sgabios'...
Submodule path 'roms/sgabios': checked out 'cbaee52287e5f32373181cff50a00b6c4ac9015a'
Cloning into 'roms/skiboot'...
Submodule path 'roms/skiboot': checked out '261ca8e779e5138869a45f174caa49be6a274501'
Cloning into 'roms/u-boot'...
Submodule path 'roms/u-boot': checked out 'd3689267f92c5956e09cc7d1baa4700141662bff'
Cloning into 'roms/u-boot-sam460ex'...
Submodule path 'roms/u-boot-sam460ex': checked out '60b3916f33e617a815973c5a6df77055b2e3a588'
Cloning into 'slirp'...
Submodule path 'slirp': checked out '126c04acbabd7ad32c2b018fe10dfac2a3bc1210'
Cloning into 'tests/fp/berkeley-softfloat-3'...
Submodule path 'tests/fp/berkeley-softfloat-3': checked out 'b64af41c3276f97f0e181920400ee056b9c88037'
Cloning into 'tests/fp/berkeley-testfloat-3'...
Submodule path 'tests/fp/berkeley-testfloat-3': checked out '5a59dcec19327396a011a17fd924aed4fec416b3'
Cloning into 'ui/keycodemapdb'...
Submodule path 'ui/keycodemapdb': checked out '6b3d716e2b6472eb7189d3220552280ef3d832ce'
Switched to a new branch 'test'
4844c87 ppc: Add support for 'mffsl' instruction
=== OUTPUT BEGIN ===
ERROR: code indent should never use tabs
#57: FILE: disas/ppc.c:5004:
+{ "mffsl", XRA(63,583,12), XRARB_MASK,^IPOWER9,^I{ FRT } },$
ERROR: space required after that ',' (ctx:VxV)
#57: FILE: disas/ppc.c:5004:
+{ "mffsl", XRA(63,583,12), XRARB_MASK, POWER9, { FRT } },
^
ERROR: space required after that ',' (ctx:VxV)
#57: FILE: disas/ppc.c:5004:
+{ "mffsl", XRA(63,583,12), XRARB_MASK, POWER9, { FRT } },
^
total: 3 errors, 0 warnings, 116 lines checked
Commit 4844c8738d4c (ppc: Add support for 'mffsl' instruction) has style problems, please review. If any of these errors are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
David Gibson
AppliedOn Fri, Aug 16, 2019 at 02:03:23PM -0500, Paul A. Clarke wrote:
65;5603;1c> From: "Paul A. Clarke" <[email protected]>
Quoted 11 lines
ISA 3.0B added a set of Floating-Point Status and Control Register (FPSCR)
instructions: mffsce, mffscdrn, mffscdrni, mffscrn, mffscrni, mffsl. This patch adds support for 'mffsl'.'mffsl' is identical to 'mffs', except it only returns mode, status, and enable bits from the FPSCR.
On CPUs without support for 'mffsl' (below ISA 3.0), the 'mffsl' instruction will execute identically to 'mffs'.
Quoted 6 lines
Note: I renamed
FPSCR_RNtoFPSCR_RN0so I could create anFPSCR_RNmask which is both bits of the FPSCR rounding mode, as defined in the ISA.I also fixed a typo in the definition of
FPSCR_FR.Signed-off-by Paul A. Clarke <[email protected]>
Applied to ppc-for-4.2, thanks.
Quoted 169 lines
v4:
- nit: added some braces to resolve a checkpatch complaint.v3:
- Changedtcg_gen_and_i64totcg_gen_andi_i64, eliminating the need for a temporary, per review from Richard Henderson.v2:
- I found that I copied too much of the 'mffs' implementation. The 'Rc' condition code bits are not needed for 'mffsl'. Removed.
- I now free the (renamed) 'tmask' temporary.
- I now bail early for older ISA to the original 'mffs' implementation.--- disas/ppc.c | 5 +++++ target/ppc/cpu.h | 15 ++++++++++----- target/ppc/fpu_helper.c | 4 ++-- target/ppc/translate/fp-impl.inc.c | 22 ++++++++++++++++++++++ target/ppc/translate/fp-ops.inc.c | 4 +++- 5 files changed, 42 insertions(+), 8 deletions(-)disas/ppc.c +5
-0@@ -1765,6 +1765,9 @@ extract_tbr (unsigned long insn,/* An X_MASK with the RA and RB fields fixed. */ #define XRARB_MASK (X_MASK | RA_MASK | RB_MASK) +/* An X form instruction with the RA field fixed. */ +#define XRA (op, xop, ra) (X((op), (xop)) | (((ra) << 16) & XRA_MASK)) +/* An XRARB_MASK, but with the L bit clear. */ #define XRLARB_MASK (XRARB_MASK & ~((unsigned long) 1 << 16))@@ -4998,6 +5001,8 @@ const struct powerpc_opcode powerpc_opcodes[] = { { "ddivq", XRC(63,546,0), X_MASK, POWER6, { FRT, FRA, FRB } }, { "ddivq.", XRC(63,546,1), X_MASK, POWER6, { FRT, FRA, FRB } }, +{ "mffsl", XRA(63,583,12), XRARB_MASK, POWER9, { FRT } }, + { "mffs", XRC(63,583,0), XRARB_MASK, COM, { FRT } }, { "mffs.", XRC(63,583,1), XRARB_MASK, COM, { FRT } },target/ppc/cpu.h +10
-5@@ -591,7 +591,7 @@ enum {#define FPSCR_XE 3/* Floating-point inexact exception enable */ #define FPSCR_NI 2/* Floating-point non-IEEE mode */ #define FPSCR_RN1 1 -#define FPSCR_RN 0/* Floating-point rounding control */ +#define FPSCR_RN0 0/* Floating-point rounding control */ #define fpscr_fex (((env->fpscr) >> FPSCR_FEX) & 0x1)#define fpscr_vx (((env->fpscr) >> FPSCR_VX) & 0x1)#define fpscr_ox (((env->fpscr) >> FPSCR_OX) & 0x1)@@ -614,7 +614,7 @@ enum {#define fpscr_ze (((env->fpscr) >> FPSCR_ZE) & 0x1)#define fpscr_xe (((env->fpscr) >> FPSCR_XE) & 0x1)#define fpscr_ni (((env->fpscr) >> FPSCR_NI) & 0x1) -#define fpscr_rn (((env->fpscr) >> FPSCR_RN) & 0x3) +#define fpscr_rn (((env->fpscr) >> FPSCR_RN0) & 0x3)/* Invalid operation exception summary */ #define fpscr_ix ((env->fpscr) & ((1 << FPSCR_VXSNAN) | (1 << FPSCR_VXISI) | \ (1 << FPSCR_VXIDI) | (1 << FPSCR_VXZDZ) | \@@ -640,7 +640,7 @@ enum {#define FP_VXZDZ (1ull << FPSCR_VXZDZ)#define FP_VXIMZ (1ull << FPSCR_VXIMZ)#define FP_VXVC (1ull << FPSCR_VXVC) -#define FP_FR (1ull << FSPCR_FR) +#define FP_FR (1ull << FPSCR_FR)#define FP_FI (1ull << FPSCR_FI)#define FP_C (1ull << FPSCR_C)#define FP_FL (1ull << FPSCR_FL)@@ -648,7 +648,7 @@ enum {#define FP_FE (1ull << FPSCR_FE)#define FP_FU (1ull << FPSCR_FU)#define FP_FPCC (FP_FL | FP_FG | FP_FE | FP_FU) -#define FP_FPRF (FP_C | FP_FL | FP_FG | FP_FE | FP_FU) +#define FP_FPRF (FP_C | FP_FPCC)#define FP_VXSOFT (1ull << FPSCR_VXSOFT)#define FP_VXSQRT (1ull << FPSCR_VXSQRT)#define FP_VXCVI (1ull << FPSCR_VXCVI)@@ -659,7 +659,12 @@ enum {#define FP_XE (1ull << FPSCR_XE)#define FP_NI (1ull << FPSCR_NI)#define FP_RN1 (1ull << FPSCR_RN1) -#define FP_RN (1ull << FPSCR_RN) +#define FP_RN0 (1ull << FPSCR_RN0) +#define FP_RN (FP_RN1 | FP_RN0) + +#define FP_MODE FP_RN +#define FP_ENABLES (FP_VE | FP_OE | FP_UE | FP_ZE | FP_XE) +#define FP_STATUS (FP_FR | FP_FI | FP_FPRF)/* the exception bits which can be cleared by mcrfs - includes FX */ #define FP_EX_CLEAR_BITS (FP_FX | FP_OX | FP_UX | FP_ZX | \target/ppc/fpu_helper.c +2
-2@@ -403,7 +403,7 @@ void helper_fpscr_clrbit(CPUPPCState *env, uint32_t bit)if (prev ==1 ) {switch (bit) {case FPSCR_RN1 : -case FPSCR_RN : +case FPSCR_RN0 :fpscr_set_rounding_mode (env);break ;case FPSCR_VXSNAN :@@ -557,7 +557,7 @@ void helper_fpscr_setbit(CPUPPCState *env, uint32_t bit) }break ;case FPSCR_RN1 : -case FPSCR_RN : +case FPSCR_RN0 :fpscr_set_rounding_mode (env);break ;default :target/ppc/translate/fp-impl.inc.c +22
-0@@ -617,6 +617,28 @@ static void gen_mffs(DisasContext *ctx)tcg_temp_free_i64 (t0); } +/* mffsl */ +static void gen_mffsl (DisasContext *ctx) +{ +TCGv_i64 t0; + +if (unlikely (!(ctx->insns_flags2 &PPC2_ISA300 ))) { +return gen_mffs (ctx); + } + +if (unlikely (!ctx->fpu_enabled)) { +gen_exception (ctx,POWERPC_EXCP_FPU ); +return ; + } + t0 =tcg_temp_new_i64 (); +gen_reset_fpstatus (); +tcg_gen_extu_tl_i64 (t0, cpu_fpscr); +/* Mask everything except mode, status, and enables. */ +tcg_gen_andi_i64 (t0, t0,FP_MODE |FP_STATUS |FP_ENABLES ); +set_fpr (rD (ctx->opcode), t0); +tcg_temp_free_i64 (t0); +} +/* mtfsb0 */ static void gen_mtfsb0 (DisasContext *ctx) {target/ppc/translate/fp-ops.inc.c +3
-1@@ -104,7 +104,9 @@ GEN_HANDLER_E(fcpsgn, 0x3F, 0x08, 0x00, 0x00000000, PPC_NONE, PPC2_ISA205),GEN_HANDLER_E (fmrgew,0x3F ,0x06 ,0x1E ,0x00000001 ,PPC_NONE ,PPC2_VSX207 ),GEN_HANDLER_E (fmrgow,0x3F ,0x06 ,0x1A ,0x00000001 ,PPC_NONE ,PPC2_VSX207 ),GEN_HANDLER (mcrfs,0x3F ,0x00 ,0x02 ,0x0063F801 ,PPC_FLOAT ), -GEN_HANDLER (mffs,0x3F ,0x07 ,0x12 ,0x001FF800 ,PPC_FLOAT ), +GEN_HANDLER_E_2 (mffs,0x3F ,0x07 ,0x12 ,0x00 ,0x00000000 ,PPC_FLOAT ,PPC_NONE ), +GEN_HANDLER_E_2 (mffsl,0x3F ,0x07 ,0x12 ,0x18 ,0x00000000 ,PPC_FLOAT , +PPC2_ISA300 ),GEN_HANDLER (mtfsb0,0x3F ,0x06 ,0x02 ,0x001FF800 ,PPC_FLOAT ),GEN_HANDLER (mtfsb1,0x3F ,0x06 ,0x01 ,0x001FF800 ,PPC_FLOAT ), GEN_HANDLER(mtfsf, 0x3F, 0x07, 0x16, 0x00000000, PPC_FLOAT),
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson