Skip to content

Commit bd10161

Browse files
josesimoesjosesimoes
committed
Fix struct elements name
1 parent 8902aad commit bd10161

File tree

20 files changed

+39
-39
lines changed

20 files changed

+39
-39
lines changed

‎src/CLR/CorLib/corlib_native_System_AppDomain.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ HRESULT Library_corlib_native_System_AppDomain::
8383

8484
index.Set(assembly->m_index);
8585

86-
NANOCLR_CHECK_HRESULT(g_CLR_RT_ExecutionEngine.NewObjectFromIndex(top, g_CLR_RT_WellKnownTypes.m_Assembly));
86+
NANOCLR_CHECK_HRESULT(g_CLR_RT_ExecutionEngine.NewObjectFromIndex(top, g_CLR_RT_WellKnownTypes.Assembly));
8787

8888
hbObj = top.Dereference();
8989
hbObj->SetReflection(index);
@@ -226,7 +226,7 @@ HRESULT Library_corlib_native_System_AppDomain::GetAppDomain(
226226
}
227227

228228
_ASSERTE(obj->DataType() == DATATYPE_CLASS);
229-
_ASSERTE(obj->ObjectCls().m_data == g_CLR_RT_WellKnownTypes.m_AppDomain.m_data);
229+
_ASSERTE(obj->ObjectCls().m_data == g_CLR_RT_WellKnownTypes.AppDomain.m_data);
230230

231231
src = CLR_RT_ObjectToEvent_Source::ExtractInstance(obj[FIELD___appDomain]);
232232
FAULT_ON_NULL(src);

‎src/CLR/CorLib/corlib_native_System_Exception.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ HRESULT Library_corlib_native_System_Exception::SetStackTrace(CLR_RT_HeapBlock &
254254

255255
// create an empty array for the stack trace
256256
NANOCLR_CHECK_HRESULT(
257-
CLR_RT_HeapBlock_Array::CreateInstance(obj[FIELD___stackTrace], depth, g_CLR_RT_WellKnownTypes.m_UInt8));
257+
CLR_RT_HeapBlock_Array::CreateInstance(obj[FIELD___stackTrace], depth, g_CLR_RT_WellKnownTypes.UInt8));
258258

259259
#endif
260260
}

‎src/CLR/Core/CLR_RT_StackFrame.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ HRESULT CLR_RT_StackFrame::PopAppDomainTransition()
457457
_ASSERTE(m_owningThread->m_currentException.Dereference() != nullptr);
458458
_ASSERTE(
459459
m_owningThread->m_currentException.Dereference()->ObjectCls().m_data ==
460-
g_CLR_RT_WellKnownTypes.m_ThreadAbortException.m_data);
460+
g_CLR_RT_WellKnownTypes.ThreadAbortException.m_data);
461461
_ASSERTE(!m_appDomain->IsLoaded());
462462

463463
m_owningThread->m_flags &= ~(CLR_RT_Thread::TH_F_Aborted | CLR_RT_Thread::TH_F_ContainsDoomedAppDomain);

‎src/CLR/Core/TypeSystem.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,9 +1035,9 @@ bool CLR_RT_TypeDef_Instance::ResolveToken(
10351035
// }
10361036
// else
10371037
//{
1038-
// m_data = g_CLR_RT_WellKnownTypes.m_Object.m_data;
1039-
// m_assm = g_CLR_RT_TypeSystem.m_assemblies[g_CLR_RT_WellKnownTypes.m_Object.Assembly() - 1];
1040-
// m_target = m_assm->GetTypeDef(g_CLR_RT_WellKnownTypes.m_Object.Type());
1038+
// m_data = g_CLR_RT_WellKnownTypes.Object.m_data;
1039+
// m_assm = g_CLR_RT_TypeSystem.m_assemblies[g_CLR_RT_WellKnownTypes.Object.Assembly() - 1];
1040+
// m_target = m_assm->GetTypeDef(g_CLR_RT_WellKnownTypes.Object.Type());
10411041
// }
10421042

10431043
#if defined(NANOCLR_INSTANCE_NAMES)
@@ -3250,7 +3250,7 @@ void CLR_RT_Assembly::ResolveLink()
32503250
}
32513251

32523252
#if defined(NANOCLR_APPDOMAINS)
3253-
if (inst.m_data == g_CLR_RT_WellKnownTypes.m_MarshalByRefObject.m_data)
3253+
if (inst.m_data == g_CLR_RT_WellKnownTypes.MarshalByRefObject.m_data)
32543254
{
32553255
dst->m_flags |= CLR_RT_TypeDef_CrossReference::TD_CR_IsMarshalByRefObject;
32563256
}
@@ -3473,7 +3473,7 @@ HRESULT CLR_RT_AppDomain::LoadAssembly(CLR_RT_Assembly *assm)
34733473
CLR_RT_HeapBlock exception;
34743474

