Big endian support (Fixes #567)

Author: mappzor

dependencies/zycore

@@ -746,29 +746,30 @@ static ZyanStatus ZydisReadDisplacement(ZydisDecoderState* state,
     {
         ZyanU16 value;
         ZYAN_CHECK(ZydisInputNextBytes(state, instruction, (ZyanU8*)&value, 2));
+        ZYAN_LE16_TO_NATIVE(value);
         instruction->raw.disp.value = *(ZyanI16*)&value;
         break;
     }
     case 32:
     {
         ZyanU32 value;
         ZYAN_CHECK(ZydisInputNextBytes(state, instruction, (ZyanU8*)&value, 4));
+        ZYAN_LE32_TO_NATIVE(value);
         instruction->raw.disp.value = *(ZyanI32*)&value;
         break;
     }
     case 64:
     {
         ZyanU64 value;
         ZYAN_CHECK(ZydisInputNextBytes(state, instruction, (ZyanU8*)&value, 8));
+        ZYAN_LE64_TO_NATIVE(value);
         instruction->raw.disp.value = *(ZyanI64*)&value;
         break;
     }
     default:
         ZYAN_UNREACHABLE;
     }
 
-    // TODO: Fix endianess on big-endian systems
-
     return ZYAN_STATUS_SUCCESS;
 }
 
@@ -817,6 +818,7 @@ static ZyanStatus ZydisReadImmediate(ZydisDecoderState* state,
     {
         ZyanU16 value;
         ZYAN_CHECK(ZydisInputNextBytes(state, instruction, (ZyanU8*)&value, 2));
+        ZYAN_LE16_TO_NATIVE(value);
         if (is_signed)
         {
             instruction->raw.imm[id].value.s = (ZyanI16)value;
@@ -830,6 +832,7 @@ static ZyanStatus ZydisReadImmediate(ZydisDecoderState* state,
     {
         ZyanU32 value;
         ZYAN_CHECK(ZydisInputNextBytes(state, instruction, (ZyanU8*)&value, 4));
+        ZYAN_LE32_TO_NATIVE(value);
         if (is_signed)
         {
             instruction->raw.imm[id].value.s = (ZyanI32)value;
@@ -843,6 +846,7 @@ static ZyanStatus ZydisReadImmediate(ZydisDecoderState* state,
     {
         ZyanU64 value;
         ZYAN_CHECK(ZydisInputNextBytes(state, instruction, (ZyanU8*)&value, 8));
+        ZYAN_LE64_TO_NATIVE(value);
         if (is_signed)
         {
             instruction->raw.imm[id].value.s = (ZyanI64)value;
@@ -856,8 +860,6 @@ static ZyanStatus ZydisReadImmediate(ZydisDecoderState* state,
         ZYAN_UNREACHABLE;
     }
 
-    // TODO: Fix endianess on big-endian systems
-
     return ZYAN_STATUS_SUCCESS;
 }
 

src/Decoder.c

@@ -3172,13 +3172,13 @@ static ZyanStatus ZydisEmitUInt(ZyanU64 data, ZyanU8 size, ZydisEncoderBuffer *b
         return ZYAN_STATUS_INSUFFICIENT_BUFFER_SIZE;
     }
 
-    // TODO: fix for big-endian systems
     // The size variable is not passed on purpose to allow the compiler
     // to generate better code with a known size at compile time.
     if (size == 1)
     {
         ZYAN_MEMCPY(buffer->buffer + buffer->offset, &data, 1);
     }
+#if ZYAN_ENDIAN == ZYAN_LITTLE_ENDIAN
     else if (size == 2)
     {
         ZYAN_MEMCPY(buffer->buffer + buffer->offset, &data, 2);
@@ -3191,6 +3191,23 @@ static ZyanStatus ZydisEmitUInt(ZyanU64 data, ZyanU8 size, ZydisEncoderBuffer *b
     {
         ZYAN_MEMCPY(buffer->buffer + buffer->offset, &data, 8);
     }
+#else
+    else if (size == 2)
+    {
+        ZyanU16 value = ZYAN_BYTESWAP16((ZyanU16)data);
+        ZYAN_MEMCPY(buffer->buffer + buffer->offset, &value, 2);
+    }
+    else if (size == 4)
+    {
+        ZyanU32 value = ZYAN_BYTESWAP32((ZyanU32)data);
+        ZYAN_MEMCPY(buffer->buffer + buffer->offset, &value, 4);
+    }
+    else if (size == 8)
+    {
+        ZyanU64 value = ZYAN_BYTESWAP64((ZyanU64)data);
+        ZYAN_MEMCPY(buffer->buffer + buffer->offset, &value, 8);
+    }
+#endif
     else
     {
         ZYAN_UNREACHABLE;