anchor.diff:  	     Mul#(i__, nMasters, TMax#(nMasters, numWriteClientsActual)),
   
   	     Add#(e__, TLog#(a__), 6),
  -	     Add#(f__, TLog#(b__), 6)
  +	     Add#(f__, TLog#(b__), 6),
  +             Add#(g__, addrWidth, 44),
  +             Add#(j__, addrWidth, 64),
  +             Add#(k__, 12, addrWidth),
  +             Add#(1, k__, l__)
   
   	     );
   
  -   MMU#(PhysAddrWidth) hostMMU <- mkMMU(0, True, mmuIndication);
  +   MMU#(addrWidth) hostMMU <- mkMMU(0, True, mmuIndication);
   
      Vector#(numReadClientsNull, MemReadClient#(dataWidth)) nullReadClients = replicate(null_mem_read_client());
      Vector#(numWriteClientsNull, MemWriteClient#(dataWidth)) nullWriteClients = replicate(null_mem_write_client());
   
      // if this is implemented in terms of mkMemServer, then we go into loop where the compiler keeps asking for more provisos...
  -   MemServer#(PhysAddrWidth,dataWidth,nMasters) dma <- mkMemServerRW(indication, append(readClients,nullReadClients), append(writeClients,nullWriteClients), cons(hostMMU,nil));
  +   MemServer#(addrWidth,dataWidth,nMasters) dma <- mkMemServerRW(indication, append(readClients,nullReadClients), append(writeClients,nullWriteClients), cons(hostMMU,nil));
   
      interface MemServerRequest memServerRequest = dma.request;
      interface MMURequest mmuRequest = hostMMU.request;
  
positive.code: module mkSimpleMemServer#(Vector#(numReadClients, MemReadClient#(dataWidth)) readClients,
  			  Vector#(numWriteClients, MemWriteClient#(dataWidth)) writeClients,
  			  MemServerIndication indication,
  			  MMUIndication mmuIndication)(SimpleMemServer#(PhysAddrWidth, dataWidth,nMasters))
     provisos (Max#(nMasters,numReadClients,numReadClientsActual),
  	     Add#(numReadClients,numReadClientsNull,numReadClientsActual),
  	     Mul#(a__, nMasters, numReadClientsActual),
  
negative.code:       indication.addrResponse(zeroExtend(physAddr));
     endrule
  
     function PhysMemMaster#(addrWidth,dataWidth) mkm(Integer i) = (interface PhysMemMaster#(addrWidth,dataWidth);
  								 interface PhysMemReadClient read_client = null_phys_mem_read_client;
  								 interface PhysMemWriteClient write_client = writers[i].write_client;
  							      endinterface);
  