API tools faq
paste
Guest User

Ice 3.4.2 patch for ARM try #1

a guest
Jan 17th, 2013
101
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 4.89 KB | None | 0 0
raw download clone embed print report
  1. --- cpp/src/Ice/BasicStream.cpp.orig    2013-01-17 08:21:58.000174177 +0000
  2. +++ cpp/src/Ice/BasicStream.cpp 2013-01-17 08:26:30.935291280 +0000
  3. @@ -1218,39 +1218,28 @@
  4.      *dest++ = *src--;
  5.      *dest++ = *src--;
  6.      *dest++ = *src--;
  7.      *dest++ = *src--;
  8.      *dest++ = *src--;
  9.      *dest++ = *src--;
  10.      *dest++ = *src--;
  11.      *dest = *src;
  12.  #else
  13.      const Byte* src = reinterpret_cast<const Byte*>(&v);
  14. -#  if defined(__arm__) && defined(__linux)
  15. -    dest[4] = *src++;
  16. -    dest[5] = *src++;
  17. -    dest[6] = *src++;
  18. -    dest[7] = *src++;
  19. -    dest[0] = *src++;
  20. -    dest[1] = *src++;
  21. -    dest[2] = *src++;
  22. -    dest[3] = *src;
  23. -#  else
  24.      *dest++ = *src++;
  25.      *dest++ = *src++;
  26.      *dest++ = *src++;
  27.      *dest++ = *src++;
  28.      *dest++ = *src++;
  29.      *dest++ = *src++;
  30.      *dest++ = *src++;
  31.      *dest = *src;
  32. -#  endif
  33.  #endif
  34.  }
  35.  
  36.  void
  37.  IceInternal::BasicStream::write(const Double* begin, const Double* end)
  38.  {
  39.      Int sz = static_cast<Int>(end - begin);
  40.      writeSize(sz);
  41.      if(sz > 0)
  42.      {
  43. @@ -1264,35 +1253,20 @@
  44.              *dest++ = *src--;
  45.              *dest++ = *src--;
  46.              *dest++ = *src--;
  47.              *dest++ = *src--;
  48.              *dest++ = *src--;
  49.              *dest++ = *src--;
  50.              *dest++ = *src--;
  51.              *dest++ = *src--;
  52.              src += 2 * sizeof(Double);
  53.          }
  54. -#elif defined(__arm__) && defined(__linux)
  55. -        const Byte* src = reinterpret_cast<const Byte*>(begin);
  56. -        Byte* dest = &(*(b.begin() + pos));
  57. -        for(int j = 0 ; j < sz ; ++j)
  58. -        {
  59. -            dest[4] = *src++;
  60. -            dest[5] = *src++;
  61. -            dest[6] = *src++;
  62. -            dest[7] = *src++;
  63. -            dest[0] = *src++;
  64. -            dest[1] = *src++;
  65. -            dest[2] = *src++;
  66. -            dest[3] = *src++;
  67. -            dest += sizeof(Double);
  68. -        }
  69.  #else
  70.          memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Double));
  71.  #endif
  72.      }
  73.  }
  74.  
  75.  void
  76.  IceInternal::BasicStream::read(Double& v)
  77.  {
  78.      if(b.end() - i < static_cast<int>(sizeof(Double)))
  79. @@ -1306,39 +1280,28 @@
  80.      *dest-- = *src++;
  81.      *dest-- = *src++;
  82.      *dest-- = *src++;
  83.      *dest-- = *src++;
  84.      *dest-- = *src++;
  85.      *dest-- = *src++;
  86.      *dest-- = *src++;
  87.      *dest = *src;
  88.  #else
  89.      Byte* dest = reinterpret_cast<Byte*>(&v);
  90. -#  if defined(__arm__) && defined(__linux)
  91. -    dest[4] = *src++;
  92. -    dest[5] = *src++;
  93. -    dest[6] = *src++;
  94. -    dest[7] = *src++;
  95. -    dest[0] = *src++;
  96. -    dest[1] = *src++;
  97. -    dest[2] = *src++;
  98. -    dest[3] = *src;
  99. -#  else
  100.      *dest++ = *src++;
  101.      *dest++ = *src++;
  102.      *dest++ = *src++;
  103.      *dest++ = *src++;
  104.      *dest++ = *src++;
  105.      *dest++ = *src++;
  106.      *dest++ = *src++;
  107.      *dest = *src;
  108. -#  endif
  109.  #endif
  110.  }
  111.  
  112.  void
  113.  IceInternal::BasicStream::read(vector<Double>& v)
  114.  {
  115.      Int sz;
  116.      readAndCheckSeqSize(static_cast<int>(sizeof(Double)), sz);
  117.      if(sz > 0)
  118.      {
  119. @@ -1353,35 +1316,20 @@
  120.              *dest-- = *src++;
  121.              *dest-- = *src++;
  122.              *dest-- = *src++;
  123.              *dest-- = *src++;
  124.              *dest-- = *src++;
  125.              *dest-- = *src++;
  126.              *dest-- = *src++;
  127.              *dest-- = *src++;
  128.              dest += 2 * sizeof(Double);
  129.          }
  130. -#elif defined(__arm__) && defined(__linux)
  131. -        const Byte* src = &(*begin);
  132. -        Byte* dest = reinterpret_cast<Byte*>(&v[0]);
  133. -        for(int j = 0 ; j < sz ; ++j)
  134. -        {
  135. -            dest[4] = *src++;
  136. -            dest[5] = *src++;
  137. -            dest[6] = *src++;
  138. -            dest[7] = *src++;
  139. -            dest[0] = *src++;
  140. -            dest[1] = *src++;
  141. -            dest[2] = *src++;
  142. -            dest[3] = *src++;
  143. -            dest += sizeof(Double);
  144. -        }
  145.  #else
  146.          copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
  147.  #endif
  148.      }
  149.      else
  150.      {
  151.          v.clear();
  152.      }
  153.  }
  154.  
  155. @@ -1412,35 +1360,20 @@
  156.              *dest-- = *src++;
  157.              *dest-- = *src++;
  158.              *dest-- = *src++;
  159.              *dest-- = *src++;
  160.              *dest-- = *src++;
  161.              *dest-- = *src++;
  162.              *dest-- = *src++;
  163.              *dest-- = *src++;
  164.              dest += 2 * sizeof(Double);
  165.          }
  166. -#  elif defined(__arm__) && defined(__linux)
  167. -        const Byte* src = &(*begin);
  168. -        Byte* dest = reinterpret_cast<Byte*>(&result[0]);
  169. -        for(int j = 0 ; j < sz ; ++j)
  170. -        {
  171. -            dest[4] = *src++;
  172. -            dest[5] = *src++;
  173. -            dest[6] = *src++;
  174. -            dest[7] = *src++;
  175. -            dest[0] = *src++;
  176. -            dest[1] = *src++;
  177. -            dest[2] = *src++;
  178. -            dest[3] = *src++;
  179. -            dest += sizeof(Double);
  180. -        }
  181.  
  182.  #  else
  183.          copy(begin, i, reinterpret_cast<Byte*>(&result[0]));
  184.  #  endif
  185.  #endif
  186.      }
  187.      else
  188.      {
  189.          v.first = v.second = 0;
  190.      }
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!