Update transform*.yaml with new serde-yaml syntax

This commit is contained in:
JackN 2023-10-13 13:04:03 -04:00
parent 65a6b20e60
commit 48199eea42
4 changed files with 149 additions and 151 deletions

View File

@ -1,85 +1,84 @@
transforms: transforms:
- DeleteEnums: - !DeleteEnums
from: (CHP1|CMP1DE|CMP1IE|CPT1DE|CPT1IE|DIDL1|DLYPRTDE|DLYPRTEN|DLYPRTIE|DTEN|EE1LTCH) from: (CHP1|CMP1DE|CMP1IE|CPT1DE|CPT1IE|DIDL1|DLYPRTDE|DLYPRTEN|DLYPRTIE|DTEN|EE1LTCH)
bit_size: 1 bit_size: 1
- DeleteEnums: - !DeleteEnums
from: (MCMP1IE|REPIE|RSTIE|RSTx1DE|RSTx1IE|SETx1DE|SETx1IE|SYNCRSTM|SYNCSTRTM|TACEN|TBU) from: (MCMP1IE|REPIE|RSTIE|RSTx1DE|RSTx1IE|SETx1DE|SETx1IE|SYNCRSTM|SYNCSTRTM|TACEN|TBU)
bit_size: 1 bit_size: 1
- DeleteEnums: - !DeleteEnums
from: (TBU|TxREPU|TxRSTU|UPDDE|UPDIE|EE6LTCH|HALF|MCEN|MCMP1DE|MREPU|MSTU|PREEN|PSHPLL) from: (TBU|TxREPU|TxRSTU|UPDDE|UPDIE|EE6LTCH|HALF|MCEN|MCMP1DE|MREPU|MSTU|PREEN|PSHPLL)
bit_size: 1 bit_size: 1
- DeleteEnums: - !DeleteEnums
from: (REPDE|RETRIG|RSTDE|EE6LTCH) from: (REPDE|RETRIG|RSTDE|EE6LTCH)
bit_size: 1 bit_size: 1
- MergeEnums: - !MergeEnums
from: CPT(\d)[A-Z]CR_(.*) from: CPT(\d)[A-Z]CR_(.*)
to: CAPTUREEFFECT to: CAPTUREEFFECT
- MergeEnums: - !MergeEnums
from: (CPT1|MCMP1|MREP|MUPD|REP|RST|RSTx1|SETx1|SYNC|TIMAISR_CMP1|TIMBISR_CMP1|TIMCISR_CMP1|TIMDISR_CMP1|TIMEISR_CMP1|UPD) from: (CPT1|MCMP1|MREP|MUPD|REP|RST|RSTx1|SETx1|SYNC|TIMAISR_CMP1|TIMBISR_CMP1|TIMCISR_CMP1|TIMDISR_CMP1|TIMEISR_CMP1|UPD)
to: EVENT to: EVENT
- MergeEnums: - !MergeEnums
from: (DTFLKx|DTFSLKx|DTRLKx|DTRSLKx|FLTLCK) from: (DTFLKx|DTFSLKx|DTRLKx|DTRSLKx|FLTLCK)
to: LOCKED to: LOCKED
- MergeEnums: - !MergeEnums
from: (RST[A-E][1-2]R_CMP1|RST[A-E][1-2]R_EXTEVNT1|RST[A-E][1-2]R_MSTCMP1|RST[A-E][1-2]R_MSTPER|RST[A-E][1-2]R_PER|RST[A-E][1-2]R_RESYNC|RST[A-E][1-2]R_SRT|RST[A-E][1-2]R_TIMEVNT1|RST[A-E][1-2]) from: (RST[A-E][1-2]R_CMP1|RST[A-E][1-2]R_EXTEVNT1|RST[A-E][1-2]R_MSTCMP1|RST[A-E][1-2]R_MSTPER|RST[A-E][1-2]R_PER|RST[A-E][1-2]R_RESYNC|RST[A-E][1-2]R_SRT|RST[A-E][1-2]R_TIMEVNT1|RST[A-E][1-2])
to: INACTIVEEFFECT to: INACTIVEEFFECT
- MergeEnums: - !MergeEnums
from: (CMP2|RSTAR_EXTEVNT1|RSTAR_MSTCMP1|RSTAR_MSTPER|RSTBR_EXTEVNT1|RSTBR_MSTCMP1|RSTBR_MSTPER|RSTCR_EXTEVNT1|RSTCR_MSTCMP1|RSTCR_MSTPER|RSTDR_EXTEVNT1|RSTDR_MSTCMP1|RSTDR_MSTPER|RSTER_EXTEVNT1|RSTER_MSTCMP1|RSTER_MSTPER|TIMACMP1|TIMBCMP1|UPDT) from: (CMP2|RSTAR_EXTEVNT1|RSTAR_MSTCMP1|RSTAR_MSTPER|RSTBR_EXTEVNT1|RSTBR_MSTCMP1|RSTBR_MSTPER|RSTCR_EXTEVNT1|RSTCR_MSTCMP1|RSTCR_MSTPER|RSTDR_EXTEVNT1|RSTDR_MSTCMP1|RSTDR_MSTPER|RSTER_EXTEVNT1|RSTER_MSTCMP1|RSTER_MSTPER|TIMACMP1|TIMBCMP1|UPDT)
to: RESETEFFECT to: RESETEFFECT
- MergeEnums: - !MergeEnums
from: OUT[A-C]R_DLYPRT from: OUT[A-C]R_DLYPRT
to: OUTAR_DLYPRT to: OUTAR_DLYPRT
- MergeEnums: - !MergeEnums
from: OUT[D-E]R_DLYPRT from: OUT[D-E]R_DLYPRT
to: OUTDR_DLYPRT to: OUTDR_DLYPRT
- MergeEnums: - !MergeEnums
from: (SET[A-E][1-2]R_CMP1|SET[A-E][1-2]R_EXTEVNT1|SET[A-E][1-2]R_MSTCMP1|SET[A-E][1-2]R_MSTPER|SET[A-E][1-2]R_PER|SET[A-E][1-2]R_RESYNC|SET[A-E][1-2]R_SST|SET[A-E][1-2]R_TIMEVNT1|SET[A-E][1-2]R_UPDATE) from: (SET[A-E][1-2]R_CMP1|SET[A-E][1-2]R_EXTEVNT1|SET[A-E][1-2]R_MSTCMP1|SET[A-E][1-2]R_MSTPER|SET[A-E][1-2]R_PER|SET[A-E][1-2]R_RESYNC|SET[A-E][1-2]R_SST|SET[A-E][1-2]R_TIMEVNT1|SET[A-E][1-2]R_UPDATE)
to: ACTIVEEFFECT to: ACTIVEEFFECT
- MergeEnums: - !MergeEnums
from: (O1CPY|O1STAT) from: (O1CPY|O1STAT)
to: OUTPUTSTATE to: OUTPUTSTATE
- MergeEnums: - !MergeEnums
from: TIM[A-E]ISR_DLYPRT from: TIM[A-E]ISR_DLYPRT
to: TIMAISR_DLYPRT to: TIMAISR_DLYPRT
# - !MergeEnums
# - MergeEnums:
# from: CCMR\d_Input_CC\dS # from: CCMR\d_Input_CC\dS
# to: CCMR_Input_CCS # to: CCMR_Input_CCS
# check: Layout # check: Layout
# Remove digits from enum names # Remove digits from enum names
# - MergeEnums: # - !MergeEnums
# from: ([^\d]*)[\d]*([^\d]*)[\d]*([^\d]*)[\d]* # from: ([^\d]*)[\d]*([^\d]*)[\d]*([^\d]*)[\d]*
# to: $1$2$3 # to: $1$2$3
# skip_unmergeable: true # skip_unmergeable: true
# #
# - MakeFieldArray: # - !MakeFieldArray
# fieldsets: .* # fieldsets: .*
# from: ([A-Z]+)\d+ # from: ([A-Z]+)\d+
# to: $1 # to: $1
# allow_cursed: true # allow_cursed: true
# - MakeFieldArray: # - !MakeFieldArray
# fieldsets: .* # fieldsets: .*
# from: P\d+WP # from: P\d+WP
# to: PWP # to: PWP
# - MakeRegisterArray: # - !MakeRegisterArray
# blocks: .* # blocks: .*
# from: ([A-Z]+)\d+ # from: ([A-Z]+)\d+
# to: $1 # to: $1
# - MakeRegisterArray: # - !MakeRegisterArray
# blocks: .* # blocks: .*
# from: EXTICR\d+ # from: EXTICR\d+
# to: EXTICR # to: EXTICR
# - MergeEnums: # - !MergeEnums
# from: '[HL](IFCR|ISR)_(.*)' # from: '[HL](IFCR|ISR)_(.*)'
# to: $2 # to: $2
# - MergeFieldsets: # - !MergeFieldsets
# from: '[HL](IFCR|ISR)' # from: '[HL](IFCR|ISR)'
# to: $1 # to: $1
# - MergeFieldsets: # - !MergeFieldsets
# from: EXTICR\d # from: EXTICR\d
# to: EXTICR # to: EXTICR
# - MakeRegisterArray: # - !MakeRegisterArray
# blocks: .* # blocks: .*
# from: '[HL](IFCR|ISR)' # from: '[HL](IFCR|ISR)'
# to: $1 # to: $1

