anchor.diff:     function Action fa_upd_cache_and_respond (Meta_State new_tag_state, Data rdata);
         action
   	 // Update cache tag
  -	 let new_tag = DMA_Cache_Tag {tag_state: ((req_op == AXI4_OP_WR) ? META_MODIFIED : new_tag_state),
  -				      tag_addr: addr};
  +	 let new_tag = DMA_Cache_Tag {tag_state: ((req_op == AXI4_OP_WR)
  +						  ? META_MODIFIED
  +						  : new_tag_state),
  +				      tag_addr: line_addr};
   	 let new_tag_set = fn_mk_Tag_Set (new_tag);
   	 rf_tag_sets.upd (index, new_tag_set);
   	 if(verbosity >= 1)
  
positive.code:    return truncate (addr >> bits_per_byte_in_data);
  endfunction
  
  function Bit #(64) fn_addr_to_data_addr (Bit #(64) addr);
     return ((addr >> bits_per_byte_in_data) << bits_per_byte_in_data);
  endfunction
  
  
negative.code:       let rsp <- pop (f_L2_to_L1_Rsps);
  
        // Assert response is for addr requested
        if (rsp.addr != line_addr) begin
  	 $display ("%0d: DMA_Cache.rl_upgrade_rsp: ERROR: rsp is not for addr %0h",
  		   cur_cycle, line_addr);
  	 $display ("    ", fshow (rsp));
  	 $finish (1);
        end
  
        // Old data can be from L2 or from this cache
        Data old_data = ?;
        if (rsp.m_cline matches tagged Valid .x) begin
  	 if (tag.tag_state != META_INVALID) begin
  