fix reading data from diffenent endian types

When testing a data file created on x86 on a PPC box, I found that
there was a missing conversion of reading the values. This patch
moves the data2host to the header file and converts the necessary
fields.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>

3 files changed, 60 insertions, 43 deletions

diff --git a/parse-events.c b/parse-events.c
index 72b8d56..81957cf 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -1597,11 +1597,11 @@ static unsigned long long read_size(void *ptr, int size)
         case 1:
                 return *(unsigned char *)ptr;
         case 2:
-                return *(unsigned short *)ptr;
+                return data2host2(ptr);
         case 4:
-                return *(unsigned int *)ptr;
+                return data2host4(ptr);
         case 8:
-                return *(unsigned long long *)ptr;
+                return data2host8(ptr);
         default:
                 /* BUG! */
                 return 0;
@@ -2334,7 +2334,7 @@ void print_event(int cpu, void *data, int size, unsigned long long nsecs)
 
         event = find_event(type);
         if (!event)
-                die("ug! no event found");
+                die("ug! no event found for type %d", type);
 
         pid = parse_common_pid(data);
         comm = find_cmdline(pid);
diff --git a/parse-events.h b/parse-events.h
index e77af1f..9ba633f 100644
--- a/parse-events.h
+++ b/parse-events.h
@@ -168,4 +168,58 @@ int parse_ftrace_file(char *buf, unsigned long size);
 int parse_event_file(char *buf, unsigned long size, char *system);
 void print_event(int cpu, void *data, int size, unsigned long long nsecs);
 
+extern int file_bigendian;
+extern int host_bigendian;
+
+static inline unsigned short __data2host2(unsigned short data)
+{
+        unsigned short swap;
+
+        if (host_bigendian == file_bigendian)
+                return data;
+
+        swap = ((data & 0xffULL) << 8) |
+                ((data & (0xffULL << 8)) >> 8);
+
+        return swap;
+}
+
+static inline unsigned int __data2host4(unsigned int data)
+{
+        unsigned int swap;
+
+        if (host_bigendian == file_bigendian)
+                return data;
+
+        swap = ((data & 0xffULL) << 24) |
+                ((data & (0xffULL << 8)) << 8) |
+                ((data & (0xffULL << 16)) >> 8) |
+                ((data & (0xffULL << 24)) >> 24);
+
+        return swap;
+}
+
+static inline unsigned long long __data2host8(unsigned long long data)
+{
+        unsigned long long swap;
+
+        if (host_bigendian == file_bigendian)
+                return data;
+
+        swap = ((data & 0xffULL) << 56) |
+                ((data & (0xffULL << 8)) << 40) |
+                ((data & (0xffULL << 16)) << 24) |
+                ((data & (0xffULL << 24)) << 8) |
+                ((data & (0xffULL << 32)) >> 8) |
+                ((data & (0xffULL << 40)) >> 24) |
+                ((data & (0xffULL << 48)) >> 40) |
+                ((data & (0xffULL << 56)) >> 56);
+
+        return swap;
+}
+
+#define data2host2(ptr)         __data2host2(*(unsigned short *)ptr)
+#define data2host4(ptr)         __data2host4(*(unsigned int *)ptr)
+#define data2host8(ptr)         __data2host8(*(unsigned long long *)ptr)
+
 #endif /* _PARSE_EVENTS_H */
diff --git a/trace-read.c b/trace-read.c
index f65043b..fd8e206 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -42,8 +42,8 @@ static int input_fd;
 
 static int read_page;
 
-static int file_bigendian;
-static int host_bigendian;
+int file_bigendian;
+int host_bigendian;
 static int long_size;
 
 static int filter_cpu = -1;
@@ -68,43 +68,6 @@ static int read_or_die(void *data, int size)
         return r;
 }
 
-static unsigned int __data2host4(unsigned int data)
-{
-        unsigned long long swap;
-
-        if (host_bigendian == file_bigendian)
-                return data;
-
-        swap = ((data & 0xffULL) << 24) |
-                ((data & (0xffULL << 8)) << 8) |
-                ((data & (0xffULL << 16)) >> 8) |
-                ((data & (0xffULL << 24)) >> 24);
-
-        return swap;
-}
-
-static unsigned long long __data2host8(unsigned long long data)
-{
-        unsigned long long swap;
-
-        if (host_bigendian == file_bigendian)
-                return data;
-
-        swap = ((data & 0xffULL) << 56) |
-                ((data & (0xffULL << 8)) << 40) |
-                ((data & (0xffULL << 16)) << 24) |
-                ((data & (0xffULL << 24)) << 8) |
-                ((data & (0xffULL << 32)) >> 8) |
-                ((data & (0xffULL << 40)) >> 24) |
-                ((data & (0xffULL << 48)) >> 40) |
-                ((data & (0xffULL << 56)) >> 56);
-
-        return swap;
-}
-
-#define data2host4(ptr)         __data2host4(*(unsigned int *)ptr)
-#define data2host8(ptr)         __data2host8(*(unsigned long long *)ptr)
-
 static unsigned int read4(void)
 {
         unsigned int data;