tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-23 13:59:02 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

tools: correct error generating board files that calculated the address incorrectly after a cluster type

Browse Source 
Signed-off-by: Ron Evans <ron@hybridgroup.com>
This commit is contained in:
Ron Evans
2018-11-28 10:27:09 +01:00
committed by Ayke van Laethem
parent e54a1c4dc0
commit 70830cd9da
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/gen-device-svd.py
+7 -1
View File
@@ -293,6 +293,7 @@ const (
padNumber += 1 padNumber += 1
regType = 'RegValue' regType = 'RegValue'
lastCluster = False
if 'registers' in register: if 'registers' in register:
# This is a cluster, not a register. Create the cluster type. # This is a cluster, not a register. Create the cluster type.
regType = 'struct {\n' regType = 'struct {\n'
@@ -320,13 +321,18 @@ const (
regType += '\t\t_padding{padNumber} RegValue\n'.format(padNumber=padNumber) regType += '\t\t_padding{padNumber} RegValue\n'.format(padNumber=padNumber)
else: else:
regType += '\t\t_padding{padNumber} [{num}]RegValue\n'.format(padNumber=padNumber, num=numSkip) regType += '\t\t_padding{padNumber} [{num}]RegValue\n'.format(padNumber=padNumber, num=numSkip)
else:
lastCluster = True
regType += '\t}' regType += '\t}'
address = subaddress
if register['array'] is not None: if register['array'] is not None:
regType = '[{}]{}'.format(register['array'], regType) regType = '[{}]{}'.format(register['array'], regType)
out.write('\t{name} {regType}\n'.format(name=register['name'], regType=regType)) out.write('\t{name} {regType}\n'.format(name=register['name'], regType=regType))
# next address # next address
if register['array'] is not None: if lastCluster is True:
lastCluster = False
elif register['array'] is not None:
address = register['address'] + register['elementsize'] * register['array'] address = register['address'] + register['elementsize'] * register['array']
else: else:
address = register['address'] + register['elementsize'] address = register['address'] + register['elementsize']