Cleanup endian_utils.h

Rewrite the endian_utils.h functions to use normal endian.h functions.
Also remove some unused functions.

Test: build
Test: manual DDMS.
Change-Id: I4bc80bf2e6b74a72844a5a4f296b3e34e80c7343

1 files changed, 22 insertions, 39 deletions

diff --git a/libartbase/base/endian_utils.h b/libartbase/base/endian_utils.h
index 6c19ef96ae..414668c0de 100644
--- a/libartbase/base/endian_utils.h
+++ b/libartbase/base/endian_utils.h
@@ -23,8 +23,11 @@
 
 namespace art {
 
-constexpr uint32_t Get4BE(unsigned char const* pSrc) {
-  return (pSrc[0] << 24) | (pSrc[1] << 16) | (pSrc[2] << 8) | pSrc[3];
+template<typename T>
+inline void AppendBytes(std::vector<uint8_t>& bytes, T data) {
+  size_t size = bytes.size();
+  bytes.resize(size + sizeof(T));
+  memcpy(bytes.data() + size, &data, sizeof(T));
 }
 
 inline void Append1BE(std::vector<uint8_t>& bytes, uint8_t value) {
@@ -32,30 +35,18 @@ inline void Append1BE(std::vector<uint8_t>& bytes, uint8_t value) {
 }
 
 inline void Append2BE(std::vector<uint8_t>& bytes, uint16_t value) {
-  bytes.push_back(static_cast<uint8_t>(value >> 8));
-  bytes.push_back(static_cast<uint8_t>(value));
+  AppendBytes<uint16_t>(bytes, htobe16(value));
 }
 
 inline void Append4BE(std::vector<uint8_t>& bytes, uint32_t value) {
-  bytes.push_back(static_cast<uint8_t>(value >> 24));
-  bytes.push_back(static_cast<uint8_t>(value >> 16));
-  bytes.push_back(static_cast<uint8_t>(value >> 8));
-  bytes.push_back(static_cast<uint8_t>(value));
+  AppendBytes<uint32_t>(bytes, htobe32(value));
 }
 
 inline void Append8BE(std::vector<uint8_t>& bytes, uint64_t value) {
-  bytes.push_back(static_cast<uint8_t>(value >> 56));
-  bytes.push_back(static_cast<uint8_t>(value >> 48));
-  bytes.push_back(static_cast<uint8_t>(value >> 40));
-  bytes.push_back(static_cast<uint8_t>(value >> 32));
-  bytes.push_back(static_cast<uint8_t>(value >> 24));
-  bytes.push_back(static_cast<uint8_t>(value >> 16));
-  bytes.push_back(static_cast<uint8_t>(value >> 8));
-  bytes.push_back(static_cast<uint8_t>(value));
-}
-
-inline void AppendUtf16BE(std::vector<uint8_t>& bytes, const uint16_t* chars,
-                                 size_t char_count) {
+  AppendBytes<uint64_t>(bytes, htobe64(value));
+}
+
+inline void AppendUtf16BE(std::vector<uint8_t>& bytes, const uint16_t* chars, size_t char_count) {
   Append4BE(bytes, char_count);
   for (size_t i = 0; i < char_count; ++i) {
     Append2BE(bytes, chars[i]);
@@ -63,42 +54,33 @@ inline void AppendUtf16BE(std::vector<uint8_t>& bytes, const uint16_t* chars,
 }
 
 inline void AppendUtf16CompressedBE(std::vector<uint8_t>& bytes,
-                                           const uint8_t* chars, size_t char_count) {
+                                    const uint8_t* chars,
+                                    size_t char_count) {
   Append4BE(bytes, char_count);
   for (size_t i = 0; i < char_count; ++i) {
     Append2BE(bytes, static_cast<uint16_t>(chars[i]));
   }
 }
 
-// @deprecated
+template <typename T>
+inline void SetBytes(uint8_t* buf, T val) {
+  memcpy(buf, &val, sizeof(T));
+}
+
 inline void Set1(uint8_t* buf, uint8_t val) {
   *buf = val;
 }
 
-// @deprecated
 inline void Set2BE(uint8_t* buf, uint16_t val) {
-  *buf++ = (uint8_t)(val >> 8);
-  *buf = (uint8_t)(val);
+  SetBytes<uint16_t>(buf, htobe16(val));
 }
 
-// @deprecated
 inline void Set4BE(uint8_t* buf, uint32_t val) {
-  *buf++ = (uint8_t)(val >> 24);
-  *buf++ = (uint8_t)(val >> 16);
-  *buf++ = (uint8_t)(val >> 8);
-  *buf = (uint8_t)(val);
+  SetBytes<uint32_t>(buf, htobe32(val));
 }
 
-// @deprecated
 inline void Set8BE(uint8_t* buf, uint64_t val) {
-  *buf++ = (uint8_t)(val >> 56);
-  *buf++ = (uint8_t)(val >> 48);
-  *buf++ = (uint8_t)(val >> 40);
-  *buf++ = (uint8_t)(val >> 32);
-  *buf++ = (uint8_t)(val >> 24);
-  *buf++ = (uint8_t)(val >> 16);
-  *buf++ = (uint8_t)(val >> 8);
-  *buf = (uint8_t)(val);
+  SetBytes<uint64_t>(buf, htobe64(val));
 }
 
 inline void Write1BE(uint8_t** dst, uint8_t value) {
@@ -120,6 +102,7 @@ inline void Write8BE(uint8_t** dst, uint64_t value) {
   Set8BE(*dst, value);
   *dst += sizeof(value);
 }
+
 }  // namespace art
 
 #endif  // ART_LIBARTBASE_BASE_ENDIAN_UTILS_H_