Moving towards a model where the svd file is processed at startup.

Author: deadsy

Makefile

@@ -1,9 +1,11 @@
 all:
 	make -C darm
-	make -C soc
+
+svdtest:
+	make -C vendor $@
 
 clean:
 	-rm *.pyc
 	-rm target/*.pyc
 	make -C darm $@
-	make -C soc $@
+	make -C vendor $@

mk/svd2py.mk

@@ -1,15 +1,13 @@
 
-SVD2PY = $(TOP)/tools/svd2py
-PATCH = patch
+SVD2PY = $(TOP)/svd2py2
 
 PY_FILES = $(patsubst %, %.py, $(FILES)) 
 
 %.py: ./svd/%.svd.gz
-	@echo "[svd2py]" $*
+	@echo "[svd2py2]" $*
 	@$(SVD2PY) $< $@
-	@if [ -e $*.patch ]; then $(PATCH) -i $*.patch -b --suffix .original; fi;
 
-all: $(PY_FILES)
+svdtest: $(PY_FILES)
 
 clean:
 	-rm *.pyc

soc.py

@@ -0,0 +1,104 @@
+# -----------------------------------------------------------------------------
+"""
+
+SoC Object
+
+Takes an SVD file, parses it, and then re-expresses it as a python object
+that matches the requirements of pycs. Typically the resulting data structures
+will need some vendor/device specific tweaking to make up for things in the svd
+file that are missing or wrong. These tweaks are done by the vendor specific SoC
+code.
+
+Note: The str() functions are setup so printing the structures will produce
+*.py code to represent the structures. This is useful for debugging svd contents.
+
+"""
+# -----------------------------------------------------------------------------
+
+import svd
+
+# -----------------------------------------------------------------------------
+
+def attribute_string(s):
+  if s is None:
+    return 'None'
+  return "'%s'" % s
+
+# -----------------------------------------------------------------------------
+
+class cpu(object):
+
+  def __init__(self, cpu):
+    # this is more or less a straight copy of the cpu info from the svd file
+    if cpu is None:
+      return
+    self.name = cpu.name
+    self.revision = cpu.revision
+    self.endian = cpu.endian
+    self.mpuPresent = cpu.mpuPresent
+    self.fpuPresent = cpu.fpuPresent
+    self.fpuDP = cpu.fpuDP
+    self.icachePresent = cpu.icachePresent
+    self.dcachePresent = cpu.dcachePresent
+    self.itcmPresent = cpu.itcmPresent
+    self.dtcmPresent = cpu.dtcmPresent
+    self.vtorPresent = cpu.vtorPresent
+    self.nvicPrioBits = cpu.nvicPrioBits
+    self.vendorSystickConfig = cpu.vendorSystickConfig
+    self.deviceNumInterrupts = cpu.deviceNumInterrupts
+
+  def __str__(self):
+    s = []
+    s.append('cpu = soc.cpu(None)')
+    s.append('cpu.name = %s' % attribute_string(self.name))
+    s.append('cpu.revision = %s' % attribute_string(self.revision))
+    s.append('cpu.endian = %s' % attribute_string(self.endian))
+    s.append('cpu.mpuPresent = %s' % self.mpuPresent)
+    s.append('cpu.fpuPresent = %s' % self.fpuPresent)
+    s.append('cpu.fpuDP = %s' % self.fpuDP)
+    s.append('cpu.icachePresent = %s' % self.icachePresent)
+    s.append('cpu.dcachePresent = %s' % self.dcachePresent)
+    s.append('cpu.itcmPresent = %s' % self.itcmPresent)
+    s.append('cpu.dtcmPresent = %s' % self.dtcmPresent)
+    s.append('cpu.vtorPresent = %s' % self.vtorPresent)
+    s.append('cpu.nvicPrioBits = %s' % self.nvicPrioBits)
+    s.append('cpu.vendorSystickConfig = %s' % self.vendorSystickConfig)
+    s.append('cpu.deviceNumInterrupts = %s' % self.deviceNumInterrupts)
+    return '\n'.join(s)
+
+# -----------------------------------------------------------------------------
+
+class device(object):
+
+  def __init__(self):
+    pass
+
+  def read_svd(self, svdpath):
+    self.svdpath = svdpath
+    svd_device = svd.parser(self.svdpath).parse()
+    # general device information
+    self.vendor = svd_device.vendor
+    self.name = svd_device.name
+    self.description = svd_device.description
+    self.series = svd_device.series
+    self.version = svd_device.version
+    # cpu information
+    self.cpu = cpu(svd_device.cpu)
+
+  def __str__(self):
+    s = []
+    s.append('import soc')
+    s.append('%s\n' % self.cpu)
+    s.append('device = soc.device()')
+    s.append('device.svdpath = %s' % attribute_string(self.svdpath))
+    s.append('device.vendor = %s' % attribute_string(self.vendor))
+    s.append('device.name = %s' % attribute_string(self.name))
+    s.append('device.description = %s' % attribute_string(self.description))
+    s.append('device.series = %s' % attribute_string(self.series))
+    s.append('device.version = %s' % attribute_string(self.version))
+    s.append('device.cpu = cpu')
+    # inception!
+    s.append("print('%s') % device")
+    return '\n'.join(s)
+
+# -----------------------------------------------------------------------------