summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoakim Sindholt <opensource@zhasha.com>2009-10-15 04:18:41 +0200
committerJoakim Sindholt <opensource@zhasha.com>2009-10-15 04:18:41 +0200
commit44cbed8fe36773990110cb326679da24fa3e59ba (patch)
treea5230799ad0845091447280ebaa6ff8aadd2898e
parent68d108b93e9331a02b9bfdf688b2b87c2d9b499d (diff)
doc2xml: clean up all whitespace errors
-rwxr-xr-xdoc2xml/radeonreg.py50
1 files changed, 25 insertions, 25 deletions
diff --git a/doc2xml/radeonreg.py b/doc2xml/radeonreg.py
index ced7fd6..18b6e5a 100755
--- a/doc2xml/radeonreg.py
+++ b/doc2xml/radeonreg.py
@@ -37,11 +37,11 @@ class RadeonReg:
self.addr = addr
self.fields = []
self.stride = stride
-
+
def __ne__(self, rhs): return not (self == rhs)
def __eq__(self, rhs):
if (not isinstance(rhs, RadeonReg)): return False
-
+
if self.unit != rhs.unit or \
self.name != rhs.name or \
self.desc != rhs.desc or \
@@ -50,10 +50,10 @@ class RadeonReg:
self.addr != rhs.addr or \
self.stride != rhs.stride or \
len(self.fields) != len(rhs.fields): return False
-
+
for i in xrange(len(self.fields)):
if self.fields[i] != rhs.fields[i]: return False
-
+
return True
class RadeonField:
@@ -63,11 +63,11 @@ class RadeonField:
self.low = low if low <= high else high
self.high = high if high >= low else low
self.enum = None
-
+
def __ne__(self, rhs): return not (self == rhs)
def __eq__(self, rhs):
if (not isinstance(rhs, RadeonField)): return False
-
+
if self.name == rhs.name and \
self.desc == rhs.desc and \
self.low == rhs.low and \
@@ -80,11 +80,11 @@ class EnumEntry:
self.val = val
self.name = name
self.desc = desc
-
+
def __ne__(self, rhs): return not (self == rhs)
def __eq__(self, rhs):
if (not isinstance(rhs, EnumEntry)): return False
-
+
if self.val == rhs.val and \
self.name == rhs.name and \
self.desc == rhs.desc: return True
@@ -96,24 +96,24 @@ class RadeonEnum:
def __init__(self):
self.entries = []
self.refs = 0
-
+
def add(self, val, name, desc):
self.entries.append(EnumEntry(val, name, desc))
-
+
def reference(self):
self.refs += 1
def __ne__(self, rhs): return not (self == rhs)
def __eq__(self, rhs):
if (not isinstance(rhs, RadeonEnum)): return False
-
+
if len(self.entries) != len(rhs.entries): return False
for i in xrange(len(self.entries)):
if self.entries[i] != rhs.entries[i]: return False
return True
-
+
def is_boolean(self):
if len(self.entries) == 2:
if bool_disable.match(self.entries[0].name) and \
@@ -147,20 +147,20 @@ def ExtractEnum(s):
if enum_desc.match(line): break
d += ' ' + line
d = StripSpaces(d)
-
+
enum = RadeonEnum()
if (enum_pv.search(s)): # special case: if "POSSIBLE VALUES:" exists, use a better suited regex
m = enum_pvregex.findall(s)
else:
m = enum_regex.findall(s)
-
+
for entry in m:
val = int(entry[0])
desc = StripSpaces(entry[2].replace('\n', ' '))
if reserved_regex.search(desc): continue
name = StripUnders(enum_ename.match(desc.replace(' ', '_')).group(1).upper())
enum.add(val, name, desc)
-
+
if len(enum.entries) == 0: enum = None
return [d, enum]
@@ -183,7 +183,7 @@ def ReadPDFDump(filename):
out = line
for regex in subs:
out = regex.sub('', out)
-
+
if out != '':
formatted += out + '\n'
@@ -224,7 +224,7 @@ def FormatPDFDump(pdf):
desc = StripSpaces(reg[11].replace('\n', ' '))
regs.append(RadeonReg(unit, name, count, access, addr[0], stride, desc))
creg = regs[-1]
-
+
f = field_regex.findall(reg[13])
for field in f:
fname = field[0]
@@ -232,11 +232,11 @@ def FormatPDFDump(pdf):
fdesc = StripSpaces(field[5])
creg.fields.append(RadeonField(fname, fbits[1], fbits[0], ""))
cfield = creg.fields[-1]
-
+
e = ExtractEnum(fdesc)
cfield.desc = e[0]
if e[1] != None: cfield.enum = AddEnum(e[1])
-
+
# if a register has a field spanning all of it, drop the field
if len(creg.fields) > 0:
if creg.fields[0].low == 0 and creg.fields[0].high == 31:
@@ -250,13 +250,13 @@ def FormatPDFDump(pdf):
else:
creg.desc += '. '
creg.desc += creg.fields[0].desc
-
+
# drop crap descriptions like TEX_0_R
if desc_nondesc.match(creg.desc):
# confirmed: nothing of value was lost
# print 'Dropping: "%s"' % creg.desc
creg.desc = ''
-
+
creg.fields = []
return regs
@@ -264,7 +264,7 @@ def FormatPDFDump(pdf):
def RegInArray(r1, regs):
for r2 in regs:
if r1 == r2: return True
-
+
return False
def CompareRegs(regs1, regs2):
@@ -275,7 +275,7 @@ def CompareRegs(regs1, regs2):
regs_a = [reg for reg in regs1 if not RegInArray(reg, regs_both)]
regs_b = [reg for reg in regs2 if not RegInArray(reg, regs_both)]
-
+
return (regs_both, regs_a, regs_b)
def XMLTags(s):
@@ -315,7 +315,7 @@ def XMLGroup(regs, gname, prepend):
PrintEnum(field.enum, indent + ' ')
else:
print indent + ' <use-enum ref="ENUM%d" />' % field.enum
-
+
print indent + ' </bitfield>'
else:
if field.desc != '':
@@ -368,7 +368,7 @@ r500regs = FormatPDFDump(ReadPDFDump('R5xx_Acceleration_v1.3.txt'))
# confirm that we caught ALL registers
if len(r300regs) != 207: print 'len(r300regs) == %d, expected 207' % len(r300regs)
if len(r500regs) != 278: print 'len(r500regs) == %d, expected 278' % len(r500regs)
-
+
# split out shared registers
regs_both,regs_r300,regs_r500 = CompareRegs(r300regs, r500regs)