Merge pull request #484 from Eclo/fix-endian-issue

Fixes issues with endian macros (in GCC)

Author: smaillet-ms

Application/TinyBooter/Commands.cpp

@@ -979,7 +979,7 @@ bool Loader_Engine::ProcessPayload( WP_Message* msg )
     LOADER_ENGINE_SETFLAG( this, c_LoaderEngineFlag_ValidConnection );
 
     //--//
-#if defined(BIG_ENDIAN)
+#if defined(NETMF_TARGET_BIG_ENDIAN)
     SwapEndian( msg, msg->m_payload, msg->m_header.m_size, false );
 #endif
     size_t                      num;
@@ -1120,7 +1120,7 @@ bool Loader_Engine::TransmitMessage( const WP_Message* msg, bool fQueue )
     UINT32 payloadSize;
     UINT32 flags;
 
-#if !defined(BIG_ENDIAN)
+#if !defined(NETMF_TARGET_BIG_ENDIAN)
     payloadSize = msg->m_header.m_size;
     flags       = msg->m_header.m_flags;
 #else
@@ -1178,7 +1178,7 @@ void Loader_Engine::ReplyToCommand( WP_Message* msg, bool fSuccess, bool fCritic
 
     msgReply.Initialize( &m_controller );
 
-#if defined(BIG_ENDIAN)
+#if defined(NETMF_TARGET_BIG_ENDIAN)
     SwapEndian( msg, ptr, size, true );
 #endif
     msgReply.PrepareReply( msg->m_header, flags, size, (UINT8*)ptr );
@@ -1203,7 +1203,7 @@ bool Loader_Engine::Monitor_Ping( WP_Message* msg )
         CLR_DBG_Commands::Monitor_Ping::Reply cmdReply;
         cmdReply.m_source = CLR_DBG_Commands::Monitor_Ping::c_Ping_Source_TinyBooter;
 
-#if defined(BIG_ENDIAN)
+#if defined(NETMF_TARGET_BIG_ENDIAN)
         cmdReply.m_dbg_flags  = CLR_DBG_Commands::Monitor_Ping::c_Ping_DbgFlag_BigEndian;
 #endif
 
@@ -1587,7 +1587,7 @@ bool Loader_Engine::Monitor_FlashSectorMap( WP_Message* msg )
     return true;
 }
 
-#if defined(BIG_ENDIAN)
+#if defined(NETMF_TARGET_BIG_ENDIAN)
 
 UINT32 Loader_Engine::SwapEndianPattern( UINT8* &buffer, UINT32 size, UINT32 count )
 {

Application/TinyBooter/Commands.h

@@ -147,7 +147,7 @@ struct Loader_Engine
     bool Monitor_SignatureKeyUpdate( WP_Message* msg );
     bool EnumerateAndLaunch        (                 );
 
-#if defined(BIG_ENDIAN)
+#if defined(NETMF_TARGET_BIG_ENDIAN)
 public:     
     void    SwapDebuggingValue ( UINT8* &msg, UINT32 size                          );
     void    SwapEndian         ( WP_Message* msg, void* ptr, int size, bool fReply );

CLR/Core/CLR_RT_HeapBlock.cpp

@@ -389,7 +389,7 @@ HRESULT CLR_RT_HeapBlock::LoadFromReference( CLR_RT_HeapBlock& ref )
             else if(size == 1) { first = ((CLR_UINT8 *)src)[ 0 ];                                   }
             else               { first = ((CLR_UINT16*)src)[ 0 ];                                   }
 
-#if !defined(BIG_ENDIAN)
+#if !defined(NETMF_TARGET_BIG_ENDIAN)
             ((CLR_UINT32*)&NumericByRef())[ 0 ] = first;
             ((CLR_UINT32*)&NumericByRef())[ 1 ] = second;
 #else
@@ -403,7 +403,7 @@ HRESULT CLR_RT_HeapBlock::LoadFromReference( CLR_RT_HeapBlock& ref )
                 ((CLR_UINT32*)&NumericByRef())[ 0 ] = second;
                 ((CLR_UINT32*)&NumericByRef())[ 1 ] = first;
             }
-#endif //BIG_ENDIAN
+#endif //NETMF_TARGET_BIG_ENDIAN
 
             TINYCLR_SET_AND_LEAVE(S_OK);
         }
@@ -531,7 +531,7 @@ HRESULT CLR_RT_HeapBlock::StoreToReference( CLR_RT_HeapBlock& ref, int size )
                 }
             }
 
-#if !defined(BIG_ENDIAN)
+#if !defined(NETMF_TARGET_BIG_ENDIAN)
             CLR_UINT32 first  = ((CLR_UINT32*)&obj->NumericByRef())[ 0 ];
             CLR_UINT32 second = ((CLR_UINT32*)&obj->NumericByRef())[ 1 ];
 #else
@@ -548,7 +548,7 @@ HRESULT CLR_RT_HeapBlock::StoreToReference( CLR_RT_HeapBlock& ref, int size )
                 first   = ((CLR_UINT32*)&obj->NumericByRef())[ 1 ];
                 second  = ((CLR_UINT32*)&obj->NumericByRef())[ 0 ];
             }
-#endif //BIG_ENDIAN
+#endif //NETMF_TARGET_BIG_ENDIAN
 
             if     (sizeArray == 4) { ((CLR_UINT32*)dst)[ 0 ] = (CLR_UINT32)first;                                               }
             else if(sizeArray == 8) { ((CLR_UINT32*)dst)[ 0 ] = (CLR_UINT32)first; ((CLR_UINT32*)dst)[ 1 ] = (CLR_UINT32)second; }

