From 30efa5882bd5e491a88c230179a0aaa080b36a8a Mon Sep 17 00:00:00 2001 From: disinvite Date: Thu, 5 Sep 2024 11:47:38 -0400 Subject: [PATCH] Beta addrs --- LEGO1/omni/include/mxbitset.h | 72 +++++++++++++++++++ LEGO1/omni/include/mxmemorypool.h | 38 ++++++++++ LEGO1/omni/include/mxnotificationparam.h | 9 +++ LEGO1/omni/include/mxparam.h | 6 ++ LEGO1/omni/include/mxstreamer.h | 38 ++++++++-- .../omni/src/notify/mxnotificationmanager.cpp | 1 + 6 files changed, 159 insertions(+), 5 deletions(-) diff --git a/LEGO1/omni/include/mxbitset.h b/LEGO1/omni/include/mxbitset.h index 415470d8..21677b5a 100644 --- a/LEGO1/omni/include/mxbitset.h +++ b/LEGO1/omni/include/mxbitset.h @@ -92,4 +92,76 @@ class MxBitset { MxU32 m_blocks[e_blocksRequired + 1]; // 0x00 }; +// TEMPLATE: BETA10 0x10146600 +// MxBitset<2>::MxBitset<2> + +// TEMPLATE: BETA10 0x101464e0 +// MxBitset<22>::MxBitset<22> + +// TEMPLATE: BETA10 0x10146510 +// MxBitset<22>::Tidy + +// TEMPLATE: BETA10 0x10146570 +// MxBitset<22>::Trim + +// TEMPLATE: BETA10 0x10146630 +// MxBitset<2>::Tidy + +// TEMPLATE: BETA10 0x10146690 +// MxBitset<2>::Trim + +// TEMPLATE: BETA10 0x10146880 +// MxBitset<22>::Size + +// TEMPLATE: BETA10 0x101469d0 +// MxBitset<2>::Size + +// TEMPLATE: BETA10 0x101587a0 +// MxBitset<22>::Reference::Flip + +// TEMPLATE: BETA10 0x101587d0 +// MxBitset<22>::Reference::operator int + +// TEMPLATE: BETA10 0x10158800 +// MxBitset<22>::operator[] + +// TEMPLATE: BETA10 0x10158830 +// MxBitset<22>::Reference::Reference + +// TEMPLATE: BETA10 0x10158860 +// MxBitset<22>::Flip + +// STUB: BETA10 0x101588b0 +// MxBitset<22>::Count + +// TEMPLATE: BETA10 0x10158930 +// MxBitset<22>::Test + +// TEMPLATE: BETA10 0x10158990 +// MxBitset<22>::Xran + +// TEMPLATE: BETA10 0x10158b70 +// MxBitset<2>::Reference::Flip + +// TEMPLATE: BETA10 0x10158ba0 +// MxBitset<2>::Reference::operator int + +// TEMPLATE: BETA10 0x10158bd0 +// MxBitset<2>::operator[] + +// TEMPLATE: BETA10 0x10158c00 +// MxBitset<2>::Reference::Reference + +// TEMPLATE: BETA10 0x10158c30 +// MxBitset<2>::Flip + +// STUB: BETA10 0x10158c80 +// MxBitset<2>::Count + +// TEMPLATE: BETA10 0x10158d00 +// MxBitset<2>::Test + +// TEMPLATE: BETA10 0x10158d60 +// MxBitset<2>::Xran + #endif // MXBITSET_H diff --git a/LEGO1/omni/include/mxmemorypool.h b/LEGO1/omni/include/mxmemorypool.h index cbd1ca40..f794108f 100644 --- a/LEGO1/omni/include/mxmemorypool.h +++ b/LEGO1/omni/include/mxmemorypool.h @@ -78,4 +78,42 @@ void MxMemoryPool::Release(MxU8* p_buf) MxTrace("Release> %d pool: busy %d blocks\n", m_blockSize, m_blockRef.Count()); } +// TEMPLATE: BETA10 0x101464a0 +// MxMemoryPool<64,22>::MxMemoryPool<64,22> + +// TEMPLATE: LEGO1 0x100b9100 +// TEMPLATE: BETA10 0x10146590 +// MxMemoryPool<64,22>::~MxMemoryPool<64,22> + +// TEMPLATE: BETA10 0x101465c0 +// MxMemoryPool<128,2>::MxMemoryPool<128,2> + +// TEMPLATE: LEGO1 0x100b9110 +// TEMPLATE: BETA10 0x101466b0 +// MxMemoryPool<128,2>::~MxMemoryPool<128,2> + +// TEMPLATE: BETA10 0x10146780 +// MxMemoryPool<64,22>::Allocate + +// TEMPLATE: BETA10 0x101468a0 +// MxMemoryPool<64,22>::GetPoolSize + +// TEMPLATE: BETA10 0x101468d0 +// MxMemoryPool<128,2>::Allocate + +// TEMPLATE: BETA10 0x101469f0 +// MxMemoryPool<128,2>::GetPoolSize + +// TEMPLATE: BETA10 0x10158610 +// MxMemoryPool<64,22>::Release + +// TEMPLATE: BETA10 0x101589e0 +// MxMemoryPool<128,2>::Release + +// TEMPLATE: BETA10 0x10158e50 +// MxMemoryPool<64,22>::Get + +// TEMPLATE: BETA10 0x10158f90 +// MxMemoryPool<128,2>::Get + #endif // MXMEMORYPOOL_H diff --git a/LEGO1/omni/include/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h index 16b2e236..bf1d589b 100644 --- a/LEGO1/omni/include/mxnotificationparam.h +++ b/LEGO1/omni/include/mxnotificationparam.h @@ -35,16 +35,23 @@ enum NotificationId { }; // VTABLE: LEGO1 0x100d56e0 +// VTABLE: BETA10 0x101b86a8 // SIZE 0x0c class MxNotificationParam : public MxParam { public: MxNotificationParam() : m_type(c_notificationType0), m_sender(NULL) {} + + // FUNCTION: BETA10 0x10013490 MxNotificationParam(NotificationId p_type, MxCore* p_sender) : MxParam(), m_type(p_type), m_sender(p_sender) {} // FUNCTION: LEGO1 0x10010390 + // FUNCTION: BETA10 0x100135f0 virtual MxNotificationParam* Clone() const { return new MxNotificationParam(m_type, m_sender); } // vtable+0x04 + // FUNCTION: BETA10 0x100135c0 NotificationId GetNotification() const { return m_type; } + + // FUNCTION: BETA10 0x1003c960 MxCore* GetSender() const { return m_sender; } void SetNotification(NotificationId p_type) { m_type = p_type; } @@ -56,9 +63,11 @@ class MxNotificationParam : public MxParam { }; // SYNTHETIC: LEGO1 0x10010430 +// SYNTHETIC: BETA10 0x100136c0 // MxNotificationParam::`scalar deleting destructor' // SYNTHETIC: LEGO1 0x100104a0 +// SYNTHETIC: BETA10 0x10013740 // MxNotificationParam::~MxNotificationParam #endif // MXNOTIFICATIONPARAM_H diff --git a/LEGO1/omni/include/mxparam.h b/LEGO1/omni/include/mxparam.h index a266b12b..57df088e 100644 --- a/LEGO1/omni/include/mxparam.h +++ b/LEGO1/omni/include/mxparam.h @@ -3,16 +3,22 @@ // VTABLE: ISLE 0x40f018 // VTABLE: LEGO1 0x100d56e8 +// VTABLE: BETA10 0x101b86b4 // SIZE 0x04 class MxParam { public: // FUNCTION: ISLE 0x401530 // FUNCTION: LEGO1 0x10010360 + // FUNCTION: BETA10 0x10013540 virtual ~MxParam() {} }; +// SYNTHETIC: BETA10 0x10013710 +// MxParam::MxParam + // SYNTHETIC: ISLE 0x401540 // SYNTHETIC: LEGO1 0x10010370 +// SYNTHETIC: BETA10 0x10013570 // MxParam::`scalar deleting destructor' #endif // MXPARAM_H diff --git a/LEGO1/omni/include/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h index a11decba..14e8632f 100644 --- a/LEGO1/omni/include/mxstreamer.h +++ b/LEGO1/omni/include/mxstreamer.h @@ -17,9 +17,11 @@ typedef MxMemoryPool<64, 22> MxMemoryPool64; typedef MxMemoryPool<128, 2> MxMemoryPool128; // VTABLE: LEGO1 0x100dc760 +// VTABLE: BETA10 0x101c23c8 // SIZE 0x10 class MxStreamerNotification : public MxNotificationParam { public: + // FUNCTION: BETA10 0x10146e40 MxStreamerNotification(NotificationId p_type, MxCore* p_sender, MxStreamController* p_ctrlr) : MxNotificationParam(p_type, p_sender) { @@ -28,6 +30,7 @@ class MxStreamerNotification : public MxNotificationParam { MxNotificationParam* Clone() const override; + // FUNCTION: BETA10 0x10147190 MxStreamController* GetController() { return m_controller; } private: @@ -53,6 +56,7 @@ class MxStreamer : public MxCore { MxLong Notify(MxParam& p_param) override; // vtable+0x04 // FUNCTION: LEGO1 0x100b9000 + // FUNCTION: BETA10 0x10145ee0 const char* ClassName() const override // vtable+0x0c { // STRING: LEGO1 0x1010210c @@ -60,6 +64,7 @@ class MxStreamer : public MxCore { } // FUNCTION: LEGO1 0x100b9010 + // FUNCTION: BETA10 0x10145f00 MxBool IsA(const char* p_name) const override // vtable+0x10 { return !strcmp(p_name, MxStreamer::ClassName()) || MxCore::IsA(p_name); @@ -74,6 +79,7 @@ class MxStreamer : public MxCore { MxResult FUN_100b99b0(MxDSAction* p_action); MxResult DeleteObject(MxDSAction* p_dsAction); + // FUNCTION: BETA10 0x10158db0 MxU8* GetMemoryBlock(MxU32 p_blockSize) { switch (p_blockSize) { @@ -91,6 +97,7 @@ class MxStreamer : public MxCore { return NULL; } + // FUNCTION: BETA10 0x10158570 void ReleaseMemoryBlock(MxU8* p_block, MxU32 p_blockSize) { switch (p_blockSize) { @@ -116,26 +123,47 @@ class MxStreamer : public MxCore { // clang-format off // TEMPLATE: LEGO1 0x100b9090 -// TEMPLATE: BETA10 0x10146720 +// TEMPLATE: BETA10 0x10146020 // list >::~list > // clang-format on -// TEMPLATE: LEGO1 0x100b9100 -// MxMemoryPool<64,22>::~MxMemoryPool<64,22> +// TEMPLATE: BETA10 0x10146090 +// list >::begin -// TEMPLATE: LEGO1 0x100b9110 -// MxMemoryPool<128,2>::~MxMemoryPool<128,2> +// TEMPLATE: BETA10 0x10146120 +// list >::end + +// TEMPLATE: BETA10 0x101461b0 +// list >::iterator::operator++ // SYNTHETIC: LEGO1 0x100b9120 +// SYNTHETIC: BETA10 0x101466e0 // MxStreamer::`scalar deleting destructor' // TEMPLATE: LEGO1 0x100b9140 +// TEMPLATE: BETA10 0x10146720 // List::~List +// TEMPLATE: BETA10 0x10146ab0 +// list >::iterator::operator* + // SYNTHETIC: LEGO1 0x100b97b0 +// SYNTHETIC: BETA10 0x10146f80 // MxStreamerNotification::`scalar deleting destructor' // SYNTHETIC: LEGO1 0x100b9820 +// SYNTHETIC: BETA10 0x10146fc0 // MxStreamerNotification::~MxStreamerNotification +// TEMPLATE: BETA10 0x10147020 +// list >::iterator::operator== + +// TEMPLATE: BETA10 0x10147200 +// ??9@YAHABViterator@?$list@PAVMxStreamController@@V?$allocator@PAVMxStreamController@@@@@@0@Z + +// clang-format off +// TEMPLATE: BETA10 0x10147230 +// ?find@@YA?AViterator@?$list@PAVMxStreamController@@V?$allocator@PAVMxStreamController@@@@@@V12@0ABQAVMxStreamController@@@Z +// clang-format on + #endif // MXSTREAMER_H diff --git a/LEGO1/omni/src/notify/mxnotificationmanager.cpp b/LEGO1/omni/src/notify/mxnotificationmanager.cpp index 58c97e38..dec49818 100644 --- a/LEGO1/omni/src/notify/mxnotificationmanager.cpp +++ b/LEGO1/omni/src/notify/mxnotificationmanager.cpp @@ -63,6 +63,7 @@ MxResult MxNotificationManager::Create(MxU32 p_frequencyMS, MxBool p_createThrea } // FUNCTION: LEGO1 0x100ac6c0 +// FUNCTION: BETA10 0x10125b57 MxResult MxNotificationManager::Send(MxCore* p_listener, const MxNotificationParam& p_param) { AUTOLOCK(m_lock);