Skip to content

Commit 4ee3626

Browse files
josesimoesjosesimoes
committed
Replace BIG_ENDIAN with NETMF_TARGET_BIG_ENDIAN and LITTLE_ENDIAN with NETMF_TARGET_LITTLE_ENDIAN
Fixes NETMF#481
1 parent 513f5ae commit 4ee3626

34 files changed

+98
-98
lines changed

‎Application/TinyBooter/Commands.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ bool Loader_Engine::ProcessPayload( WP_Message* msg )
979979
LOADER_ENGINE_SETFLAG( this, c_LoaderEngineFlag_ValidConnection );
980980

981981
//--//
982-
#if defined(BIG_ENDIAN)
982+
#if defined(NETMF_TARGET_BIG_ENDIAN)
983983
SwapEndian( msg, msg->m_payload, msg->m_header.m_size, false );
984984
#endif
985985
size_t num;
@@ -1120,7 +1120,7 @@ bool Loader_Engine::TransmitMessage( const WP_Message* msg, bool fQueue )
11201120
UINT32 payloadSize;
11211121
UINT32 flags;
11221122

1123-
#if !defined(BIG_ENDIAN)
1123+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
11241124
payloadSize = msg->m_header.m_size;
11251125
flags = msg->m_header.m_flags;
11261126
#else
@@ -1178,7 +1178,7 @@ void Loader_Engine::ReplyToCommand( WP_Message* msg, bool fSuccess, bool fCritic
11781178

11791179
msgReply.Initialize( &m_controller );
11801180

1181-
#if defined(BIG_ENDIAN)
1181+
#if defined(NETMF_TARGET_BIG_ENDIAN)
11821182
SwapEndian( msg, ptr, size, true );
11831183
#endif
11841184
msgReply.PrepareReply( msg->m_header, flags, size, (UINT8*)ptr );
@@ -1203,7 +1203,7 @@ bool Loader_Engine::Monitor_Ping( WP_Message* msg )
12031203
CLR_DBG_Commands::Monitor_Ping::Reply cmdReply;
12041204
cmdReply.m_source = CLR_DBG_Commands::Monitor_Ping::c_Ping_Source_TinyBooter;
12051205

1206-
#if defined(BIG_ENDIAN)
1206+
#if defined(NETMF_TARGET_BIG_ENDIAN)
12071207
cmdReply.m_dbg_flags = CLR_DBG_Commands::Monitor_Ping::c_Ping_DbgFlag_BigEndian;
12081208
#endif
12091209

@@ -1587,7 +1587,7 @@ bool Loader_Engine::Monitor_FlashSectorMap( WP_Message* msg )
15871587
return true;
15881588
}
15891589

1590-
#if defined(BIG_ENDIAN)
1590+
#if defined(NETMF_TARGET_BIG_ENDIAN)
15911591

15921592
UINT32 Loader_Engine::SwapEndianPattern( UINT8* &buffer, UINT32 size, UINT32 count )
15931593
{

‎Application/TinyBooter/Commands.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ struct Loader_Engine
147147
bool Monitor_SignatureKeyUpdate( WP_Message* msg );
148148
bool EnumerateAndLaunch ( );
149149

150-
#if defined(BIG_ENDIAN)
150+
#if defined(NETMF_TARGET_BIG_ENDIAN)
151151
public:
152152
void SwapDebuggingValue ( UINT8* &msg, UINT32 size );
153153
void SwapEndian ( WP_Message* msg, void* ptr, int size, bool fReply );

‎CLR/Core/CLR_RT_HeapBlock.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ HRESULT CLR_RT_HeapBlock::LoadFromReference( CLR_RT_HeapBlock& ref )
389389
else if(size == 1) { first = ((CLR_UINT8 *)src)[ 0 ]; }
390390
else { first = ((CLR_UINT16*)src)[ 0 ]; }
391391

392-
#if !defined(BIG_ENDIAN)
392+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
393393
((CLR_UINT32*)&NumericByRef())[ 0 ] = first;
394394
((CLR_UINT32*)&NumericByRef())[ 1 ] = second;
395395
#else
@@ -403,7 +403,7 @@ HRESULT CLR_RT_HeapBlock::LoadFromReference( CLR_RT_HeapBlock& ref )
403403
((CLR_UINT32*)&NumericByRef())[ 0 ] = second;
404404
((CLR_UINT32*)&NumericByRef())[ 1 ] = first;
405405
}
406-
#endif //BIG_ENDIAN
406+
#endif //NETMF_TARGET_BIG_ENDIAN
407407