View File

@ -1,64 +1,63 @@
transforms: transforms:
- !MergeEnums
- MergeEnums: from: CCMR\d_Input_CC\dS
from: CCMR\d_Input_CC\dS to: CCMR_Input_CCS
to: CCMR_Input_CCS check: Layout
check: Layout
# Remove digits from enum names # Remove digits from enum names
- MergeEnums: - !MergeEnums
from: ([^\d]*)[\d]*([^\d]*)[\d]*([^\d]*)[\d]* from: ([^\d]*)[\d]*([^\d]*)[\d]*([^\d]*)[\d]*
to: $1$2$3 to: $1$2$3
skip_unmergeable: true skip_unmergeable: true
#- MakeFieldArray: #- !MakeFieldArray
# fieldsets: .* # fieldsets: .*
# from: ([A-Z]+)\d([A-Z]*) # from: ([A-Z]+)\d([A-Z]*)
# to: $1$2 # to: $1$2
# allow_cursed: true # allow_cursed: true
- MakeFieldArray: - !MakeFieldArray
fieldsets: .* fieldsets: .*
from: P\d+WP from: P\d+WP
to: PWP to: PWP
# - MakeRegisterArray: # - !MakeRegisterArray
# blocks: .* # blocks: .*
# from: ([A-Z]+)\d+ # from: ([A-Z]+)\d+
# to: $1 # to: $1
- MakeRegisterArray: - !MakeRegisterArray
blocks: .* blocks: .*
from: EXTICR\d+ from: EXTICR\d+
to: EXTICR to: EXTICR
- MergeEnums: - !MergeEnums
from: '[HL](IFCR|ISR)_(.*)' from: "[HL](IFCR|ISR)_(.*)"
to: $2 to: $2
- MergeFieldsets: - !MergeFieldsets
from: '[HL](IFCR|ISR)' from: "[HL](IFCR|ISR)"
to: $1 to: $1
- MergeFieldsets: - !MergeFieldsets
from: EXTICR\d from: EXTICR\d
to: EXTICR to: EXTICR
- MakeRegisterArray: - !MakeRegisterArray
blocks: .* blocks: .*
from: '[HL](IFCR|ISR)' from: "[HL](IFCR|ISR)"
to: $1 to: $1
- DeleteEnums: - !DeleteEnums
from: '.*EN' from: ".*EN"
bit_size: 1 bit_size: 1
- DeleteEnums: - !DeleteEnums
from: '.*RST' from: ".*RST"
bit_size: 1 bit_size: 1
- DeleteEnums: - !DeleteEnums
from: '.*ON' from: ".*ON"
bit_size: 1 bit_size: 1
- MakeRegisterArray: - !MakeRegisterArray
blocks: .* blocks: .*
from: PLL\d+(.*) from: PLL\d+(.*)
to: PLL$1 to: PLL$1
- MakeFieldArray: - !MakeFieldArray
fieldsets: .* fieldsets: .*
from: PLL\d+(.*) from: PLL\d+(.*)
to: PLL$1 to: PLL$1
- MakeFieldArray: - !MakeFieldArray
fieldsets: (PLLCFGR|PLLCKSELR) fieldsets: (PLLCFGR|PLLCKSELR)
from: DIV([A-Z]+)\d+([A-Z]*) from: DIV([A-Z]+)\d+([A-Z]*)
to: DIV$1$2 to: DIV$1$2