CLR/Core/CLR_RT_HeapBlock_Array.cpp

@@ -206,7 +206,7 @@ HRESULT CLR_RT_HeapBlock_Array::IndexOf( CLR_RT_HeapBlock_Array* array, CLR_RT_H
 
                 while(true)
                 {
-#if !defined(BIG_ENDIAN)
+#if !defined(NETMF_TARGET_BIG_ENDIAN)
                     if(memcmp( data, &matchPtr->NumericByRef(), sizeElem ) == 0)
                     {
                         index = pos;

CLR/Core/Execution.cpp

@@ -3067,7 +3067,7 @@ void CLR_RT_ExecutionEngine::StopOnBreakpoint( CLR_DBG_Commands::Debugging_Execu
 
             if(m_breakpointsActiveNum == 1)
             {
-#if defined(BIG_ENDIAN)
+#if defined(NETMF_TARGET_BIG_ENDIAN)
                 static CLR_DBG_Commands::Debugging_Execution_BreakpointDef s_breakpoint;
                 CLR_UINT8* data;
 

CLR/Core/Serialization/BinaryFormatter.cpp

@@ -1635,7 +1635,7 @@ HRESULT CLR_RT_BinaryFormatter::State::AdvanceToTheNextElement()
             {
                 TINYCLR_CHECK_HRESULT(m_parent->ReadBits( val, bits ));
 
-#if !defined(BIG_ENDIAN)
+#if !defined(NETMF_TARGET_BIG_ENDIAN)
                 memcpy( ptr, &val, size );
 #else
                 memcpy( ptr, ((unsigned char*)&val)+(sizeof(val)-size), size );

CLR/Core/Streams.cpp

@@ -165,7 +165,7 @@ HRESULT CLR_RT_HeapBlock_MemoryStream::ReadBits( CLR_UINT64& res, CLR_UINT32 bit
 
     CLR_UINT32* ptr = (CLR_UINT32*)&res;
 
-#if !defined(BIG_ENDIAN)
+#if !defined(NETMF_TARGET_BIG_ENDIAN)
     if(bits > 32) { TINYCLR_CHECK_HRESULT(ReadBits( ptr[ 1 ], bits - 32 )); bits = 32; }
     else          {                                 ptr[ 1 ] = 0;                      }
 

CLR/Core/TypeSystem.cpp

@@ -1342,7 +1342,7 @@ bool CLR_RECORD_ASSEMBLY::GoodHeader() const
     NATIVE_PROFILE_CLR_CORE();
     CLR_RECORD_ASSEMBLY header = *this; header.headerCRC = 0;
 
-#if !defined(BIG_ENDIAN)
+#if !defined(NETMF_TARGET_BIG_ENDIAN)
     if ( (header.flags & CLR_RECORD_ASSEMBLY::c_Flags_BigEndian) == CLR_RECORD_ASSEMBLY::c_Flags_BigEndian)
 #else
     if ( (header.flags & CLR_RECORD_ASSEMBLY::c_Flags_BigEndian) != CLR_RECORD_ASSEMBLY::c_Flags_BigEndian)
@@ -4430,7 +4430,7 @@ HRESULT CLR_RT_AttributeParser::Next( Value*& res )
             CLR_UINT32 size = (dtl.m_sizeInBits + 7) / 8;
 
 // FIXME GJS - the numeric values, what is their endiannes??? In the MSTV code there is a BIG endian fix but it looks like it will not work, so was it ever used?
-#if !defined(BIG_ENDIAN)
+#if !defined(NETMF_TARGET_BIG_ENDIAN)
             memcpy( &m_lastValue.m_value.NumericByRef(), m_blob, size ); m_blob += size;
 #else
             switch(size)

CLR/Debugger/Debugger.cpp

@@ -370,7 +370,7 @@ bool CLR_DBG_Debugger::Monitor_Ping( WP_Message* msg, void* owner )
 
         cmdReply.m_source    = CLR_DBG_Commands::Monitor_Ping::c_Ping_Source_TinyCLR;
 
-#if !defined(BIG_ENDIAN)
+#if !defined(NETMF_TARGET_BIG_ENDIAN)
         cmdReply.m_dbg_flags = CLR_EE_DBG_IS(State_ProgramExited) != 0 ? CLR_DBG_Commands::Monitor_Ping::c_Ping_DbgFlag_AppExit : 0;
 #else
         cmdReply.m_dbg_flags  = CLR_DBG_Commands::Monitor_Ping::c_Ping_DbgFlag_BigEndian;
@@ -1432,7 +1432,7 @@ static bool FillValues( CLR_RT_HeapBlock* ptr, CLR_DBG_Commands::Debugging_Value
         // Primitives or optimized value types.
         //
 
-#if !defined(BIG_ENDIAN)
+#if !defined(NETMF_TARGET_BIG_ENDIAN)
         memcpy( dst->m_builtinValue, (void*)&ptr->NumericByRefConst().u1, 8 );
 #else
         {

CLR/Include/TinyCLR_Messaging.h

@@ -175,7 +175,7 @@ struct CLR_Messaging
     static bool Messaging_Send__Reply         ( WP_Message* msg, void* owner );
     static bool Messaging_Reply               ( WP_Message* msg, void* owner );
     static bool Messaging_Reply__Reply        ( WP_Message* msg, void* owner );
-#if defined(BIG_ENDIAN)
+#if defined(NETMF_TARGET_BIG_ENDIAN)
 public:     
     static void    SwapDebuggingValue ( UINT8* &msg, UINT32 size                          );
     static void    SwapEndian         ( WP_Message* msg, void* ptr, int size, bool fReply );