408408
TINYCLR_SET_AND_LEAVE(S_OK);
409409
}
@@ -531,7 +531,7 @@ HRESULT CLR_RT_HeapBlock::StoreToReference( CLR_RT_HeapBlock& ref, int size )
531531
}
532532
}
533533

534-
#if !defined(BIG_ENDIAN)
534+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
535535
CLR_UINT32 first = ((CLR_UINT32*)&obj->NumericByRef())[ 0 ];
536536
CLR_UINT32 second = ((CLR_UINT32*)&obj->NumericByRef())[ 1 ];
537537
#else
@@ -548,7 +548,7 @@ HRESULT CLR_RT_HeapBlock::StoreToReference( CLR_RT_HeapBlock& ref, int size )
548548
first = ((CLR_UINT32*)&obj->NumericByRef())[ 1 ];
549549
second = ((CLR_UINT32*)&obj->NumericByRef())[ 0 ];
550550
}
551-
#endif //BIG_ENDIAN
551+
#endif //NETMF_TARGET_BIG_ENDIAN
552552

553553
if (sizeArray == 4) { ((CLR_UINT32*)dst)[ 0 ] = (CLR_UINT32)first; }
554554
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ HRESULT CLR_RT_HeapBlock_Array::IndexOf( CLR_RT_HeapBlock_Array* array, CLR_RT_H
206206

207207
while(true)
208208
{
209-
#if !defined(BIG_ENDIAN)
209+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
210210
if(memcmp( data, &matchPtr->NumericByRef(), sizeElem ) == 0)
211211
{
212212
index = pos;

‎CLR/Core/Execution.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3067,7 +3067,7 @@ void CLR_RT_ExecutionEngine::StopOnBreakpoint( CLR_DBG_Commands::Debugging_Execu
30673067

30683068
if(m_breakpointsActiveNum == 1)
30693069
{
3070-
#if defined(BIG_ENDIAN)
3070+
#if defined(NETMF_TARGET_BIG_ENDIAN)
30713071
static CLR_DBG_Commands::Debugging_Execution_BreakpointDef s_breakpoint;
30723072
CLR_UINT8* data;
30733073

‎CLR/Core/Serialization/BinaryFormatter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1635,7 +1635,7 @@ HRESULT CLR_RT_BinaryFormatter::State::AdvanceToTheNextElement()
16351635
{
16361636
TINYCLR_CHECK_HRESULT(m_parent->ReadBits( val, bits ));
16371637

1638-
#if !defined(BIG_ENDIAN)
1638+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
16391639
memcpy( ptr, &val, size );
16401640
#else
16411641
memcpy( ptr, ((unsigned char*)&val)+(sizeof(val)-size), size );

‎CLR/Core/Streams.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ HRESULT CLR_RT_HeapBlock_MemoryStream::ReadBits( CLR_UINT64& res, CLR_UINT32 bit
165165

166166
CLR_UINT32* ptr = (CLR_UINT32*)&res;
167167

168-
#if !defined(BIG_ENDIAN)
168+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
169169
if(bits > 32) { TINYCLR_CHECK_HRESULT(ReadBits( ptr[ 1 ], bits - 32 )); bits = 32; }
170170
else { ptr[ 1 ] = 0; }
171171

‎CLR/Core/TypeSystem.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1342,7 +1342,7 @@ bool CLR_RECORD_ASSEMBLY::GoodHeader() const
13421342
NATIVE_PROFILE_CLR_CORE();
13431343
CLR_RECORD_ASSEMBLY header = *this; header.headerCRC = 0;
13441344

1345-
#if !defined(BIG_ENDIAN)
1345+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
13461346
if ( (header.flags & CLR_RECORD_ASSEMBLY::c_Flags_BigEndian) == CLR_RECORD_ASSEMBLY::c_Flags_BigEndian)
13471347
#else
13481348
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 )
44304430
CLR_UINT32 size = (dtl.m_sizeInBits + 7) / 8;
44314431

44324432
// 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?
4433-
#if !defined(BIG_ENDIAN)
4433+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
44344434
memcpy( &m_lastValue.m_value.NumericByRef(), m_blob, size ); m_blob += size;
44354435
#else
44364436
switch(size)

‎CLR/Debugger/Debugger.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ bool CLR_DBG_Debugger::Monitor_Ping( WP_Message* msg, void* owner )
370370

371371
cmdReply.m_source = CLR_DBG_Commands::Monitor_Ping::c_Ping_Source_TinyCLR;
372372

373-
#if !defined(BIG_ENDIAN)
373+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
374374
cmdReply.m_dbg_flags = CLR_EE_DBG_IS(State_ProgramExited) != 0 ? CLR_DBG_Commands::Monitor_Ping::c_Ping_DbgFlag_AppExit : 0;
375375
#else
376376
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
14321432
// Primitives or optimized value types.
14331433
//
14341434

1435-
#if !defined(BIG_ENDIAN)
1435+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
14361436
memcpy( dst->m_builtinValue, (void*)&ptr->NumericByRefConst().u1, 8 );
14371437
#else
14381438
{

‎CLR/Include/TinyCLR_Messaging.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ struct CLR_Messaging
175175
static bool Messaging_Send__Reply ( WP_Message* msg, void* owner );
176176
static bool Messaging_Reply ( WP_Message* msg, void* owner );
177177
static bool Messaging_Reply__Reply ( WP_Message* msg, void* owner );
178-
#if defined(BIG_ENDIAN)
178+
#if defined(NETMF_TARGET_BIG_ENDIAN)
179179
public:
180180
static void SwapDebuggingValue ( UINT8* &msg, UINT32 size );
181181
static void SwapEndian ( WP_Message* msg, void* ptr, int size, bool fReply );

‎CLR/Include/TinyCLR_PlatformDef.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <CLR_Defines.h>
99

1010
#ifdef _WIN32
11-
#define LITTLE_ENDIAN
11+
#define NETMF_TARGET_LITTLE_ENDIAN
1212
#endif
1313

1414
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -32,7 +32,7 @@
3232
#endif
3333

3434
#if !defined(PLATFORM_WINDOWS_EMULATOR) && !defined(PLATFORM_WINCE)
35-
#if !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN)
35+
#if !defined(NETMF_TARGET_LITTLE_ENDIAN) && !defined(NETMF_TARGET_BIG_ENDIAN)
3636
#error ENDIANNESS NOT DEFINED
3737
#endif
3838
#endif

‎CLR/Include/TinyCLR_Runtime__HeapBlock.h

+15-15
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#endif
1212

1313
////////////////////////////////////////////////////////////////////////////////////////////////////
14-
#if !defined(BIG_ENDIAN)
14+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
1515

1616
#define CLR_RT_HEAPBLOCK_RAW_ID( dataType, flags, size ) ( (dataType & 0x000000FF) | ((flags & 0x000000FF) << 8) | ((size & 0x0000FFFF) << 16))
1717
#define CLR_RT_HEAPBLOCK_ASSIGN_INTEGER32_SIGNED( dataType, num ) { m_id.raw = CLR_RT_HEAPBLOCK_RAW_ID( dataType, 0, 1 ); m_data.numeric.s4 = (CLR_INT32)num; }
@@ -23,7 +23,7 @@
2323
#define CLR_RT_HEAPBLOCK_ASSIGN_FLOAT32(dataType,num) { m_id.raw = CLR_RT_HEAPBLOCK_RAW_ID( dataType, 0, 1 ); m_data.numeric.r4 = num; }
2424
#define CLR_RT_HEAPBLOCK_ASSIGN_FLOAT64(dataType,num) { m_id.raw = CLR_RT_HEAPBLOCK_RAW_ID( dataType, 0, 1 ); m_data.numeric.r8 = num; }
2525

26-
#else // BIG_ENDIAN
26+
#else // NETMF_TARGET_BIG_ENDIAN
2727

2828
#define CLR_RT_HEAPBLOCK_RAW_ID( dataType, flags, size ) ( (size & 0x0000FFFF) | ((flags & 0x000000FF) << 16) | ((dataType & 0x000000FF) << 24))
2929
#define CLR_RT_HEAPBLOCK_ASSIGN_INTEGER32_SIGNED( dataType, num ) { m_id.raw = CLR_RT_HEAPBLOCK_RAW_ID( dataType, 0, 1 ); m_data.numeric.padS4 = 0; m_data.numeric.s4 = (CLR_INT32)num; }
@@ -35,7 +35,7 @@
3535
#define CLR_RT_HEAPBLOCK_ASSIGN_FLOAT32( dataType, num ) { m_id.raw = CLR_RT_HEAPBLOCK_RAW_ID( dataType, 0, 1 ); m_data.numeric.padR4 = 0; m_data.numeric.r4 = num; }
3636
#define CLR_RT_HEAPBLOCK_ASSIGN_FLOAT64( dataType, num ) { m_id.raw = CLR_RT_HEAPBLOCK_RAW_ID( dataType, 0, 1 ); m_data.numeric.r8 = num; }
3737

38-
#endif // BIG_ENDIAN
38+
#endif // NETMF_TARGET_BIG_ENDIAN
3939

4040
////////////////////////////////////////////////////////////
4141

@@ -147,7 +147,7 @@ struct CLR_RT_HeapBlock
147147

148148
union Numeric
149149
{
150-
#if !defined(BIG_ENDIAN)
150+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
151151
CLR_UINT8 u1;
152152
CLR_UINT16 u2;
153153
CLR_UINT32 u4;
@@ -158,7 +158,7 @@ struct CLR_RT_HeapBlock
158158
#endif
159159
struct U8
160160
{
161-
#if !defined(BIG_ENDIAN)
161+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
162162
CLR_UINT32 _L;
163163
CLR_UINT32 _H;
164164
//--//
@@ -293,7 +293,7 @@ struct CLR_RT_HeapBlock
293293

294294
} u8;
295295
//
296-
#if !defined(BIG_ENDIAN)
296+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
297297
CLR_INT8 s1;
298298
CLR_INT16 s2;
299299
CLR_INT32 s4;
@@ -304,7 +304,7 @@ struct CLR_RT_HeapBlock
304304
#endif
305305
struct S8
306306
{
307-
#if !defined(BIG_ENDIAN)
307+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
308308
CLR_UINT32 _L;
309309
CLR_UINT32 _H;
310310
//--//
@@ -445,14 +445,14 @@ struct CLR_RT_HeapBlock
445445

446446
#if !defined(TINYCLR_EMULATED_FLOATINGPOINT)
447447

448-
#if !defined(BIG_ENDIAN)
448+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
449449
float r4;
450450
#else
451451
struct { CLR_UINT32 padR4; float r4; };
452452
#endif
453453
struct R8
454454
{
455-
#if !defined(BIG_ENDIAN)
455+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
456456
CLR_UINT32 _L;
457457
CLR_UINT32 _H;
458458
#else
@@ -464,7 +464,7 @@ struct CLR_RT_HeapBlock
464464
{
465465
double ret_val;
466466

467-
#if !defined(BIG_ENDIAN)
467+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
468468
#if defined(__GNUC__)
469469
///
470470
/// This code fixes an optimization problem with the gcc compiler.
@@ -525,7 +525,7 @@ struct CLR_RT_HeapBlock
525525

526526
R8& operator=( const double num )
527527
{
528-
#if !defined(BIG_ENDIAN)
528+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
529529
#if defined(__GNUC__)
530530
///
531531
/// This code fixes an optimization problem with the gcc compiler.
@@ -649,7 +649,7 @@ struct CLR_RT_HeapBlock
649649
#else
650650
/// not using floating point lib, emulated one
651651

652-
#if defined(BIG_ENDIAN)
652+
#if defined(NETMF_TARGET_BIG_ENDIAN)
653653
CLR_UINT32 padR4;
654654
#endif
655655

@@ -705,7 +705,7 @@ struct CLR_RT_HeapBlock
705705

706706
struct R8
707707
{
708-
#if !defined(BIG_ENDIAN)
708+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
709709
CLR_UINT32 _L;
710710
CLR_UINT32 _H;
711711
//--//
@@ -833,7 +833,7 @@ struct CLR_RT_HeapBlock
833833
// MemLE: DDCCBBAA
834834
// So for LE DD,Addr 00 is the low byte.
835835
// For BE it is certainly not true, hence this check will not work. Will Interop? FIXME GJS - verify interop
836-
#if !defined(BIG_ENDIAN)
836+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
837837
CT_ASSERT_UNIQUE_NAME( offsetof( Numeric, s1 ) == 0, s1 )
838838
CT_ASSERT_UNIQUE_NAME( offsetof( Numeric, s2 ) == 0, s2 )
839839
CT_ASSERT_UNIQUE_NAME( offsetof( Numeric, s4 ) == 0, s4 )
@@ -1078,7 +1078,7 @@ struct CLR_RT_HeapBlock
10781078
}
10791079

10801080
//--//
1081-
#if !defined(BIG_ENDIAN)
1081+
#if !defined(NETMF_TARGET_BIG_ENDIAN)
10821082
const CLR_RT_HeapBlock_AtomicData& DataByRefConst() const { return m_data; }
10831083
#else
10841084
const CLR_RT_HeapBlock_AtomicData& DataByRefConst() const

0 commit comments

Comments
 (0)