View File

@ -1,27 +1,27 @@
transforms: transforms:
# OTG_FS_HOST # OTG_FS_HOST
- ModifyByteOffset: - !ModifyByteOffset
block: OTG_FS_HOST block: OTG_FS_HOST
add_offset: 0x400 add_offset: 0x400
- MergeFieldsets: - !MergeFieldsets
from: (HCINT|HCCHAR|HCINTMSK|HCTSIZ)\d from: (HCINT|HCCHAR|HCINTMSK|HCTSIZ)\d
to: $1 to: $1
- MakeRegisterArray: - !MakeRegisterArray
blocks: .* blocks: .*
from: (HCINT|HCCHAR|HCINTMSK|HCTSIZ)\d from: (HCINT|HCCHAR|HCINTMSK|HCTSIZ)\d
to: $1 to: $1
# OTG_FS_DEVICE # OTG_FS_DEVICE
- ModifyByteOffset: - !ModifyByteOffset
block: OTG_FS_DEVICE block: OTG_FS_DEVICE
add_offset: 0x800 add_offset: 0x800
# Excluding endpoint 0, it has special registers. # Excluding endpoint 0, it has special registers.
- MergeFieldsets: - !MergeFieldsets
from: (DIEPCTL|D[IO]EPINT|D[IO]EPTSIZ|DTXFSTS)[1-9] from: (DIEPCTL|D[IO]EPINT|D[IO]EPTSIZ|DTXFSTS)[1-9]
to: $1 to: $1
- MakeRegisterArray: - !MakeRegisterArray
blocks: .* blocks: .*
from: (DIEPCTL|D[IO]EPINT|D[IO]EPTSIZ|DTXFSTS)[1-9] from: (DIEPCTL|D[IO]EPINT|D[IO]EPTSIZ|DTXFSTS)[1-9]
to: $1 to: $1
- ModifyByteOffset: - !ModifyByteOffset
block: OTG_FS_PWRCLK block: OTG_FS_PWRCLK
add_offset: 0xE00 add_offset: 0xE00

