From 8949d813ff6f9941faf1b173d408e13b0a2440a7 Mon Sep 17 00:00:00 2001
From: Kevin Lim <ktlim@umich.edu>
Date: Sun, 8 Oct 2006 01:12:42 -0400
Subject: Clean up configs.

configs/common/FSConfig.py:
configs/common/SysPaths.py:
configs/example/fs.py:
configs/example/se.py:
tests/configs/o3-timing-mp.py:
tests/configs/o3-timing.py:
    Clean up configs by removing FullO3Config and instead using default values.
src/python/m5/objects/FUPool.py:
    Add in default FUPool.
src/python/m5/objects/O3CPU.py:
    Use defaults better.  Also set checker parameters, and fix up a config bug.

--HG--
extra : convert_revision : 5fd0c000143f4881f10a9a575c3810dc97cb290b
---
 configs/common/FSConfig.py | 1 -
 configs/common/SysPaths.py | 2 +-
 configs/example/fs.py      | 4 ++--
 configs/example/se.py      | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'configs')

diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 67a1e5735..470dc8867 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -30,7 +30,6 @@ import m5
 from m5 import makeList
 from m5.objects import *
 from Benchmarks import *
-from FullO3Config import *
 
 class CowIdeDisk(IdeDisk):
     image = CowDiskImage(child=RawDiskImage(read_only=True),
diff --git a/configs/common/SysPaths.py b/configs/common/SysPaths.py
index 2070d11f8..5098c54ce 100644
--- a/configs/common/SysPaths.py
+++ b/configs/common/SysPaths.py
@@ -58,7 +58,7 @@ def system():
     if not binary.dir:
         binary.dir = joinpath(system.dir, 'binaries')
     if not disk.dir:
-        disk.dir = joinpath(system.dir, 'disks')
+        disk.dir = joinpath('/n/zamp/z/ktlim/local/clean/linux', 'disks')
     if not script.dir:
         script.dir = joinpath(system.dir, 'boot')
 
diff --git a/configs/example/fs.py b/configs/example/fs.py
index 5edda6e5f..3d3313fbf 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -63,8 +63,8 @@ if args:
     sys.exit(1)
 
 if options.detailed:
-    cpu = DetailedO3CPU()
-    cpu2 = DetailedO3CPU()
+    cpu = DerivO3CPU()
+    cpu2 = DerivO3CPU()
     mem_mode = 'timing'
 elif options.timing:
     cpu = TimingSimpleCPU()
diff --git a/configs/example/se.py b/configs/example/se.py
index de8b6c890..7b8a52288 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -34,7 +34,6 @@ import m5
 from m5.objects import *
 import os, optparse, sys
 m5.AddToPath('../common')
-from FullO3Config import *
 
 parser = optparse.OptionParser()
 
@@ -86,7 +85,7 @@ if options.detailed:
 if options.timing:
     cpu = TimingSimpleCPU()
 elif options.detailed:
-    cpu = DetailedO3CPU()
+    cpu = DerivO3CPU()
 else:
     cpu = AtomicSimpleCPU()
 
-- 
cgit v1.2.3