From: Andreas Sandberg Date: Mon, 30 Sep 2013 10:06:36 +0000 (+0200) Subject: x86: Add support for FXSAVE, FXSAVE64, FXRSTOR, and FXRSTOR64 X-Git-Tag: stable_2014_02_15~107 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=114b643dd0125518c5f0b40959057dcf316f5007;p=gem5.git x86: Add support for FXSAVE, FXSAVE64, FXRSTOR, and FXRSTOR64 --- diff --git a/src/arch/x86/isa/decoder/two_byte_opcodes.isa b/src/arch/x86/isa/decoder/two_byte_opcodes.isa index 294509df3..fb3add4ac 100644 --- a/src/arch/x86/isa/decoder/two_byte_opcodes.isa +++ b/src/arch/x86/isa/decoder/two_byte_opcodes.isa @@ -762,8 +762,16 @@ default: Inst::UD2(); } default: decode MODRM_REG { - 0x0: fxsave(); - 0x1: fxrstor(); + 0x0: decode OPSIZE { + 4: Inst::FXSAVE(M); + 8: Inst::FXSAVE64(M); + default: fxsave(); + } + 0x1: decode OPSIZE { + 4: Inst::FXRSTOR(M); + 8: Inst::FXRSTOR64(M); + default: fxrstor(); + } 0x2: Inst::LDMXCSR(Md); 0x3: Inst::STMXCSR(Md); 0x4: xsave(); diff --git a/src/arch/x86/isa/insts/simd128/integer/save_and_restore_state/save_and_restore_state.py b/src/arch/x86/isa/insts/simd128/integer/save_and_restore_state/save_and_restore_state.py index 18c513bcd..2bb3e7a42 100644 --- a/src/arch/x86/isa/insts/simd128/integer/save_and_restore_state/save_and_restore_state.py +++ b/src/arch/x86/isa/insts/simd128/integer/save_and_restore_state/save_and_restore_state.py @@ -1,15 +1,6 @@ -# Copyright (c) 2007 The Hewlett-Packard Development Company +# Copyright (c) 2013 Andreas Sandberg # All rights reserved. # -# The license below extends only to copyright in the software and shall -# not be construed as granting a license to any other intellectual -# property including but not limited to intellectual property relating -# to a hardware implementation of the functionality of the software -# licensed hereunder. You may use the software subject to the license -# terms below provided that you ensure that this notice is replicated -# unmodified and in its entirety in all distributions of the software, -# modified or unmodified, in source code or in binary form. -# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: redistributions of source code must retain the above copyright @@ -33,9 +24,179 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Authors: Gabe Black +# Authors: Andreas Sandberg + +# Register usage: +# t1, t2 == temporaries +# t7 == base address (RIP or SIB) + + +loadX87RegTemplate = ''' + ld t1, seg, %(mode)s, "DISPLACEMENT + 32 + 16 * %(idx)i", dataSize=8 + ld t2, seg, %(mode)s, "DISPLACEMENT + 32 + 16 * %(idx)i + 8", dataSize=2 + cvtint_fp80 st(%(idx)i), t1, t2 +''' + +storeX87RegTemplate = ''' + cvtfp80h_int t1, st(%(idx)i) + cvtfp80l_int t2, st(%(idx)i) + st t1, seg, %(mode)s, "DISPLACEMENT + 32 + 16 * %(idx)i", dataSize=8 + st t2, seg, %(mode)s, "DISPLACEMENT + 32 + 16 * %(idx)i + 8", dataSize=2 +''' + +loadXMMRegTemplate = ''' + ldfp "InstRegIndex(FLOATREG_XMM_LOW(%(idx)i))", seg, %(mode)s, \ + "DISPLACEMENT + 160 + 16 * %(idx)i", dataSize=8 + ldfp "InstRegIndex(FLOATREG_XMM_HIGH(%(idx)i))", seg, %(mode)s, \ + "DISPLACEMENT + 160 + 16 * %(idx)i + 8", dataSize=8 +''' + +storeXMMRegTemplate = ''' + stfp "InstRegIndex(FLOATREG_XMM_LOW(%(idx)i))", seg, %(mode)s, \ + "DISPLACEMENT + 160 + 16 * %(idx)i", dataSize=8 + stfp "InstRegIndex(FLOATREG_XMM_HIGH(%(idx)i))", seg, %(mode)s, \ + "DISPLACEMENT + 160 + 16 * %(idx)i + 8", dataSize=8 +''' + +loadAllDataRegs = \ + "".join([loadX87RegTemplate % { "idx" : i, "mode" : "%(mode)s" } + for i in range(8)]) + \ + "".join([loadXMMRegTemplate % { "idx" : i, "mode" : "%(mode)s" } + for i in range(16)]) + +storeAllDataRegs = \ + "".join([storeX87RegTemplate % { "idx" : i, "mode" : "%(mode)s" } + for i in range(8)]) + \ + "".join([storeXMMRegTemplate % { "idx" : i, "mode" : "%(mode)s" } + for i in range(16)]) + +fxsaveCommonTemplate = """ + rdval t1, fcw + st t1, seg, %(mode)s, "DISPLACEMENT + 0", dataSize=2 + + # FSW includes TOP when read + rdval t1, fsw + st t1, seg, %(mode)s, "DISPLACEMENT + 2", dataSize=2 + + # FTW + rdxftw t1 + st t1, seg, %(mode)s, "DISPLACEMENT + 4", dataSize=1 + + rdval t1, "InstRegIndex(MISCREG_FOP)" + st t1, seg, %(mode)s, "DISPLACEMENT + 6", dataSize=2 + + rdval t1, "InstRegIndex(MISCREG_MXCSR)" + st t1, seg, %(mode)s, "DISPLACEMENT + 16 + 8", dataSize=4 + + # MXCSR_MASK, software assumes the default (0xFFBF) if 0. + limm t1, 0xFFFF + st t1, seg, %(mode)s, "DISPLACEMENT + 16 + 12", dataSize=4 +""" + storeAllDataRegs + +fxsave32Template = """ + rdval t1, "InstRegIndex(MISCREG_FIOFF)" + st t1, seg, %(mode)s, "DISPLACEMENT + 8", dataSize=4 + + rdval t1, "InstRegIndex(MISCREG_FISEG)" + st t1, seg, %(mode)s, "DISPLACEMENT + 12", dataSize=2 + + rdval t1, "InstRegIndex(MISCREG_FOOFF)" + st t1, seg, %(mode)s, "DISPLACEMENT + 16 + 0", dataSize=4 + + rdval t1, "InstRegIndex(MISCREG_FOSEG)" + st t1, seg, %(mode)s, "DISPLACEMENT + 16 + 4", dataSize=2 +""" + +fxsave64Template = """ + rdval t1, "InstRegIndex(MISCREG_FIOFF)" + st t1, seg, %(mode)s, "DISPLACEMENT + 8", dataSize=8 + + rdval t1, "InstRegIndex(MISCREG_FOOFF)" + st t1, seg, %(mode)s, "DISPLACEMENT + 16 + 0", dataSize=8 +""" + +fxrstorCommonTemplate = """ + ld t1, seg, %(mode)s, "DISPLACEMENT + 0", dataSize=2 + wrval fcw, t1 + + # FSW includes TOP when read + ld t1, seg, %(mode)s, "DISPLACEMENT + 2", dataSize=2 + wrval fsw, t1 + srli t1, t1, 11, dataSize=2 + andi t1, t1, 0x7, dataSize=2 + wrval "InstRegIndex(MISCREG_X87_TOP)", t1 + + # FTW + ld t1, seg, %(mode)s, "DISPLACEMENT + 4", dataSize=1 + wrxftw t1 + + ld t1, seg, %(mode)s, "DISPLACEMENT + 6", dataSize=2 + wrval "InstRegIndex(MISCREG_FOP)", t1 + + ld t1, seg, %(mode)s, "DISPLACEMENT + 16 + 8", dataSize=4 + wrval "InstRegIndex(MISCREG_MXCSR)", t1 +""" + loadAllDataRegs + +fxrstor32Template = """ + ld t1, seg, %(mode)s, "DISPLACEMENT + 8", dataSize=4 + wrval "InstRegIndex(MISCREG_FIOFF)", t1 + + ld t1, seg, %(mode)s, "DISPLACEMENT + 12", dataSize=2 + wrval "InstRegIndex(MISCREG_FISEG)", t1 + + ld t1, seg, %(mode)s, "DISPLACEMENT + 16 + 0", dataSize=4 + wrval "InstRegIndex(MISCREG_FOOFF)", t1 + + ld t1, seg, %(mode)s, "DISPLACEMENT + 16 + 4", dataSize=2 + wrval "InstRegIndex(MISCREG_FOSEG)", t1 +""" + +fxrstor64Template = """ + limm t2, 0, dataSize=8 + + ld t1, seg, %(mode)s, "DISPLACEMENT + 8", dataSize=8 + wrval "InstRegIndex(MISCREG_FIOFF)", t1 + wrval "InstRegIndex(MISCREG_FISEG)", t2 + + ld t1, seg, %(mode)s, "DISPLACEMENT + 16 + 0", dataSize=8 + wrval "InstRegIndex(MISCREG_FOOFF)", t1 + wrval "InstRegIndex(MISCREG_FOSEG)", t2 +""" microcode = ''' -# FXSAVE -# FXRESTORE +def macroop FXSAVE_M { +''' + fxsave32Template % { "mode" : "sib" } + ''' +}; + +def macroop FXSAVE_P { + rdip t7 +''' + fxsave32Template % { "mode" : "riprel" } + ''' +}; + +def macroop FXSAVE64_M { +''' + fxsave64Template % { "mode" : "sib" } + ''' +}; + +def macroop FXSAVE64_P { + rdip t7 +''' + fxsave64Template % { "mode" : "riprel" } + ''' +}; + +def macroop FXRSTOR_M { +''' + fxrstor32Template % { "mode" : "sib" } + ''' +}; + +def macroop FXRSTOR_P { + rdip t7 +''' + fxrstor32Template % { "mode" : "riprel" } + ''' +}; + +def macroop FXRSTOR64_M { +''' + fxrstor64Template % { "mode" : "sib" } + ''' +}; + +def macroop FXRSTOR64_P { + rdip t7 +''' + fxrstor64Template % { "mode" : "riprel" } + ''' +}; ''' diff --git a/src/arch/x86/isa/microops/regop.isa b/src/arch/x86/isa/microops/regop.isa index 6d4687830..d77e5f559 100644 --- a/src/arch/x86/isa/microops/regop.isa +++ b/src/arch/x86/isa/microops/regop.isa @@ -1679,4 +1679,18 @@ let {{ break; } ''' + + class Wrxftw(WrRegOp): + def __init__(self, src1, **kwargs): + super(Wrxftw, self).__init__(src1, "InstRegIndex(NUM_INTREGS)", \ + **kwargs) + + code = ''' + FTW = X86ISA::convX87XTagsToTags(SrcReg1); + ''' + + class Rdxftw(RdRegOp): + code = ''' + DestReg = X86ISA::convX87TagsToXTags(FTW); + ''' }};