Merge with head, hopefully the last time for this batch.

2012-01-31 22:40:08 -08:00
parent e88165a431 7d4f187700
commit ea8b347dc5
132 changed files with 1719 additions and 909 deletions
--- a/src/sim/process_impl.hh
+++ b/src/sim/process_impl.hh
@@ -47,7 +47,7 @@ copyStringArray(std::vector<std::string> &strings,
 {
    AddrType data_ptr_swap;
    for (std::vector<std::string>::size_type i = 0; i < strings.size(); ++i) {
-        data_ptr_swap = htog(data_ptr);
+        data_ptr_swap = TheISA::htog(data_ptr);
        memProxy->writeBlob(array_ptr, (uint8_t*)&data_ptr_swap,
                sizeof(AddrType));
        memProxy->writeString(data_ptr, strings[i].c_str());