34753475
NANOCLR_CHECK_HRESULT(
3476-
g_CLR_RT_ExecutionEngine.NewObjectFromIndex(exception, g_CLR_RT_WellKnownTypes.m_OutOfMemoryException));
3476+
g_CLR_RT_ExecutionEngine.NewObjectFromIndex(exception, g_CLR_RT_WellKnownTypes.OutOfMemoryException));
34773477

34783478
m_outOfMemoryException = exception.Dereference();
34793479
}
@@ -3509,7 +3509,7 @@ HRESULT CLR_RT_AppDomain::GetManagedObject(CLR_RT_HeapBlock &res)
35093509

35103510
_ASSERTE(FIMPLIES(obj, obj->DataType() == DATATYPE_CLASS || obj->DataType() == DATATYPE_VALUETYPE));
35113511

3512-
if (obj && obj->ObjectCls().m_data == g_CLR_RT_WellKnownTypes.m_AppDomain.m_data)
3512+
if (obj && obj->ObjectCls().m_data == g_CLR_RT_WellKnownTypes.AppDomain.m_data)
35133513
{
35143514
// managed appDomain is found. Use it.
35153515
res.SetObjectReference(ref->m_objectPtr);
@@ -3524,7 +3524,7 @@ HRESULT CLR_RT_AppDomain::GetManagedObject(CLR_RT_HeapBlock &res)
35243524
CLR_RT_HeapBlock *pRes;
35253525
CLR_RT_ProtectFromGC gc(res);
35263526

3527-
NANOCLR_CHECK_HRESULT(g_CLR_RT_ExecutionEngine.NewObjectFromIndex(res, g_CLR_RT_WellKnownTypes.m_AppDomain));
3527+
NANOCLR_CHECK_HRESULT(g_CLR_RT_ExecutionEngine.NewObjectFromIndex(res, g_CLR_RT_WellKnownTypes.AppDomain));
35283528

35293529
pRes = res.Dereference();
35303530

@@ -3600,7 +3600,7 @@ HRESULT CLR_RT_AppDomain::MarshalObject(CLR_RT_HeapBlock &src, CLR_RT_HeapBlock
36003600
CLR_RT_HeapBlock *proxySrc = nullptr;
36013601
CLR_RT_HeapBlock *mbroSrc = nullptr;
36023602
bool fSimpleAssign = false;
3603-
CLR_RT_TypeDef_Index indexVerify = g_CLR_RT_WellKnownTypes.m_Object;
3603+
CLR_RT_TypeDef_Index indexVerify = g_CLR_RT_WellKnownTypes.Object;
36043604
NanoCLRDataType dtSrc = src.DataType();
36053605
CLR_RT_AppDomain *appDomainSav = g_CLR_RT_ExecutionEngine.GetCurrentAppDomain();
36063606

@@ -3831,7 +3831,7 @@ HRESULT CLR_RT_AppDomain::GetAssemblies(CLR_RT_HeapBlock &ref)
38313831
index.Set(pASSM->m_index);
38323832

38333833
NANOCLR_CHECK_HRESULT(
3834-
g_CLR_RT_ExecutionEngine.NewObjectFromIndex(*pArray, g_CLR_RT_WellKnownTypes.m_Assembly));
3834+
g_CLR_RT_ExecutionEngine.NewObjectFromIndex(*pArray, g_CLR_RT_WellKnownTypes.Assembly));
38353835
hbObj = pArray->Dereference();
38363836

38373837
hbObj->SetReflection(index);
@@ -3844,7 +3844,7 @@ HRESULT CLR_RT_AppDomain::GetAssemblies(CLR_RT_HeapBlock &ref)
38443844
if (pass == 0)
38453845
{
38463846
NANOCLR_CHECK_HRESULT(
3847-
CLR_RT_HeapBlock_Array::CreateInstance(ref, count, g_CLR_RT_WellKnownTypes.m_Assembly));
3847+
CLR_RT_HeapBlock_Array::CreateInstance(ref, count, g_CLR_RT_WellKnownTypes.Assembly));
38483848

38493849
pArray = (CLR_RT_HeapBlock *)ref.DereferenceArray()->GetFirstElement();
38503850
}

‎src/DeviceInterfaces/System.Net/sys_net_native_System_Net_NetworkInformation_NetworkInterface.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ HRESULT Library_sys_net_native_System_Net_NetworkInformation_NetworkInterface::
334334

