Mirrors/m1n1
2
0
Fork 0
mirror of https://github.com/AsahiLinux/m1n1 synced 2024-11-26 08:20:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

utils.py: prepare AddrLookup for device specific mmiotrace handlers

Browse source 
Signed-off-by: Janne Grunau <j@jannau.net>
This commit is contained in:
Janne Grunau 2021-06-11 22:27:58 +02:00 committed by Hector Martin
parent d33d7ba89d
commit 1d6a9c5257
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
proxyclient/m1n1/utils.py
View file

@ -203,9 +203,6 @@ class AddrLookup:
start = bisect.bisect_left(sizes, len(zone)) start = bisect.bisect_left(sizes, len(zone))
for subpos in range(start, len(self.__ranges[pos])): for subpos in range(start, len(self.__ranges[pos])):
e_zone, e_value = self.__ranges[pos][subpos] e_zone, e_value = self.__ranges[pos][subpos]
if zone == e_zone:
self.__ranges[pos][subpos] = (e_zone, e_value + [value])
break
if len(zone) < len(e_zone): if len(zone) < len(e_zone):
self.__ranges[pos].insert(subpos, (zone, [value])) self.__ranges[pos].insert(subpos, (zone, [value]))
break break
@ -229,16 +226,16 @@ class AddrLookup:
self.__end.insert(pos, zone.stop - 1) self.__end.insert(pos, zone.stop - 1)
self.__ranges.insert(pos, [(zone, [value])]) self.__ranges.insert(pos, [(zone, [value])])
def lookup(self, addr): def lookup(self, addr, default='unknown'):
addr = int(addr) addr = int(addr)
pos = bisect.bisect(self.__addr, addr) pos = bisect.bisect(self.__addr, addr)
if pos == 0 or self.__end[pos - 1] < addr: if pos == 0 or self.__end[pos - 1] < addr:
return ('unknown', range(0, 1 << 64)) return (default, range(0, 1 << 64))
for r, value in self.__ranges[pos - 1]: for r, value in self.__ranges[pos - 1]:
if addr in r: if addr in r:
return (value[0], r) return (value[0], r)
return ('unexpected', range(0, 0)) return (None, range(0, 0))
def lookup_all(self, addr): def lookup_all(self, addr):
addr = int(addr) addr = int(addr)