1 files changed, 27 insertions, 60 deletions

diff --git a/SConscript b/SConscript
index 8afac510b..3a141a7d2 100644
--- a/SConscript
+++ b/SConscript
@@ -81,67 +81,18 @@ base_sources = Split('''
 	base/stats/text.cc
 
 	cpu/base.cc
-        cpu/base_dyn_inst.cc
 	cpu/cpu_exec_context.cc
 	cpu/exetrace.cc
+        cpu/op_class.cc
 	cpu/pc_event.cc
 	cpu/static_inst.cc
         cpu/sampler/sampler.cc
-        cpu/trace/reader/mem_trace_reader.cc
-        cpu/trace/reader/ibm_reader.cc
-        cpu/trace/reader/itx_reader.cc
-        cpu/trace/reader/m5_reader.cc
-        cpu/trace/opt_cpu.cc
-        cpu/trace/trace_cpu.cc
 
-	encumbered/mem/functional/main.cc
-
-	mem/base_hier.cc
-	mem/base_mem.cc
-	mem/hier_params.cc
-	mem/mem_cmd.cc
-	mem/mem_debug.cc
-	mem/mem_req.cc
-	mem/memory_interface.cc
-	mem/bus/base_interface.cc
-	mem/bus/bus.cc
-	mem/bus/bus_bridge.cc
-	mem/bus/bus_bridge_master.cc
-	mem/bus/bus_bridge_slave.cc
-	mem/bus/bus_interface.cc
-	mem/bus/dma_bus_interface.cc
-	mem/bus/dma_interface.cc
-	mem/bus/master_interface.cc
-	mem/bus/slave_interface.cc
-	mem/cache/base_cache.cc
-	mem/cache/cache.cc
-	mem/cache/cache_builder.cc
-	mem/cache/coherence/coherence_protocol.cc
-	mem/cache/coherence/uni_coherence.cc
-	mem/cache/miss/blocking_buffer.cc
-	mem/cache/miss/miss_queue.cc
-	mem/cache/miss/mshr.cc
-	mem/cache/miss/mshr_queue.cc
-        mem/cache/prefetch/base_prefetcher.cc
-        mem/cache/prefetch/prefetcher.cc
-        mem/cache/prefetch/tagged_prefetcher.cc
-	mem/cache/tags/base_tags.cc
-	mem/cache/tags/cache_tags.cc	
-	mem/cache/tags/fa_lru.cc
-	mem/cache/tags/iic.cc
-	mem/cache/tags/lru.cc
-	mem/cache/tags/repl/gen.cc
-	mem/cache/tags/repl/repl.cc
-	mem/cache/tags/split.cc
-	mem/cache/tags/split_lru.cc
-	mem/cache/tags/split_lifo.cc
-	mem/functional/functional.cc
-	mem/timing/base_memory.cc
-	mem/timing/memory_builder.cc
-	mem/timing/simple_mem_bank.cc
-        mem/trace/itx_writer.cc
-	mem/trace/mem_trace_writer.cc
-	mem/trace/m5_writer.cc
+        mem/memory.cc
+        mem/page_table.cc
+        mem/physical.cc
+        mem/port.cc
+        mem/translating_port.cc
 
         python/pyconfig.cc
         python/embedded_py.cc
@@ -162,6 +113,7 @@ base_sources = Split('''
 	sim/startup.cc
 	sim/stat_context.cc
 	sim/stat_control.cc
+	sim/system.cc
 	sim/trace_context.cc
         ''')
 
@@ -204,6 +156,17 @@ full_cpu_sources = Split('''
         encumbered/cpu/full/iq/standard/iq_standard.cc
         ''')
 
+trace_reader_sources = Split('''
+        cpu/trace/reader/mem_trace_reader.cc
+        cpu/trace/reader/ibm_reader.cc
+        cpu/trace/reader/itx_reader.cc
+        cpu/trace/reader/m5_reader.cc
+        cpu/trace/opt_cpu.cc
+        cpu/trace/trace_cpu.cc
+        ''')
+
+
+
 # MySql sources
 mysql_sources = Split('''
 	base/mysql.cc
@@ -260,9 +223,6 @@ full_system_sources = Split('''
 	kern/tru64/tru64_syscalls.cc
 
 	mem/functional/memory_control.cc
-	mem/functional/physical.cc
-
-	sim/system.cc
 	sim/pseudo_inst.cc
         ''')
 
@@ -288,8 +248,7 @@ turbolaser_sources = Split('''
 
 # Syscall emulation (non-full-system) sources
 syscall_emulation_sources = Split('''
-	cpu/memtest/memtest.cc
-	encumbered/eio/eio.cc
+
 	encumbered/eio/exolex.cc
 	encumbered/eio/libexo.cc
         kern/linux/linux.cc
@@ -298,6 +257,14 @@ syscall_emulation_sources = Split('''
 	sim/syscall_emul.cc
         ''')
 
+eio_sources = Split('''
+	encumbered/eio/eio.cc
+        ''')
+
+memtest_sources = Split('''
+	cpu/memtest/memtest.cc
+        ''')
+
 # Add a flag defining what THE_ISA should be for all compilation
 env.Append(CPPDEFINES=[('THE_ISA','%s_ISA' % env['TARGET_ISA'].upper())])