Skip to content

Commit

Permalink
Fix invalid assembler syntax from gen-device-svd
Browse files Browse the repository at this point in the history
This addresses #4608
  • Loading branch information
cibomahto authored and deadprogram committed Nov 22, 2024
1 parent 19736e5 commit 7847f4e
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions tools/gen-device-svd/gen-device-svd.go
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,13 @@ func readSVD(path, sourceURL string) (*Device, error) {
return interruptList[i].PeripheralIndex < interruptList[j].PeripheralIndex
})

// Properly format the description, with comments.
description := ""
if text := device.Description; text != "" {
description = "// " + strings.ReplaceAll(text, "\n", "\n// ")
description = regexp.MustCompile(`\s+\n`).ReplaceAllString(description, "\n")
}

// Properly format the license block, with comments.
licenseBlock := ""
if text := formatText(device.LicenseText); text != "" {
Expand All @@ -460,7 +467,7 @@ func readSVD(path, sourceURL string) (*Device, error) {
DescriptorSource: sourceURL,
Name: device.Name,
NameLower: nameLower,
Description: strings.TrimSpace(device.Description),
Description: description,
LicenseBlock: licenseBlock,
}
if device.CPU != nil {
Expand Down Expand Up @@ -902,7 +909,7 @@ func writeGo(outdir string, device *Device, interruptSystem string) error {
//go:build {{.pkgName}} && {{.device.Metadata.NameLower}}
// {{.device.Metadata.Description}}
{{.device.Metadata.Description}}
//
{{.device.Metadata.LicenseBlock}}
package {{.pkgName}}
Expand Down Expand Up @@ -1350,7 +1357,7 @@ func writeAsm(outdir string, device *Device) error {
t := template.Must(template.New("go").Parse(`// Automatically generated file. DO NOT EDIT.
// Generated by gen-device-svd.go from {{.File}}, see {{.DescriptorSource}}
// {{.Description}}
{{.Description}}
//
{{.LicenseBlock}}
Expand Down

0 comments on commit 7847f4e

Please sign in to comment.