derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch-x86: Use the new operand desc classes in the ISA description.

Browse Source 
Take advantage of the ability to use keyword arguments to clarify the
complex predicated condition code operands.

Change-Id: I7cbbd547c4eadb0b170e473c034c062125301fad
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/49726
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Gabe Black <gabe.black@gmail.com>
This commit is contained in:
Gabe Black
2021-08-21 04:50:30 -07:00
parent 23e6607507
commit 9993440a8e
1 changed files with 138 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

258
src/arch/x86/isa/operands.isa
View File

@@ -54,89 +54,107 @@ def operand_types {{
}}; }};
let {{ let {{
def intReg(idx, id): class IntReg(IntRegOp):
return ('IntReg', 'uqw', idx, 'IsInteger', id) def __init__(self, idx, id, *args, **kwargs):
def pickedReg(idx, id, size='dataSize'): super().__init__('uqw', idx, 'IsInteger', id, *args, **kwargs)
return ('IntReg', 'uqw', idx, 'IsInteger', id,
'pick(xc->getRegOperand(this, %(op_idx)s), ' class PickedReg(IntReg):
'%(reg_idx)s, ' + size + ')') def __init__(self, idx, id, size='dataSize'):
def signedPickedReg(idx, id, size='dataSize'): super().__init__(idx, id,
return ('IntReg', 'uqw', idx, 'IsInteger', id, read_code='pick(xc->getRegOperand(this, %(op_idx)s), '
'signedPick(xc->getRegOperand(this, %(op_idx)s), ' '%(reg_idx)s, ' + size + ')')
'%(reg_idx)s, ' + size + ')')
def floatReg(idx, id): class SignedPickedReg(IntReg):
return ('FloatReg', 'df', idx, 'IsFloating', id) def __init__(self, idx, id, size='dataSize'):
def ccReg(idx, id): super().__init__(idx, id,
return ('CCReg', 'uqw', idx, None, id) read_code='signedPick(xc->getRegOperand(this, '
def controlReg(idx, id, ctype = 'uqw'): '%(op_idx)s), %(reg_idx)s, ' + size + ')')
return ('ControlReg', ctype, idx,
class FloatReg(FloatRegOp):
def __init__(self, idx, id):
super().__init__('df', idx, 'IsFloating', id)
class CCReg(CCRegOp):
def __init__(self, idx, id):
super().__init__('uqw', idx, None, id)
class ControlReg(ControlRegOp):
def __init__(self, idx, id, ctype='uqw'):
super().__init__(ctype, idx,
(None, None, ['IsSerializeAfter', (None, None, ['IsSerializeAfter',
'IsSerializing', 'IsSerializing',
'IsNonSpeculative']), 'IsNonSpeculative']),
id) id)
def squashCheckReg(idx, id, check, ctype = 'uqw'):
return ('ControlReg', ctype, idx, class SquashCheckReg(ControlRegOp):
(None, None, ['((%s) ? ' % check+ \ def __init__(self, idx, id, check, ctype='uqw'):
'IsSquashAfter : IsSerializeAfter)', super().__init__(ctype, idx,
'IsSerializing', (None, None,
'IsNonSpeculative']), [f'(({check}) ? IsSquashAfter : IsSerializeAfter)',
'IsSerializing', 'IsNonSpeculative']),
id) id)
def squashCReg(idx, id, ctype = 'uqw'):
return squashCheckReg(idx, id, 'true', ctype) class SquashCReg(SquashCheckReg):
def squashCSReg(idx, id, ctype = 'uqw'): def __init__(self, idx, id, ctype='uqw'):
return squashCheckReg(idx, id, 'dest == X86ISA::SEGMENT_REG_CS', ctype) super().__init__(idx, id, 'true', ctype)
def squashCR0Reg(idx, id, ctype = 'uqw'):
return squashCheckReg(idx, id, 'dest == 0', ctype) class SquashCSReg(SquashCheckReg):
def __init__(self, idx, id, ctype='uqw'):
super().__init__(idx, id, 'dest == X86ISA::SEGMENT_REG_CS', ctype)
class SquashCR0Reg(SquashCheckReg):
def __init__(self, idx, id, ctype='uqw'):
super().__init__(idx, id, 'dest == 0', ctype)
}}; }};
def operands {{ def operands {{
'SrcReg1': intReg('src1', 1), 'SrcReg1': IntReg('src1', 1),
'PSrcReg1': pickedReg('src1', 1), 'PSrcReg1': PickedReg('src1', 1),
'PMSrcReg1': pickedReg('src1', 1, 'srcSize'), 'PMSrcReg1': PickedReg('src1', 1, 'srcSize'),
'SPSrcReg1': signedPickedReg('src1', 1), 'SPSrcReg1': SignedPickedReg('src1', 1),
'SrcReg2': intReg('src2', 2), 'SrcReg2': IntReg('src2', 2),
'PSrcReg2': pickedReg('src2', 2), 'PSrcReg2': PickedReg('src2', 2),
'SPSrcReg2': signedPickedReg('src2', 2), 'SPSrcReg2': SignedPickedReg('src2', 2),
'Index': intReg('index', 3), 'Index': IntReg('index', 3),
'Base': intReg('base', 4), 'Base': IntReg('base', 4),
'DestReg': intReg('dest', 5), 'DestReg': IntReg('dest', 5),
'Data': intReg('data', 6), 'Data': IntReg('data', 6),
'PData': pickedReg('data', 6), 'PData': PickedReg('data', 6),
'DataLow': intReg('dataLow', 6), 'DataLow': IntReg('dataLow', 6),
'DataHi': intReg('dataHi', 6), 'DataHi': IntReg('dataHi', 6),
'ProdLow': intReg('X86ISA::INTREG_PRODLOW', 7), 'ProdLow': IntReg('X86ISA::INTREG_PRODLOW', 7),
'ProdHi': intReg('X86ISA::INTREG_PRODHI', 8), 'ProdHi': IntReg('X86ISA::INTREG_PRODHI', 8),
'Quotient': intReg('X86ISA::INTREG_QUOTIENT', 9), 'Quotient': IntReg('X86ISA::INTREG_QUOTIENT', 9),
'Remainder': intReg('X86ISA::INTREG_REMAINDER', 10), 'Remainder': IntReg('X86ISA::INTREG_REMAINDER', 10),
'Divisor': intReg('X86ISA::INTREG_DIVISOR', 11), 'Divisor': IntReg('X86ISA::INTREG_DIVISOR', 11),
'DoubleBits': intReg('X86ISA::INTREG_DOUBLEBITS', 11), 'DoubleBits': IntReg('X86ISA::INTREG_DOUBLEBITS', 11),
'Rax': intReg('X86ISA::INTREG_RAX', 12), 'Rax': IntReg('X86ISA::INTREG_RAX', 12),
'Rbx': intReg('X86ISA::INTREG_RBX', 13), 'Rbx': IntReg('X86ISA::INTREG_RBX', 13),
'Rcx': intReg('X86ISA::INTREG_RCX', 14), 'Rcx': IntReg('X86ISA::INTREG_RCX', 14),
'Rdx': intReg('X86ISA::INTREG_RDX', 15), 'Rdx': IntReg('X86ISA::INTREG_RDX', 15),
'Rsp': intReg('X86ISA::INTREG_RSP', 16), 'Rsp': IntReg('X86ISA::INTREG_RSP', 16),
'Rbp': intReg('X86ISA::INTREG_RBP', 17), 'Rbp': IntReg('X86ISA::INTREG_RBP', 17),
'Rsi': intReg('X86ISA::INTREG_RSI', 18), 'Rsi': IntReg('X86ISA::INTREG_RSI', 18),
'Rdi': intReg('X86ISA::INTREG_RDI', 19), 'Rdi': IntReg('X86ISA::INTREG_RDI', 19),
'R8': intReg('X86ISA::INTREG_R8', 20), 'R8': IntReg('X86ISA::INTREG_R8', 20),
'R9': intReg('X86ISA::INTREG_R9', 21), 'R9': IntReg('X86ISA::INTREG_R9', 21),
'FpSrcReg1': floatReg('src1', 22), 'FpSrcReg1': FloatReg('src1', 22),
'FpSrcReg2': floatReg('src2', 23), 'FpSrcReg2': FloatReg('src2', 23),
'FpDestReg': floatReg('dest', 24), 'FpDestReg': FloatReg('dest', 24),
'FpData': floatReg('data', 25), 'FpData': FloatReg('data', 25),
'RIP': ('PCState', 'uqw', 'pc', 'RIP': PCStateOp('uqw', 'pc',
(None, None, 'IsControl'), 50), (None, None, 'IsControl'), 50),
'NRIP': ('PCState', 'uqw', 'npc', 'NRIP': PCStateOp('uqw', 'npc',
(None, None, 'IsControl'), 50), (None, None, 'IsControl'), 50),
'nuIP': ('PCState', 'uqw', 'nupc', 'nuIP': PCStateOp('uqw', 'nupc',
(None, None, 'IsControl'), 50), (None, None, 'IsControl'), 50),
# These registers hold the condition code portion of the flag # These registers hold the condition code portion of the flag
# register. The nccFlagBits version holds the rest. # register. The nccFlagBits version holds the rest.
'ccFlagBits': ccReg('X86ISA::CCREG_ZAPS', 60), 'ccFlagBits': CCReg('X86ISA::CCREG_ZAPS', 60),
'cfofBits': ccReg('X86ISA::CCREG_CFOF', 61), 'cfofBits': CCReg('X86ISA::CCREG_CFOF', 61),
'dfBit': ccReg('X86ISA::CCREG_DF', 62), 'dfBit': CCReg('X86ISA::CCREG_DF', 62),
'ecfBit': ccReg('X86ISA::CCREG_ECF', 63), 'ecfBit': CCReg('X86ISA::CCREG_ECF', 63),
'ezfBit': ccReg('X86ISA::CCREG_EZF', 64), 'ezfBit': CCReg('X86ISA::CCREG_EZF', 64),
# These Pred registers are to be used where reading the portions of # These Pred registers are to be used where reading the portions of
# condition code registers is possibly optional, depending on how the # condition code registers is possibly optional, depending on how the
@@ -153,67 +171,67 @@ def operands {{
# would be retained, the write predicate checks if any of the bits # would be retained, the write predicate checks if any of the bits
# are being written. # are being written.
'PredccFlagBits': ('CCReg', 'uqw', 'X86ISA::CCREG_ZAPS', None, 'PredccFlagBits': CCRegOp('uqw', 'X86ISA::CCREG_ZAPS', sort_pri=60,
60, None, None, read_predicate='(ext & X86ISA::ccFlagMask) != '
'(ext & X86ISA::ccFlagMask) != X86ISA::ccFlagMask && ' 'X86ISA::ccFlagMask && (ext & X86ISA::ccFlagMask) != 0',
'(ext & X86ISA::ccFlagMask) != 0', write_predicate='(ext & X86ISA::ccFlagMask) != 0'),
'(ext & X86ISA::ccFlagMask) != 0'), 'PredcfofBits': CCRegOp('uqw', 'X86ISA::CCREG_CFOF', sort_pri=61,
'PredcfofBits': ('CCReg', 'uqw', 'X86ISA::CCREG_CFOF', None, read_predicate='(ext & X86ISA::cfofMask) '
61, None, None, '!= X86ISA::cfofMask && (ext & X86ISA::cfofMask) != 0',
'(ext & X86ISA::cfofMask) != X86ISA::cfofMask && ' write_predicate='(ext & X86ISA::cfofMask) != 0'),
'(ext & X86ISA::cfofMask) != 0', 'PreddfBit': CCRegOp('uqw', 'X86ISA::CCREG_DF', sort_pri=62,
'(ext & X86ISA::cfofMask) != 0'), read_predicate='false',
'PreddfBit': ('CCReg', 'uqw', 'X86ISA::CCREG_DF', None, write_predicate='(ext & X86ISA::DFBit) != 0'),
62, None, None, 'false', '(ext & X86ISA::DFBit) != 0'), 'PredecfBit': CCRegOp('uqw', 'X86ISA::CCREG_ECF', sort_pri=63,
'PredecfBit': ('CCReg', 'uqw', 'X86ISA::CCREG_ECF', None, read_predicate='false',
63, None, None, 'false', '(ext & X86ISA::ECFBit) != 0'), write_predicate='(ext & X86ISA::ECFBit) != 0'),
'PredezfBit': ('CCReg', 'uqw', 'X86ISA::CCREG_EZF', None, 'PredezfBit': CCRegOp('uqw', 'X86ISA::CCREG_EZF', sort_pri=64,
64, None, None, 'false', '(ext & X86ISA::EZFBit) != 0'), read_predicate='false',
write_predicate='(ext & X86ISA::EZFBit) != 0'),
# These register should needs to be more protected so that later # These register should needs to be more protected so that later
# instructions don't map their indexes with an old value. # instructions don't map their indexes with an old value.
'nccFlagBits': controlReg('X86ISA::MISCREG_RFLAGS', 65), 'nccFlagBits': ControlReg('X86ISA::MISCREG_RFLAGS', 65),
# Registers related to the state of x87 floating point unit. # Registers related to the state of x87 floating point unit.
'TOP': controlReg('X86ISA::MISCREG_X87_TOP', 66, ctype='ub'), 'TOP': ControlReg('X86ISA::MISCREG_X87_TOP', 66, ctype='ub'),
'FSW': controlReg('X86ISA::MISCREG_FSW', 67, ctype='uw'), 'FSW': ControlReg('X86ISA::MISCREG_FSW', 67, ctype='uw'),
'FTW': controlReg('X86ISA::MISCREG_FTW', 68, ctype='uw'), 'FTW': ControlReg('X86ISA::MISCREG_FTW', 68, ctype='uw'),
'FCW': controlReg('X86ISA::MISCREG_FCW', 69, ctype='uw'), 'FCW': ControlReg('X86ISA::MISCREG_FCW', 69, ctype='uw'),
# The segment base as used by memory instructions. # The segment base as used by memory instructions.
'SegBase': controlReg('X86ISA::MISCREG_SEG_EFF_BASE(segment)', 'SegBase': ControlReg('X86ISA::MISCREG_SEG_EFF_BASE(segment)',
70), 70),
# Operands to get and set registers indexed by the operands of the # Operands to get and set registers indexed by the operands of the
# original instruction. # original instruction.
'ControlDest': squashCR0Reg('X86ISA::MISCREG_CR(dest)', 100), 'ControlDest': SquashCR0Reg('X86ISA::MISCREG_CR(dest)', 100),
'ControlSrc1': controlReg('X86ISA::MISCREG_CR(src1)', 101), 'ControlSrc1': ControlReg('X86ISA::MISCREG_CR(src1)', 101),
'DebugDest': controlReg('X86ISA::MISCREG_DR(dest)', 102), 'DebugDest': ControlReg('X86ISA::MISCREG_DR(dest)', 102),
'DebugSrc1': controlReg('X86ISA::MISCREG_DR(src1)', 103), 'DebugSrc1': ControlReg('X86ISA::MISCREG_DR(src1)', 103),
'SegBaseDest': squashCSReg('X86ISA::MISCREG_SEG_BASE(dest)', 104), 'SegBaseDest': SquashCSReg('X86ISA::MISCREG_SEG_BASE(dest)', 104),
'SegBaseSrc1': controlReg('X86ISA::MISCREG_SEG_BASE(src1)', 105), 'SegBaseSrc1': ControlReg('X86ISA::MISCREG_SEG_BASE(src1)', 105),
'SegLimitDest': squashCSReg('X86ISA::MISCREG_SEG_LIMIT(dest)', 106), 'SegLimitDest': SquashCSReg('X86ISA::MISCREG_SEG_LIMIT(dest)', 106),
'SegLimitSrc1': controlReg('X86ISA::MISCREG_SEG_LIMIT(src1)', 107), 'SegLimitSrc1': ControlReg('X86ISA::MISCREG_SEG_LIMIT(src1)', 107),
'SegSelDest': controlReg('X86ISA::MISCREG_SEG_SEL(dest)', 108), 'SegSelDest': ControlReg('X86ISA::MISCREG_SEG_SEL(dest)', 108),
'SegSelSrc1': controlReg('X86ISA::MISCREG_SEG_SEL(src1)', 109), 'SegSelSrc1': ControlReg('X86ISA::MISCREG_SEG_SEL(src1)', 109),
'SegAttrDest': squashCSReg('X86ISA::MISCREG_SEG_ATTR(dest)', 110), 'SegAttrDest': SquashCSReg('X86ISA::MISCREG_SEG_ATTR(dest)', 110),
'SegAttrSrc1': controlReg('X86ISA::MISCREG_SEG_ATTR(src1)', 111), 'SegAttrSrc1': ControlReg('X86ISA::MISCREG_SEG_ATTR(src1)', 111),
# Operands to access specific control registers directly. # Operands to access specific control registers directly.
'EferOp': squashCReg('X86ISA::MISCREG_EFER', 200), 'EferOp': SquashCReg('X86ISA::MISCREG_EFER', 200),
'CR4Op': controlReg('X86ISA::MISCREG_CR4', 201), 'CR4Op': ControlReg('X86ISA::MISCREG_CR4', 201),
'DR7Op': controlReg('X86ISA::MISCREG_DR7', 202), 'DR7Op': ControlReg('X86ISA::MISCREG_DR7', 202),
'LDTRBase': controlReg('X86ISA::MISCREG_TSL_BASE', 203), 'LDTRBase': ControlReg('X86ISA::MISCREG_TSL_BASE', 203),
'LDTRLimit': controlReg('X86ISA::MISCREG_TSL_LIMIT', 204), 'LDTRLimit': ControlReg('X86ISA::MISCREG_TSL_LIMIT', 204),
'LDTRSel': controlReg('X86ISA::MISCREG_TSL', 205), 'LDTRSel': ControlReg('X86ISA::MISCREG_TSL', 205),
'GDTRBase': controlReg('X86ISA::MISCREG_TSG_BASE', 206), 'GDTRBase': ControlReg('X86ISA::MISCREG_TSG_BASE', 206),
'GDTRLimit': controlReg('X86ISA::MISCREG_TSG_LIMIT', 207), 'GDTRLimit': ControlReg('X86ISA::MISCREG_TSG_LIMIT', 207),
'CSBase': squashCReg('X86ISA::MISCREG_CS_EFF_BASE', 208), 'CSBase': SquashCReg('X86ISA::MISCREG_CS_EFF_BASE', 208),
'CSAttr': squashCReg('X86ISA::MISCREG_CS_ATTR', 209), 'CSAttr': SquashCReg('X86ISA::MISCREG_CS_ATTR', 209),
'MiscRegDest': controlReg('dest', 210), 'MiscRegDest': ControlReg('dest', 210),
'MiscRegSrc1': controlReg('src1', 211), 'MiscRegSrc1': ControlReg('src1', 211),
'TscOp': controlReg('X86ISA::MISCREG_TSC', 212), 'TscOp': ControlReg('X86ISA::MISCREG_TSC', 212),
'M5Reg': squashCReg('X86ISA::MISCREG_M5_REG', 213), 'M5Reg': SquashCReg('X86ISA::MISCREG_M5_REG', 213),
'Mem': ('Mem', 'uqw', None, \ 'Mem': MemOp('uqw', None, (None, 'IsLoad', 'IsStore'), 300)
(None, 'IsLoad', 'IsStore'), 300)
}}; }};