From dcc8f7d726620e7e2c7667fcff4c134c664971d9 Mon Sep 17 00:00:00 2001 From: David Li Date: Tue, 29 Dec 2015 14:36:49 -0700 Subject: Update test for new cache --- src/lib.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/lib.rs') diff --git a/src/lib.rs b/src/lib.rs index 0dc0e7f..b77d4f7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -34,19 +34,16 @@ fn it_works() { #[cfg(test)] mod tests { - use super::*; - #[test] fn cache_address_parsing() { - let dm_cache_word = memory::Cache::new(4, 1, 1); - let dm_cache_doubleword = memory::Cache::new(4, 1, 2); - let fa_cache_doubleword = memory::Cache::new(1, 4, 2); + use memory::*; + + let dm_cache_word = DirectMappedCache::new(4, 1, Memory::new(1)); + let dm_cache_doubleword = DirectMappedCache::new(4, 2, Memory::new(1)); assert_eq!(dm_cache_word.parse_address(0xFFFFFFFD), (0xFFFFFFF, 3, 1)); assert_eq!(dm_cache_doubleword.parse_address(0xFFFFFFFD), (0x7FFFFFF, 3, 5)); - assert_eq!(fa_cache_doubleword.parse_address(0xFFFFFFFD), - (0x1FFFFFFF, 0, 5)); } } -- cgit v1.2.3