From c27139c701e8e61056ebc2cf002c5aa129779c13 Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Mon, 21 Jun 2004 00:58:30 -0400
Subject: start towards getting m5 endian compliant

base/inifile.cc:
    Added mac os support and fixed a bug, on error we need to exit the
    child process not return
base/intmath.hh:
    gcc on macos wanted a seperate function for the size_t type
base/loader/elf_object.cc:
    I'm not sure why this works under linux because it seems to return
    the wrong value.
base/stats/text.cc:
    added define/include for mac os x
cpu/exec_context.hh:
cpu/simple_cpu/simple_cpu.cc:
    added endian conversion code
dev/alpha_console.cc:
    rather than accessing a charecter array of varying size depending on
    the access, lets actually do this properly.
dev/alpha_console.hh:
    get rid of now nolonger used consoleData
dev/disk_image.cc:
    We have to byte swap the data is some cases, added function to do that
dev/ethertap.cc:
    added preproc directive for mac os

--HG--
extra : convert_revision : 2b5685765cfa2844926d7397f363d2788e3d640a
---
 dev/disk_image.cc | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

(limited to 'dev/disk_image.cc')

diff --git a/dev/disk_image.cc b/dev/disk_image.cc
index 142fb60a5..4df196e64 100644
--- a/dev/disk_image.cc
+++ b/dev/disk_image.cc
@@ -46,6 +46,7 @@
 #include "dev/disk_image.hh"
 #include "sim/builder.hh"
 #include "sim/sim_exit.hh"
+#include "targetarch/byte_swap.hh"
 
 using namespace std;
 
@@ -227,7 +228,17 @@ SafeRead(ifstream &stream, void *data, int count)
 template<class T>
 void
 SafeRead(ifstream &stream, T &data)
-{ SafeRead(stream, &data, sizeof(data)); }
+{
+    SafeRead(stream, &data, sizeof(data));
+}
+
+template<class T>
+void
+SafeReadSwap(ifstream &stream, T &data)
+{
+    SafeRead(stream, &data, sizeof(data));
+    data = htoa(data);
+}
 
 bool
 CowDiskImage::open(const string &file)
@@ -246,21 +257,21 @@ CowDiskImage::open(const string &file)
         panic("Could not open %s: Invalid magic", file);
 
     uint32_t major, minor;
-    SafeRead(stream, major);
-    SafeRead(stream, minor);
+    SafeReadSwap(stream, major);
+    SafeReadSwap(stream, minor);
 
     if (major != VersionMajor && minor != VersionMinor)
         panic("Could not open %s: invalid version %d.%d != %d.%d",
               file, major, minor, VersionMajor, VersionMinor);
 
     uint64_t sector_count;
-    SafeRead(stream, sector_count);
+    SafeReadSwap(stream, sector_count);
     table = new SectorTable(sector_count);
 
 
     for (uint64_t i = 0; i < sector_count; i++) {
         uint64_t offset;
-        SafeRead(stream, offset);
+        SafeReadSwap(stream, offset);
 
         Sector *sector = new Sector;
         SafeRead(stream, sector, sizeof(Sector));
@@ -300,8 +311,17 @@ SafeWrite(ofstream &stream, const void *data, int count)
 template<class T>
 void
 SafeWrite(ofstream &stream, const T &data)
-{ SafeWrite(stream, &data, sizeof(data)); }
+{
+    SafeWrite(stream, &data, sizeof(data));
+}
 
+template<class T>
+void
+SafeWriteSwap(ofstream &stream, const T &data)
+{
+    T swappeddata = htoa(data);
+    SafeWrite(stream, &swappeddata, sizeof(data));
+}
 void
 CowDiskImage::save()
 {
@@ -322,9 +342,9 @@ CowDiskImage::save(const string &file)
     memcpy(&magic, "COWDISK!", sizeof(magic));
     SafeWrite(stream, magic);
 
-    SafeWrite(stream, (uint32_t)VersionMajor);
-    SafeWrite(stream, (uint32_t)VersionMinor);
-    SafeWrite(stream, (uint64_t)table->size());
+    SafeWriteSwap(stream, (uint32_t)VersionMajor);
+    SafeWriteSwap(stream, (uint32_t)VersionMinor);
+    SafeWriteSwap(stream, (uint64_t)table->size());
 
     uint64_t size = table->size();
     SectorTable::iterator iter = table->begin();
@@ -334,7 +354,7 @@ CowDiskImage::save(const string &file)
         if (iter == end)
             panic("Incorrect Table Size during save of COW disk image");
 
-        SafeWrite(stream, (uint64_t)(*iter).first);
+        SafeWriteSwap(stream, (uint64_t)(*iter).first);
         SafeWrite(stream, (*iter).second->data, sizeof(Sector));
         ++iter;
     }
-- 
cgit v1.2.3