From 11b308e7363e937966b035b4891db32b4eece3bf Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Fri, 1 Oct 2010 08:55:28 -0800 Subject: integrating recent changes from fermi-test into fermi (i'll use "fermi" for more disruptive changes to the pipeline model such as updating the MSHRs and getting rid of the warp tracker, ripping out DWF, etc...) [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7805] --- src/cuda-sim/memory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/cuda-sim/memory.h') diff --git a/src/cuda-sim/memory.h b/src/cuda-sim/memory.h index bac4d24..4487b36 100644 --- a/src/cuda-sim/memory.h +++ b/src/cuda-sim/memory.h @@ -164,6 +164,7 @@ public: virtual void set_watch( addr_t addr, unsigned watchpoint ); private: + void read_single_block( mem_addr_t blk_idx, mem_addr_t addr, size_t length, void *data) const; std::string m_name; unsigned m_log2_block_size; typedef mem_map > map_t; -- cgit v1.3