View File

@ -1,42 +1,42 @@
transforms: transforms:
- MergeEnums: - !MergeEnums
from: CCMR\d_Input_CC\dS from: CCMR\d_Input_CC\dS
to: CCMR_Input_CCS to: CCMR_Input_CCS
check: Layout check: Layout
# Remove digits from enum names # Remove digits from enum names
- MergeEnums: - !MergeEnums
from: ([^\d]*)[\d]*([^\d]*)[\d]*([^\d]*)[\d]* from: ([^\d]*)[\d]*([^\d]*)[\d]*([^\d]*)[\d]*
to: $1$2$3 to: $1$2$3
skip_unmergeable: true skip_unmergeable: true
- MakeFieldArray: - !MakeFieldArray
fieldsets: .* fieldsets: .*
from: ([A-Z]+)\d+ from: ([A-Z]+)\d+
to: $1 to: $1
allow_cursed: true allow_cursed: true
- MakeFieldArray: - !MakeFieldArray
fieldsets: .* fieldsets: .*
from: P\d+WP from: P\d+WP
to: PWP to: PWP
# - MakeRegisterArray: # - !MakeRegisterArray
# blocks: .* # blocks: .*
# from: ([A-Z]+)\d+ # from: ([A-Z]+)\d+
# to: $1 # to: $1
- MakeRegisterArray: - !MakeRegisterArray
blocks: .* blocks: .*
from: EXTICR\d+ from: EXTICR\d+
to: EXTICR to: EXTICR
- MergeEnums: - !MergeEnums
from: '[HL](IFCR|ISR)_(.*)' from: "[HL](IFCR|ISR)_(.*)"
to: $2 to: $2
- MergeFieldsets: - !MergeFieldsets
from: '[HL](IFCR|ISR)' from: "[HL](IFCR|ISR)"
to: $1 to: $1
- MergeFieldsets: - !MergeFieldsets
from: EXTICR\d from: EXTICR\d
to: EXTICR to: EXTICR
- MakeRegisterArray: - !MakeRegisterArray
blocks: .* blocks: .*
from: '[HL](IFCR|ISR)' from: "[HL](IFCR|ISR)"
to: $1 to: $1