caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor chipdb.py improvement

Browse Source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-06-17 16:28:05 +02:00
parent 4fe8ba5e9a
commit 0af9156d7a
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ice40/chipdb.py
View File

@ -6,6 +6,7 @@ import textwrap
endianness = "le" endianness = "le"
compact_output = True compact_output = True
nodebug = True
dev_name = None dev_name = None
dev_width = None dev_width = None
@ -374,7 +375,7 @@ elif dev_name == "384":
add_bel_gb( 3, 9, 4) add_bel_gb( 3, 9, 4)
class BinaryBlobAssembler: class BinaryBlobAssembler:
def __init__(self, cname, endianness, ctype = "unsigned char"): def __init__(self, cname, endianness, ctype = "unsigned char", nodebug = False):
assert endianness in ["le", "be"] assert endianness in ["le", "be"]
self.cname = cname self.cname = cname
self.ctype = ctype self.ctype = ctype
@ -388,6 +389,7 @@ class BinaryBlobAssembler:
self.ltypes_byaddr = dict() self.ltypes_byaddr = dict()
self.strings = dict() self.strings = dict()
self.refs = dict() self.refs = dict()
self.nodebug = nodebug
def l(self, name, ltype = None, export = False): def l(self, name, ltype = None, export = False):
assert not self.finalized assert not self.finalized
@ -405,6 +407,8 @@ class BinaryBlobAssembler:
assert not self.finalized assert not self.finalized
assert len(self.data) % 4 == 0 assert len(self.data) % 4 == 0
assert len(self.data) not in self.refs assert len(self.data) not in self.refs
if self.nodebug:
comment = None
if name is not None: if name is not None:
self.refs[len(self.data)] = (name, comment) self.refs[len(self.data)] = (name, comment)
self.data.append(0) self.data.append(0)
@ -416,15 +420,22 @@ class BinaryBlobAssembler:
def s(self, s, comment): def s(self, s, comment):
assert not self.finalized assert not self.finalized
if self.nodebug:
comment = None
if s not in self.strings: if s not in self.strings:
index = len(self.strings) index = len(self.strings)
self.strings[s] = index self.strings[s] = index
else: else:
index = self.strings[s] index = self.strings[s]
self.r("str%d" % index, '%s: "%s"' % (comment, s)) if comment is not None:
self.r("str%d" % index, '%s: "%s"' % (comment, s))
else:
self.r("str%d" % index, None)
def u8(self, v, comment): def u8(self, v, comment):
assert not self.finalized assert not self.finalized
if self.nodebug:
comment = None
self.data.append(v) self.data.append(v)
if comment is not None: if comment is not None:
self.comments[len(self.data)] = comment self.comments[len(self.data)] = comment
@ -432,6 +443,8 @@ class BinaryBlobAssembler:
def u16(self, v, comment): def u16(self, v, comment):
assert not self.finalized assert not self.finalized
assert len(self.data) % 2 == 0 assert len(self.data) % 2 == 0
if self.nodebug:
comment = None
if self.endianness == "le": if self.endianness == "le":
self.data.append(v & 255) self.data.append(v & 255)
self.data.append((v >> 8) & 255) self.data.append((v >> 8) & 255)
@ -446,6 +459,8 @@ class BinaryBlobAssembler:
def u32(self, v, comment): def u32(self, v, comment):
assert not self.finalized assert not self.finalized
assert len(self.data) % 4 == 0 assert len(self.data) % 4 == 0
if self.nodebug:
comment = None
if self.endianness == "le": if self.endianness == "le":
self.data.append(v & 255) self.data.append(v & 255)
self.data.append((v >> 8) & 255) self.data.append((v >> 8) & 255)