Fix tools/unnamed.py

Author: Rangi42

tools/unnamed.py

@@ -90,19 +90,19 @@ def read_string(file):
 		elif magic == b'RGB9':
 			obj_ver = 10 + unpack_from('<I', file)[0]
 
-		if obj_ver not in [6, 10, 11, 12, 13, 15, 16, 17, 18, 19, 20, 21, 22]:
+		if obj_ver not in [6, 10, 11, 12, 13] and obj_ver < 15:
 			print(f"Error: File '{objfile}' is of an unknown format.", file=sys.stderr)
 			sys.exit(1)
 
 		num_symbols = unpack_from('<I', file)[0]
 		unpack_from('<I', file) # skip num sections
 
-		if obj_ver in [16, 17, 18, 19, 20, 21, 22]:
+		if obj_ver >= 16:
 			node_filenames = []
 			num_nodes = unpack_from('<I', file)[0]
 			for x in range(num_nodes):
 				unpack_from('<II', file) # parent id, parent line no
-				node_type = unpack_from('<B', file)[0]
+				node_type = unpack_from('<B', file)[0] & 0x7f
 				if node_type:
 					node_filenames.append(read_string(file))
 				else:
@@ -117,7 +117,7 @@ def read_string(file):
 			sym_type = symtype(unpack_from('<B', file)[0] & 0x7f)
 			if sym_type == symtype.IMPORT:
 				continue
-			if obj_ver in [16, 17, 18, 19, 20, 21, 22]:
+			if obj_ver >= 16:
 				sym_fileno = unpack_from('<I', file)[0]
 				sym_filename = node_filenames[sym_fileno]
 			else: