Changeset 525 for abuse/trunkTweet

Timestamp:

Apr 22, 2011, 4:12:56 AM (12 years ago)

Author:

Sam Hocevar

Message:

core: replace all byte swapping macros with inline functions.

Location:

abuse/trunk/src

Files:

• common.h (modified) (2 diffs)
• imlib/specs.cpp (modified) (9 diffs)
• imlib/specs.h (modified) (1 diff)

abuse/trunk/src/common.h

@@ -16 +16 @@
 //
 #include <stdint.h>
+#include <stdio.h>
 
 //
@@ -40 +41 @@
 }
 
-static inline uint16_t Swap16(uint16_t x)
+static inline uint16_t lstl(uint16_t x)
 {
-    return ((uint16_t)x << 8 ) | ((uint16_t)x >> 8);
+    if (BigEndian())
+        return ((uint16_t)x << 8 ) | ((uint16_t)x >> 8);
+    return x;
 }
 
-static inline uint32_t Swap32(uint32_t x)
+static inline uint32_t lltl(uint32_t x)
 {
-    return ((uint32_t)x >> 24) | (((uint32_t)x & 0x00ff0000) >> 8)
-         | (((uint32_t)x & 0x0000ff00) << 8) | ((uint32_t)x << 24);
+    if (BigEndian())
+        return ((uint32_t)x >> 24) | (((uint32_t)x & 0x00ff0000) >> 8)
+             | (((uint32_t)x & 0x0000ff00) << 8) | ((uint32_t)x << 24);
+    return x;
 }
 
-#define uint16_to_intel(x) (BigEndian() ? Swap16((x)) : (x))
-#define uint32_to_intel(x) (BigEndian() ? Swap32((x)) : (x))
-#define big_uint16_to_local(x) (BigEndian() ? (x) : Swap16((x)))
-#define big_uint32_to_local(x) (BigEndian() ? (x) : Swap32((x)))
-#define uint16_to_local(x) (BigEndian() ? Swap16((x)) : (x))
-#define uint32_to_local(x) (BigEndian() ? Swap32((x)) : (x))
-
-#define bltl(x) big_uint32_to_local(x)
-#define bstl(x) big_uint16_to_local(x)
-#define lltl(x) uint32_to_intel(x)
-#define lstl(x) uint16_to_intel(x)
-
-#include <stdio.h>
 #define ERROR(x,st) { if (!(x)) \
    { printf("Error on line %d of %s : %s\n", \

abuse/trunk/src/imlib/specs.cpp

@@ -600 +600 @@
   uint16_t x;
   read(&x,2);
-  return uint16_to_local(x);
+  return lstl(x);
 }
 
@@ -608 +608 @@
   uint32_t x;
   read(&x,4);
-  return uint32_to_local(x);
+  return lltl(x);
 }
 
@@ -618 +618 @@
 void bFILE::write_uint16(uint16_t x)
 {
-  x=uint16_to_local(x);
+  x=lstl(x);
   write(&x,2);
 }
@@ -625 +625 @@
 void bFILE::write_uint32(uint32_t x)
 {
-  x=uint32_to_local(x);
+  x=lltl(x);
   write(&x,4);
 }
@@ -888 +888 @@
     if (fp->write(&flags,1)!=1)                     return 0;
 
-    data_size=uint32_to_intel((*e)->size);
+    data_size=lltl((*e)->size);
     if (fp->write((char *)&data_size,4)!=4)              return 0;
-    offset=uint32_to_intel((*e)->offset);
+    offset=lltl((*e)->offset);
     if (fp->write((char *)&offset,4)!=4)                  return 0;
 
@@ -914 +914 @@
   uint16_t x;
   fread(&x,1,2,fp);
-  return uint16_to_local(x);
+  return lstl(x);
 }
 
@@ -921 +921 @@
   uint32_t x;
   fread(&x,1,4,fp);
-  return uint32_to_local(x);
+  return lltl(x);
 }
 void write_uint16(FILE *fp, uint16_t x)
 {
-  x=uint16_to_local(x);
+  x=lstl(x);
   fwrite(&x,1,2,fp);
 }
@@ -931 +931 @@
 void write_uint32(FILE *fp, uint32_t x)
 {
-  x=uint32_to_local(x);
+  x=lltl(x);
   fwrite(&x,1,4,fp);
 }
@@ -937 +937 @@
 uint8_t read_uint8(FILE *fp) { return fgetc(fp)&0xff; }
 void write_uint8(FILE *fp, uint8_t x) { fputc((unsigned char)x,fp); }
-
-uint32_t read_other_uint32(FILE *fp)
-{
-  uint32_t x;
-  fread(&x,1,4,fp);
-  return big_uint32_to_local(x);
-}
-
-uint16_t read_other_uint16(FILE *fp)
-{
-  uint16_t x;
-  fread(&x,1,2,fp);
-  return big_uint16_to_local(x);
-}
-
-
-void write_other_uint16(FILE *fp, uint16_t x)
-{
-  x=big_uint16_to_local(x);
-  fwrite(&x,1,2,fp);
-}
-
-void write_other_int32(FILE *fp, uint32_t x)
-{
-  x=big_uint32_to_local(x);
-  fwrite(&x,1,4,fp);
-}
 
 void spec_directory::remove(spec_entry *e)

abuse/trunk/src/imlib/specs.h

@@ -207 +207 @@
 uint16_t read_uint16(FILE *fp);
 uint32_t read_uint32(FILE *fp);
-uint32_t read_other_uint32(FILE *fp);
-uint16_t read_other_uint16(FILE *fp);
 uint8_t read_uint8(FILE *fp);
 
 void write_uint16(FILE *fp, uint16_t x);
 void write_uint32(FILE *fp, uint32_t x);
-void write_other_uint16(FILE *fp, uint16_t x);
-void write_other_uint32(FILE *fp, uint32_t x);
 void write_uint8(FILE *fp, uint8_t x);