X-Git-Url: https://git.ozlabs.org/?p=bitfield;a=blobdiff_plain;f=bitfield;h=da2b94b7f294fe23c24a864da5f502e955b486ed;hp=e9be554734bb9ba37613cf9a4b3ca5ffafe41387;hb=3239dde734b95545b6fd8dbd98d37e6afdfe24e6;hpb=a8d8334c23bc35483ed5a39e5ca163c38524da2a

diff --git a/bitfield b/bitfield
index e9be554..da2b94b 100644
--- a/bitfield
+++ b/bitfield
@@ -79,15 +79,17 @@ class register:
 	def add_field(self, field,):
 		self.fields.append(field)
 
-	def decode(self, value):
+	def decode(self, value, ignore_zero):
 		field_width = (self.width + 3) / 4
 		name_width = max(map(lambda f: len(f.name), self.fields))
 		str = "0x%0*lx [%d]\n" % (field_width, value, value)
 		for field in self.fields:
 			v = field.mask(self.width, value);
+			if ignore_zero and v == 0:
+				continue
 			desc = field.value(v)
 			if desc is not None:
-				str += "%*s: 0x%s [%s]\n" \
+				str += "%*s: 0x%x [%s]\n" \
 					% (name_width, field.name, v, desc)
 			else:
 				str += "%*s: 0x%x\n" \
@@ -210,8 +212,8 @@ def usage(prog):
 
 def main():
 	try:
-		(opts, args) = getopt(sys.argv[1:], "hls:", \
-			["help", "list", "search="])
+		(opts, args) = getopt(sys.argv[1:], "hlns:", \
+			["help", "list", "non-zero", "search="])
 	except GetoptError:
 		usage(sys.argv[0])
 		return 1
@@ -227,6 +229,9 @@ def main():
 		print "No configuration available"
 		return 1
 
+	options = {}
+	options['non-zero'] = False
+
 	for o, a in opts:
 		if o in ("-h", "--help"):
 			usage(sys.argv[0])
@@ -240,6 +245,8 @@ def main():
 			list_regs(search_regs(regs, a))
 			return
 
+		if o in ("-n", "--non-zero"):
+			options['non-zero'] = True
 
 	if not args:
 		usage(sys.argv[0])
@@ -263,7 +270,7 @@ def main():
 
 	for value in values:
 		i = long(value.strip(), 0)
-		print r.decode(i)
+		print r.decode(i, options['non-zero'])
 
 	return 0