diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-26 18:40:08 -0400 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-26 18:40:08 -0400 |
commit | 5df77b865ddc29a00629a679437dee2578997559 (patch) | |
tree | 57f7c93f29e8787b42e7399182c12a8b933ef193 /src/sim | |
parent | e04f60667af9884fa871935e4c1274bdf0311707 (diff) | |
parent | 53510f184452c46868a9e6ece9ccb7f30ab70843 (diff) | |
download | gem5-5df77b865ddc29a00629a679437dee2578997559.tar.xz |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : 3a34dbab3101281786a4b70724c5aee3e4730843
Diffstat (limited to 'src/sim')
-rw-r--r-- | src/sim/process.cc | 2 | ||||
-rw-r--r-- | src/sim/system.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/sim/process.cc b/src/sim/process.cc index 1261b8436..1da525093 100644 --- a/src/sim/process.cc +++ b/src/sim/process.cc @@ -154,7 +154,7 @@ Process::startup() Port *mem_port; mem_port = system->physmem->getPort("functional"); - initVirtMem = new TranslatingPort(pTable, true); + initVirtMem = new TranslatingPort("process init port", pTable, true); mem_port->setPeer(initVirtMem); initVirtMem->setPeer(mem_port); } diff --git a/src/sim/system.cc b/src/sim/system.cc index ca9d68d77..89f39491e 100644 --- a/src/sim/system.cc +++ b/src/sim/system.cc @@ -25,6 +25,8 @@ System::System(Params *p) : SimObject(p->name), physmem(p->physmem), numcpus(0), #if FULL_SYSTEM init_param(p->init_param), + functionalPort(p->name + "-fport"), + virtPort(p->name + "-vport"), #else page_ptr(0), #endif |