Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/49732 )
(
60 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: arch-sparc: Use the OperandDesc classes in the ISA
description.
......................................................................
arch-sparc: Use the OperandDesc classes in the ISA description.
Change-Id: I784ece5697c3b161a94f3eacbc3d175a1434ae2e
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/49732
Maintainer: Gabe Black <gabe.bl...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Boris Shingarov <shinga...@labware.com>
---
M src/arch/sparc/isa/operands.isa
1 file changed, 115 insertions(+), 95 deletions(-)
Approvals:
Boris Shingarov: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/sparc/isa/operands.isa
b/src/arch/sparc/isa/operands.isa
index 7a2da13..24ac5cf 100644
--- a/src/arch/sparc/isa/operands.isa
+++ b/src/arch/sparc/isa/operands.isa
@@ -70,123 +70,130 @@
# For clarity, descriptions that depend on unsigned behavior should
# explicitly specify '.uq'.
- 'Rd': ('IntReg', 'udw', 'RD', 'IsInteger', 1),
+ 'Rd': IntRegOp('udw', 'RD', 'IsInteger', 1),
# The Rd from the previous window
- 'Rd_prev': ('IntReg', 'udw', 'RD + NumIntArchRegs +
NumMicroIntRegs', 'IsInteger', 2),
+ 'Rd_prev': IntRegOp('udw',
+ 'RD + NumIntArchRegs + NumMicroIntRegs', 'IsInteger', 2),
# The Rd from the next window
- 'Rd_next': ('IntReg', 'udw', 'RD + 2 * NumIntArchRegs +
NumMicroIntRegs', 'IsInteger', 3),
+ 'Rd_next': IntRegOp('udw',
+ 'RD + 2 * NumIntArchRegs + NumMicroIntRegs', 'IsInteger', 3),
# For microcoded twin load instructions, RdTwin appears in the "code"
# for the instruction is replaced by RdLow or RdHigh by the format
# before it's processed by the iop.
# The low (even) register of a two register pair
- 'RdLow': ('IntReg', 'udw', 'RD & (~1)', 'IsInteger', 4),
+ 'RdLow': IntRegOp('udw', 'RD & (~1)', 'IsInteger', 4),
# The high (odd) register of a two register pair
- 'RdHigh': ('IntReg', 'udw', 'RD | 1', 'IsInteger', 5),
- 'Rs1': ('IntReg', 'udw', 'RS1', 'IsInteger', 6),
- 'Rs2': ('IntReg', 'udw', 'RS2', 'IsInteger', 7),
+ 'RdHigh': IntRegOp('udw', 'RD | 1', 'IsInteger', 5),
+ 'Rs1': IntRegOp('udw', 'RS1', 'IsInteger', 6),
+ 'Rs2': IntRegOp('udw', 'RS2', 'IsInteger', 7),
# A microcode register. Right now, this is the only one.
- 'uReg0': ('IntReg', 'udw', 'INTREG_UREG0', 'IsInteger', 8),
+ 'uReg0': IntRegOp('udw', 'INTREG_UREG0', 'IsInteger', 8),
# Because double and quad precision register numbers are decoded
# differently, they get different operands. The single precision
versions
# have an s post pended to their name.
- 'Frds': ('FloatReg', 'sf', 'RD', 'IsFloating', 10),
- #'Frd': ('FloatReg', 'df', 'dfpr(RD)', 'IsFloating', 10),
- 'Frd_low': ('FloatReg', 'uw', 'dfprl(RD)', 'IsFloating', 10),
- 'Frd_high': ('FloatReg', 'uw', 'dfprh(RD)', 'IsFloating', 10),
+ 'Frds': FloatRegOp('sf', 'RD', 'IsFloating', 10),
+ #'Frd': FloatRegOp('df', 'dfpr(RD)', 'IsFloating', 10),
+ 'Frd_low': FloatRegOp('uw', 'dfprl(RD)', 'IsFloating', 10),
+ 'Frd_high': FloatRegOp('uw', 'dfprh(RD)', 'IsFloating', 10),
# Each Frd_N refers to the Nth double precision register from Frd.
# Note that this adds twice N to the register number.
- #'Frd_0': ('FloatReg', 'df', 'dfpr(RD)', 'IsFloating', 10),
- 'Frd_0_low': ('FloatReg', 'uw', 'dfprl(RD)', 'IsFloating', 10),
- 'Frd_0_high': ('FloatReg', 'uw', 'dfprh(RD)', 'IsFloating', 10),
- #'Frd_1': ('FloatReg', 'df', 'dfpr(RD) + 2', 'IsFloating',
10),
- 'Frd_1_low': ('FloatReg', 'uw', 'dfprl(RD) + 2', 'IsFloating',
10),
- 'Frd_1_high': ('FloatReg', 'uw', 'dfprh(RD) + 2', 'IsFloating',
10),
- #'Frd_2': ('FloatReg', 'df', 'dfpr(RD) + 4', 'IsFloating',
10),
- 'Frd_2_low': ('FloatReg', 'uw', 'dfprl(RD) + 4', 'IsFloating',
10),
- 'Frd_2_high': ('FloatReg', 'uw', 'dfprh(RD) + 4', 'IsFloating',
10),
- #'Frd_3': ('FloatReg', 'df', 'dfpr(RD) + 6', 'IsFloating',
10),
- 'Frd_3_low': ('FloatReg', 'uw', 'dfprl(RD) + 6', 'IsFloating',
10),
- 'Frd_3_high': ('FloatReg', 'uw', 'dfprh(RD) + 6', 'IsFloating',
10),
- #'Frd_4': ('FloatReg', 'df', 'dfpr(RD) + 8', 'IsFloating',
10),
- 'Frd_4_low': ('FloatReg', 'uw', 'dfprl(RD) + 8', 'IsFloating',
10),
- 'Frd_4_high': ('FloatReg', 'uw', 'dfprh(RD) + 8', 'IsFloating',
10),
- #'Frd_5': ('FloatReg', 'df', 'dfpr(RD) + 10', 'IsFloating',
10),
- 'Frd_5_low': ('FloatReg', 'uw', 'dfprl(RD) + 10', 'IsFloating',
10),
- 'Frd_5_high': ('FloatReg', 'uw', 'dfprh(RD) + 10', 'IsFloating',
10),
- #'Frd_6': ('FloatReg', 'df', 'dfpr(RD) + 12', 'IsFloating',
10),
- 'Frd_6_low': ('FloatReg', 'uw', 'dfprl(RD) + 12', 'IsFloating',
10),
- 'Frd_6_high': ('FloatReg', 'uw', 'dfprh(RD) + 12', 'IsFloating',
10),
- #'Frd_7': ('FloatReg', 'df', 'dfpr(RD) + 14', 'IsFloating',
10),
- 'Frd_7_low': ('FloatReg', 'uw', 'dfprl(RD) + 14', 'IsFloating',
10),
- 'Frd_7_high': ('FloatReg', 'uw', 'dfprh(RD) + 14', 'IsFloating',
10),
- 'Frs1s': ('FloatReg', 'sf', 'RS1', 'IsFloating', 11),
- #'Frs1': ('FloatReg', 'df', 'dfpr(RS1)', 'IsFloating', 11),
- 'Frs1_low': ('FloatReg', 'uw', 'dfprl(RS1)', 'IsFloating', 11),
- 'Frs1_high': ('FloatReg', 'uw', 'dfprh(RS1)', 'IsFloating', 11),
- 'Frs2s': ('FloatReg', 'sf', 'RS2', 'IsFloating', 12),
- #'Frs2': ('FloatReg', 'df', 'dfpr(RS2)', 'IsFloating', 12),
- 'Frs2_low': ('FloatReg', 'uw', 'dfprl(RS2)', 'IsFloating', 12),
- 'Frs2_high': ('FloatReg', 'uw', 'dfprh(RS2)', 'IsFloating', 12),
- 'PC': ('PCState', 'udw', 'pc', (None,
None, 'IsControl'), 30),
- 'NPC': ('PCState', 'udw', 'npc', (None,
None, 'IsControl'), 30),
- 'NNPC': ('PCState', 'udw', 'nnpc', (None,
None, 'IsControl'), 30),
+ #'Frd_0': FloatRegOp('df', 'dfpr(RD)', 'IsFloating', 10),
+ 'Frd_0_low': FloatRegOp('uw', 'dfprl(RD)', 'IsFloating', 10),
+ 'Frd_0_high': FloatRegOp('uw', 'dfprh(RD)', 'IsFloating', 10),
+ #'Frd_1': FloatRegOp('df', 'dfpr(RD) + 2', 'IsFloating', 10),
+ 'Frd_1_low': FloatRegOp('uw', 'dfprl(RD) + 2', 'IsFloating',
10),
+ 'Frd_1_high': FloatRegOp('uw', 'dfprh(RD) + 2', 'IsFloating',
10),
+ #'Frd_2': FloatRegOp('df', 'dfpr(RD) + 4', 'IsFloating', 10),
+ 'Frd_2_low': FloatRegOp('uw', 'dfprl(RD) + 4', 'IsFloating',
10),
+ 'Frd_2_high': FloatRegOp('uw', 'dfprh(RD) + 4', 'IsFloating',
10),
+ #'Frd_3': FloatRegOp('df', 'dfpr(RD) + 6', 'IsFloating', 10),
+ 'Frd_3_low': FloatRegOp('uw', 'dfprl(RD) + 6', 'IsFloating',
10),
+ 'Frd_3_high': FloatRegOp('uw', 'dfprh(RD) + 6', 'IsFloating',
10),
+ #'Frd_4': FloatRegOp('df', 'dfpr(RD) + 8', 'IsFloating', 10),
+ 'Frd_4_low': FloatRegOp('uw', 'dfprl(RD) + 8', 'IsFloating',
10),
+ 'Frd_4_high': FloatRegOp('uw', 'dfprh(RD) + 8', 'IsFloating',
10),
+ #'Frd_5': FloatRegOp('df', 'dfpr(RD) + 10', 'IsFloating',
10),
+ 'Frd_5_low': FloatRegOp('uw', 'dfprl(RD) + 10', 'IsFloating',
10),
+ 'Frd_5_high': FloatRegOp('uw', 'dfprh(RD) + 10', 'IsFloating',
10),
+ #'Frd_6': FloatRegOp('df', 'dfpr(RD) + 12', 'IsFloating',
10),
+ 'Frd_6_low': FloatRegOp('uw', 'dfprl(RD) + 12', 'IsFloating',
10),
+ 'Frd_6_high': FloatRegOp('uw', 'dfprh(RD) + 12', 'IsFloating',
10),
+ #'Frd_7': FloatRegOp('df', 'dfpr(RD) + 14', 'IsFloating',
10),
+ 'Frd_7_low': FloatRegOp('uw', 'dfprl(RD) + 14', 'IsFloating',
10),
+ 'Frd_7_high': FloatRegOp('uw', 'dfprh(RD) + 14', 'IsFloating',
10),
+ 'Frs1s': FloatRegOp('sf', 'RS1', 'IsFloating', 11),
+ #'Frs1': FloatRegOp('df', 'dfpr(RS1)', 'IsFloating', 11),
+ 'Frs1_low': FloatRegOp('uw', 'dfprl(RS1)', 'IsFloating', 11),
+ 'Frs1_high': FloatRegOp('uw', 'dfprh(RS1)', 'IsFloating', 11),
+ 'Frs2s': FloatRegOp('sf', 'RS2', 'IsFloating', 12),
+ #'Frs2': FloatRegOp('df', 'dfpr(RS2)', 'IsFloating', 12),
+ 'Frs2_low': FloatRegOp('uw', 'dfprl(RS2)', 'IsFloating', 12),
+ 'Frs2_high': FloatRegOp('uw', 'dfprh(RS2)', 'IsFloating', 12),
+ 'PC': PCStateOp('udw', 'pc', (None, None, 'IsControl'),
30),
+ 'NPC': PCStateOp('udw', 'npc', (None, None, 'IsControl'),
30),
+ 'NNPC': PCStateOp('udw', 'nnpc',
+ (None, None, 'IsControl'), 30),
# Registers which are used explicitly in instructions
- 'R0': ('IntReg', 'udw', '0', None, 6),
- 'R1': ('IntReg', 'udw', '1', None, 7),
- 'R15': ('IntReg', 'udw', '15', 'IsInteger', 8),
- 'R16': ('IntReg', 'udw', '16', None, 9),
- 'O0': ('IntReg', 'udw', 'INTREG_O0', 'IsInteger', 10),
- 'O1': ('IntReg', 'udw', 'INTREG_O1', 'IsInteger', 11),
- 'O2': ('IntReg', 'udw', 'INTREG_O2', 'IsInteger', 12),
- 'O3': ('IntReg', 'udw', 'INTREG_O3', 'IsInteger', 13),
- 'O4': ('IntReg', 'udw', 'INTREG_O4', 'IsInteger', 14),
- 'O5': ('IntReg', 'udw', 'INTREG_O5', 'IsInteger', 15),
+ 'R0': IntRegOp('udw', '0', None, 6),
+ 'R1': IntRegOp('udw', '1', None, 7),
+ 'R15': IntRegOp('udw', '15', 'IsInteger', 8),
+ 'R16': IntRegOp('udw', '16', None, 9),
+ 'O0': IntRegOp('udw', 'INTREG_O0', 'IsInteger', 10),
+ 'O1': IntRegOp('udw', 'INTREG_O1', 'IsInteger', 11),
+ 'O2': IntRegOp('udw', 'INTREG_O2', 'IsInteger', 12),
+ 'O3': IntRegOp('udw', 'INTREG_O3', 'IsInteger', 13),
+ 'O4': IntRegOp('udw', 'INTREG_O4', 'IsInteger', 14),
+ 'O5': IntRegOp('udw', 'INTREG_O5', 'IsInteger', 15),
# Control registers
- 'Y': ('IntReg', 'udw', 'INTREG_Y', None, 40),
- 'Ccr': ('IntReg', 'udw', 'INTREG_CCR', None, 41),
- 'Asi': ('ControlReg', 'udw', 'MISCREG_ASI', None, 42),
- 'Fprs': ('ControlReg', 'udw', 'MISCREG_FPRS', None, 43),
- 'Pcr': ('ControlReg', 'udw', 'MISCREG_PCR', None, 44),
- 'Pic': ('ControlReg', 'udw', 'MISCREG_PIC', None, 45),
- 'Gsr': ('IntReg', 'udw', 'INTREG_GSR', None, 46),
- 'Softint': ('ControlReg', 'udw', 'MISCREG_SOFTINT', None, 47),
- 'SoftintSet': ('ControlReg', 'udw', 'MISCREG_SOFTINT_SET', None,
48),
- 'SoftintClr': ('ControlReg', 'udw', 'MISCREG_SOFTINT_CLR', None,
49),
- 'TickCmpr': ('ControlReg', 'udw', 'MISCREG_TICK_CMPR', None,
50),
- 'Stick': ('ControlReg', 'udw', 'MISCREG_STICK', None, 51),
- 'StickCmpr': ('ControlReg', 'udw', 'MISCREG_STICK_CMPR', None,
52),
+ 'Y': IntRegOp('udw', 'INTREG_Y', None, 40),
+ 'Ccr': IntRegOp('udw', 'INTREG_CCR', None, 41),
+ 'Asi': ControlRegOp('udw', 'MISCREG_ASI', None, 42),
+ 'Fprs': ControlRegOp('udw', 'MISCREG_FPRS', None, 43),
+ 'Pcr': ControlRegOp('udw', 'MISCREG_PCR', None, 44),
+ 'Pic': ControlRegOp('udw', 'MISCREG_PIC', None, 45),
+ 'Gsr': IntRegOp('udw', 'INTREG_GSR', None, 46),
+ 'Softint': ControlRegOp('udw', 'MISCREG_SOFTINT', None, 47),
+ 'SoftintSet': ControlRegOp('udw', 'MISCREG_SOFTINT_SET', None,
48),
+ 'SoftintClr': ControlRegOp('udw', 'MISCREG_SOFTINT_CLR', None,
49),
+ 'TickCmpr': ControlRegOp('udw', 'MISCREG_TICK_CMPR', None, 50),
+ 'Stick': ControlRegOp('udw', 'MISCREG_STICK', None, 51),
+ 'StickCmpr': ControlRegOp('udw', 'MISCREG_STICK_CMPR', None,
52),
- 'Tpc': ('ControlReg', 'udw', 'MISCREG_TPC', None, 53),
- 'Tnpc': ('ControlReg', 'udw', 'MISCREG_TNPC', None, 54),
- 'Tstate': ('ControlReg', 'udw', 'MISCREG_TSTATE', None, 55),
- 'Tt': ('ControlReg', 'udw', 'MISCREG_TT', None, 56),
- 'Tick': ('ControlReg', 'udw', 'MISCREG_TICK', None, 57),
- 'Tba': ('ControlReg', 'udw', 'MISCREG_TBA', None, 58),
- 'Pstate': ('ControlReg', 'pstate', 'MISCREG_PSTATE', None,
59),
- 'Tl': ('ControlReg', 'udw', 'MISCREG_TL', None, 60),
- 'Pil': ('ControlReg', 'udw', 'MISCREG_PIL', None, 61),
- 'Cwp': ('ControlReg', 'udw', 'MISCREG_CWP',
+ 'Tpc': ControlRegOp('udw', 'MISCREG_TPC', None, 53),
+ 'Tnpc': ControlRegOp('udw', 'MISCREG_TNPC', None, 54),
+ 'Tstate': ControlRegOp('udw', 'MISCREG_TSTATE', None, 55),
+ 'Tt': ControlRegOp('udw', 'MISCREG_TT', None, 56),
+ 'Tick': ControlRegOp('udw', 'MISCREG_TICK', None, 57),
+ 'Tba': ControlRegOp('udw', 'MISCREG_TBA', None, 58),
+ 'Pstate': ControlRegOp('pstate', 'MISCREG_PSTATE', None, 59),
+ 'Tl': ControlRegOp('udw', 'MISCREG_TL', None, 60),
+ 'Pil': ControlRegOp('udw', 'MISCREG_PIL', None, 61),
+ 'Cwp': ControlRegOp('udw', 'MISCREG_CWP',
(None, None, ['IsSerializeAfter',
'IsSerializing',
'IsNonSpeculative']), 62),
- 'Cansave': ('IntReg', 'udw', 'INTREG_CANSAVE', None, 63),
- 'Canrestore': ('IntReg', 'udw', 'INTREG_CANRESTORE', None, 64),
- 'Cleanwin': ('IntReg', 'udw', 'INTREG_CLEANWIN', None, 65),
- 'Otherwin': ('IntReg', 'udw', 'INTREG_OTHERWIN', None, 66),
- 'Wstate': ('IntReg', 'udw', 'INTREG_WSTATE', None, 67),
- 'Gl': ('ControlReg', 'udw', 'MISCREG_GL', None, 68),
+ 'Cansave': IntRegOp('udw', 'INTREG_CANSAVE', None, 63),
+ 'Canrestore': IntRegOp('udw', 'INTREG_CANRESTORE', None, 64),
+ 'Cleanwin': IntRegOp('udw', 'INTREG_CLEANWIN', None, 65),
+ 'Otherwin': IntRegOp('udw', 'INTREG_OTHERWIN', None, 66),
+ 'Wstate': IntRegOp('udw', 'INTREG_WSTATE', None, 67),
+ 'Gl': ControlRegOp('udw', 'MISCREG_GL', None, 68),
- 'Hpstate': ('ControlReg', 'hpstate', 'MISCREG_HPSTATE', None,
69),
- 'Htstate': ('ControlReg', 'udw', 'MISCREG_HTSTATE', None, 70),
- 'Hintp': ('ControlReg', 'udw', 'MISCREG_HINTP', None, 71),
- 'Htba': ('ControlReg', 'udw', 'MISCREG_HTBA', None, 72),
- 'HstickCmpr': ('ControlReg', 'udw', 'MISCREG_HSTICK_CMPR', None,
73),
- 'Hver': ('ControlReg', 'udw', 'MISCREG_HVER', None, 74),
- 'StrandStsReg': ('ControlReg', 'udw', 'MISCREG_STRAND_STS_REG',
None, 75),
+ 'Hpstate': ControlRegOp('hpstate', 'MISCREG_HPSTATE', None,
69),
+ 'Htstate': ControlRegOp('udw', 'MISCREG_HTSTATE', None, 70),
+ 'Hintp': ControlRegOp('udw', 'MISCREG_HINTP', None, 71),
+ 'Htba': ControlRegOp('udw', 'MISCREG_HTBA', None, 72),
+ 'HstickCmpr': ControlRegOp('udw', 'MISCREG_HSTICK_CMPR', None,
73),
+ 'Hver': ControlRegOp('udw', 'MISCREG_HVER', None, 74),
+ 'StrandStsReg': ControlRegOp('udw', 'MISCREG_STRAND_STS_REG',
+ None, 75),
- 'Fsr': ('ControlReg', 'udw', 'MISCREG_FSR', (None, None,
['IsSerializeAfter','IsSerializing','IsNonSpeculative']), 80),
+ 'Fsr': ControlRegOp('udw', 'MISCREG_FSR',
+ (None, None, ['IsSerializeAfter',
+ 'IsSerializing',
+ 'IsNonSpeculative']),
80),
# Mem gets a large number so it's always last
- 'Mem': ('Mem', 'udw', None, (None, 'IsLoad', 'IsStore'),
100)
+ 'Mem': MemOp('udw', None, (None, 'IsLoad', 'IsStore'),
100)
}};
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/49732
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I784ece5697c3b161a94f3eacbc3d175a1434ae2e
Gerrit-Change-Number: 49732
Gerrit-PatchSet: 62
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Boris Shingarov <shinga...@labware.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
