projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mem: Make the XBar responsible for tracking response routing
[gem5.git]
/
src
/
sim
/
process_impl.hh
diff --git
a/src/sim/process_impl.hh
b/src/sim/process_impl.hh
index b1b14d0f338bfe0d85b64ac50ccc0283e8954faa..b1905834b342af76d6b0a8e25cbdbe728698c658 100644
(file)
--- a/
src/sim/process_impl.hh
+++ b/
src/sim/process_impl.hh
@@
-32,15
+32,6
@@
#ifndef __SIM_PROCESS_IMPL_HH__
#define __SIM_PROCESS_IMPL_HH__
#ifndef __SIM_PROCESS_IMPL_HH__
#define __SIM_PROCESS_IMPL_HH__
-//
-// The purpose of this code is to fake the loader & syscall mechanism
-// when there's no OS: thus there's no reason to use it in FULL_SYSTEM
-// mode when we do have an OS.
-//
-#include "config/full_system.hh"
-
-#if !FULL_SYSTEM
-
#include <string>
#include <vector>
#include <string>
#include <vector>
@@
-52,24
+43,21
@@
template<class AddrType>
void
copyStringArray(std::vector<std::string> &strings,
AddrType array_ptr, AddrType data_ptr,
void
copyStringArray(std::vector<std::string> &strings,
AddrType array_ptr, AddrType data_ptr,
- SETranslatingPortProxy
*
memProxy)
+ SETranslatingPortProxy
&
memProxy)
{
AddrType data_ptr_swap;
for (std::vector<std::string>::size_type i = 0; i < strings.size(); ++i) {
{
AddrType data_ptr_swap;
for (std::vector<std::string>::size_type i = 0; i < strings.size(); ++i) {
- data_ptr_swap = htog(data_ptr);
- memProxy
->
writeBlob(array_ptr, (uint8_t*)&data_ptr_swap,
+ data_ptr_swap =
TheISA::
htog(data_ptr);
+ memProxy
.
writeBlob(array_ptr, (uint8_t*)&data_ptr_swap,
sizeof(AddrType));
sizeof(AddrType));
- memProxy
->
writeString(data_ptr, strings[i].c_str());
+ memProxy
.
writeString(data_ptr, strings[i].c_str());
array_ptr += sizeof(AddrType);
data_ptr += strings[i].size() + 1;
}
// add NULL terminator
data_ptr = 0;
array_ptr += sizeof(AddrType);
data_ptr += strings[i].size() + 1;
}
// add NULL terminator
data_ptr = 0;
- memProxy
->
writeBlob(array_ptr, (uint8_t*)&data_ptr, sizeof(AddrType));
+ memProxy
.
writeBlob(array_ptr, (uint8_t*)&data_ptr, sizeof(AddrType));
}
}
-
-#endif // !FULL_SYSTEM
-
#endif
#endif