335335
// Return array of uint16[8]
336336
NANOCLR_CHECK_HRESULT(
337-
CLR_RT_HeapBlock_Array::CreateInstance(stack.PushValueAndClear(), 8, g_CLR_RT_WellKnownTypes.m_UInt16));
337+
CLR_RT_HeapBlock_Array::CreateInstance(stack.PushValueAndClear(), 8, g_CLR_RT_WellKnownTypes.UInt16));
338338
{
339339
uint16_t *p = (uint16_t *)stack.TopValue().DereferenceArray()->GetFirstElement();
340340
memcpy(p, address, sizeof(address));

‎src/DeviceInterfaces/System.Net/sys_net_native_System_Net_Sockets_NativeSocket.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ HRESULT Library_sys_net_native_System_Net_Sockets_NativeSocket::MarshalSockAddre
586586
ipAddressHbObj[Library_sys_net_native_System_Net_IPAddress::FIELD___numbers];
587587

588588
NANOCLR_CHECK_HRESULT(
589-
CLR_RT_HeapBlock_Array::CreateInstance(numbersFieldRef, 8, g_CLR_RT_WellKnownTypes.m_UInt16));
589+
CLR_RT_HeapBlock_Array::CreateInstance(numbersFieldRef, 8, g_CLR_RT_WellKnownTypes.UInt16));
590590

591591
CLR_UINT16 *addrNumbers = (CLR_UINT16 *)numbersFieldRef.DereferenceArray()->GetFirstElement();
592592

‎targets/AzureRTOS/ST/_nanoCLR/System.Device.I2c/sys_dev_i2c_native_System_Device_I2c_I2cDevice.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ HRESULT Library_sys_dev_i2c_native_System_Device_I2c_I2cDevice::
672672
// managed stack
673673
CLR_RT_HeapBlock &top = stack.PushValueAndClear();
674674
NANOCLR_CHECK_HRESULT(
675-
g_CLR_RT_ExecutionEngine.NewObjectFromIndex(top, g_CLR_RT_WellKnownTypes.m_I2cTransferResult));
675+
g_CLR_RT_ExecutionEngine.NewObjectFromIndex(top, g_CLR_RT_WellKnownTypes.I2cTransferResult));
676676
result = top.Dereference();
677677
FAULT_ON_NULL(result);
678678

‎targets/AzureRTOS/ST/_nanoCLR/System.Device.Wifi/sys_dev_wifi_native_System_Device_Wifi_WifiAdapter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ HRESULT Library_sys_dev_wifi_native_System_Device_Wifi_WifiAdapter::GetNativeSca
273273
// rlen = StoreApRecordsToString(0, ap_records, number);
274274
// }
275275

276-
// NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance(top, rlen, g_CLR_RT_WellKnownTypes.m_UInt8));
276+
// NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance(top, rlen, g_CLR_RT_WellKnownTypes.UInt8));
277277
// array = top.DereferenceArray();
278278
// buf = array->GetFirstElement();
279279

@@ -331,7 +331,7 @@ HRESULT Library_sys_dev_wifi_native_System_Device_Wifi_WifiAdapter::NativeFindWi
331331
}
332332

333333
// build array with indexes of Wireless interfaces
334-
NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance(top, interfaceCount, g_CLR_RT_WellKnownTypes.m_UInt8));
334+
NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance(top, interfaceCount, g_CLR_RT_WellKnownTypes.UInt8));
335335
array = top.DereferenceArray();
336336
arrayOfIndexes = array->GetFirstElement();
337337

‎targets/AzureRTOS/SiliconLabs/_nanoCLR/System.Device.I2c/sys_dev_i2c_native_System_Device_I2c_I2cDevice.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ HRESULT Library_sys_dev_i2c_native_System_Device_I2c_I2cDevice::
673673
// managed stack
674674
CLR_RT_HeapBlock &top = stack.PushValueAndClear();
675675
NANOCLR_CHECK_HRESULT(
676-
g_CLR_RT_ExecutionEngine.NewObjectFromIndex(top, g_CLR_RT_WellKnownTypes.m_I2cTransferResult));
676+
g_CLR_RT_ExecutionEngine.NewObjectFromIndex(top, g_CLR_RT_WellKnownTypes.I2cTransferResult));
677677
result = top.Dereference();
678678
FAULT_ON_NULL(result);
679679

‎targets/AzureRTOS/SiliconLabs/_nanoCLR/nanoFramework.GiantGecko.Adc/nano_gg_adc_native_nanoFramework_GiantGecko_Adc_AdcController.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ HRESULT Library_nano_gg_adc_native_nanoFramework_GiantGecko_Adc_AdcController::
421421
NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance(
422422
stack.PushValueAndClear(),
423423
ContinuousScanOperation->channelCount,
424-
g_CLR_RT_WellKnownTypes.m_Int32));
424+
g_CLR_RT_WellKnownTypes.Int32));
425425

426426
sampleArray = stack.TopValue().DereferenceArray();
427427

0 commit comments

Comments
 (0)