Changeset 617 in Sophya

Timestamp:

Nov 22, 1999, 12:23:47 PM (26 years ago)

Author:

ansari

Message:

fix alpha swap

File:

• trunk/Poubelle/archTOI.old/archeopsfile.cc (modified) (5 diffs)

trunk/Poubelle/archTOI.old/archeopsfile.cc

@@ -347 +347 @@
         longueur_block(peekBlock) != long_block[type_block(peekBlock)]) {
       cout << "invalid block, bad type or length" << endl;
+      //cout << "addr = " << peekPos << endl;
       memset(peekBlock, 0, sizeof(block_type_modele)); // don't keep trash...
       peekPos = searchNextBlock(peekPos);
@@ -435 +436 @@
 }
 
+
+#ifdef __DECCXX
+#define SWAP
+#endif
+#if ((defined(Linux)  || defined(linux)) && !defined(powerpc))
+#define SWAP
+#endif
+
+
+typedef unsigned int4 uint_4;
+typedef unsigned short uint_2;
+
+static inline void bswap4(void* p)
+{
+  uint_4 tmp = *(uint_4*)p;
+  *(uint_4*)p = ((tmp >> 24) & 0x000000FF) | 
+                ((tmp >> 8)  & 0x0000FF00) |
+                ((tmp & 0x0000FF00) << 8)  |
+                ((tmp & 0x000000FF) << 24);
+}
+
+static inline void bswap2(void* p)
+{
+  uint_2 tmp = *(uint_2*)p;
+  *(uint_2*)p = ((tmp >> 8) & 0x00FF) | 
+                ((tmp & 0x00FF) << 8);
+}
+
+
 long ArcheopsFile::searchNextBlock(long pos) {
   static char* buffer = 0;
@@ -445 +475 @@
 #endif
   }
+  //printf("searchNext %o len = %d value = %x \n", pos, longmax, debswp);
   long read = longmax;
   while (read == longmax) {
@@ -455 +486 @@
 #endif
      for (long i=4; i<read; i++) {
+       // printf("%o %x\n", pos+i, *(__unaligned int4*)(buffer+i));
       if (*(__unaligned int4*)(buffer+i) == debswp) {
         cout << "trying to skip " << i << " bytes to pos="<<pos+i << endl;
@@ -620 +652 @@
 }
 
-typedef unsigned int4 uint_4;
-typedef unsigned short uint_2;
-
-static inline void bswap4(void* p)
-{
-  uint_4 tmp = *(uint_4*)p;
-  *(uint_4*)p = ((tmp >> 24) & 0x000000FF) | 
-                ((tmp >> 8)  & 0x0000FF00) |
-                ((tmp & 0x0000FF00) << 8)  |
-                ((tmp & 0x000000FF) << 24);
-}
-
-static inline void bswap2(void* p)
-{
-  uint_2 tmp = *(uint_2*)p;
-  *(uint_2*)p = ((tmp >> 8) & 0x00FF) | 
-                ((tmp & 0x00FF) << 8);
-}
-
-#ifdef __DECCXX
-#define SWAP
-#endif
-#if defined(Linux)  || defined(linux)
-#define SWAP
-#endif
-
 #ifdef SWAP
 void ArcheopsFile::swapEntete(block_type_modele* blk) {