DecodingNet: Adapt resolution and queries to nodes without overlay
authorDaniel Schwyn <schwyda@student.ethz.ch>
Wed, 19 Jul 2017 13:54:46 +0000 (15:54 +0200)
committerDaniel Schwyn <schwyda@student.ethz.ch>
Wed, 19 Jul 2017 13:54:46 +0000 (15:54 +0200)
Signed-off-by: Daniel Schwyn <schwyda@student.ethz.ch>

usr/skb/programs/decodingNet.pl
usr/skb/programs/decodingNetQueries.pl

index cd5b975..3862075 100644 (file)
@@ -56,22 +56,13 @@ listMapsToName([M|Maps],Addr,Name) :-
     mapsToName(M,Addr,Name);
     listMapsToName(Maps,Addr,Name).    
 
-translateMap(node(_,_,Translate,_),Addr,Name) :-
+translateMap(node(_,_,Translate),Addr,Name) :-
     listMapsToName(Translate,Addr,Name).
 
-translateOverlay(node(_,Accept,Translate,Overlay),Addr,Name) :-
-    not(Overlay = '@none'),
-    blockListRanges(Accept,ARanges),
-    neg(Addr :: ARanges),
-    mapListRanges(Translate,TRanges),
-    neg(Addr :: TRanges),
-    Name = name(Overlay,Addr).
-
 translate(Node,Addr,Name) :-
-    translateMap(Node,Addr,Name);
-    translateOverlay(Node,Addr,Name).
+    translateMap(Node,Addr,Name).
 
-accept(node(_,Accept,_,_),Addr) :-
+accept(node(_,Accept,_),Addr) :-
     blockListRanges(Accept,Ranges),
     Addr :: Ranges.
 
index eb78f7e..db892f4 100644 (file)
@@ -46,14 +46,14 @@ findOriginRegion(NodeId,Result) :-
 findDeviceRegion(NodeId,DeviceId,Result) :-
     SrcName = name(NodeId,_),
     DestName = name(DeviceId,_),
-    net(DeviceId,node(device,_,_,_)),
+    net(DeviceId,node(device,_,_)),
     resolveToRegion(SrcName,DestName,SrcRegion,DestRegion),
     Result = (SrcRegion,DestRegion).
 
 findMemoryRegion(NodeId,MemoryId,Result) :-
     SrcName = name(NodeId,_),
     DestName = name(MemoryId,_),
-    net(MemoryId,node(memory,_,_,_)),
+    net(MemoryId,node(memory,_,_)),
     resolveToRegion(SrcName,DestName,SrcRegion,DestRegion),
     Result = (SrcRegion,DestRegion).
 
@@ -61,7 +61,7 @@ findSharedMemoryRegion(NodeId,DeviceId,Result) :-
     NodeName = name(NodeId,_),
     DeviceName = name(DeviceId,_),
     SharedName = name(SharedId,_),
-    net(SharedId,node(memory,_,_,_)),
+    net(SharedId,node(memory,_,_)),
     resolve(NodeName,SharedName),
     resolve(DeviceName,SharedName),
     toRegion(NodeName,NodeRegion),