mirror of https://github.com/RPCS3/rpcs3.git
Merge branch 'master' of https://github.com/DHrpcs3/rpcs3
Conflicts: rpcs3/rpcs3.vcxproj.filters Conflicts fixed
This commit is contained in:
Nekotekina
commit
62df7eb499
18
README.md
18
README.md
|
|
@ -5,17 +5,25 @@ An open-source PlayStation 3 emulator/debugger written in C++.
|
||||||
|
|
||||||
You can find some basic information in the [FAQ](https://github.com/DHrpcs3/rpcs3/wiki/FAQ). For discussion about this emulator and PS3 emulation please visit the [official forums](http://www.emunewz.net/forum/forumdisplay.php?fid=162).
|
You can find some basic information in the [FAQ](https://github.com/DHrpcs3/rpcs3/wiki/FAQ). For discussion about this emulator and PS3 emulation please visit the [official forums](http://www.emunewz.net/forum/forumdisplay.php?fid=162).
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
* [Visual C++ Redistributable Packages for Visual Studio 2013](http://www.microsoft.com/en-us/download/details.aspx?id=40784)
|
|
||||||
* [OpenAL32.dll](http://www.mediafire.com/?nwt3ilty2mo)
|
|
||||||
|
|
||||||
### Development
|
### Development
|
||||||
|
|
||||||
If you want to contribute please take a took at the [Coding Style](https://github.com/DHrpcs3/rpcs3/wiki/Coding-Style), [Roadmap](https://github.com/DHrpcs3/rpcs3/wiki/Roadmap) and [Developer Information](https://github.com/DHrpcs3/rpcs3/wiki/Developer-Information) pages. You should as well contact any of the developers in the forum in order to know about the current situation of the emulator.
|
If you want to contribute please take a took at the [Coding Style](https://github.com/DHrpcs3/rpcs3/wiki/Coding-Style), [Roadmap](https://github.com/DHrpcs3/rpcs3/wiki/Roadmap) and [Developer Information](https://github.com/DHrpcs3/rpcs3/wiki/Developer-Information) pages. You should as well contact any of the developers in the forum in order to know about the current situation of the emulator.
|
||||||
|
|
||||||
|
|
||||||
|
### Dependencies
|
||||||
|
|
||||||
|
__Windows__
|
||||||
|
* [Visual C++ Redistributable Packages for Visual Studio 2013](http://www.microsoft.com/en-us/download/details.aspx?id=40784)
|
||||||
|
* [OpenAL32.dll](http://www.mediafire.com/?nwt3ilty2mo)
|
||||||
|
|
||||||
|
__Linux__
|
||||||
|
* Debian & Ubuntu: `sudo apt-get install libopenal-dev libwxgtk3.0-dev build-essential`
|
||||||
|
|
||||||
|
|
||||||
### Building
|
### Building
|
||||||
|
|
||||||
To initialize the repository don't forget to execute `git submodule update --init` to pull the wxWidgets source.
|
To initialize the repository don't forget to execute `git submodule update --init` to pull the wxWidgets source.
|
||||||
* __Windows__: Install *Visual Studio 2013*. Then open the *.SLN* file, and press *Build* > *Rebuild Solution*.
|
* __Windows__: Install *Visual Studio 2013*. Then open the *.SLN* file, and press *Build* > *Rebuild Solution*.
|
||||||
* __Linux__: *TODO*
|
* __Linux__:
|
||||||
|
`cd rpcs3 && cmake CMakeLists.txt && make && cd ../` Then run with `cd bin && ./rpcs3`
|
||||||
|
|
|
||||||
|
|
@ -1,228 +1,5 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
template<typename T> class Array
|
|
||||||
{
|
|
||||||
protected:
|
|
||||||
u32 m_count;
|
|
||||||
T* m_array;
|
|
||||||
|
|
||||||
public:
|
|
||||||
Array()
|
|
||||||
: m_count(0)
|
|
||||||
, m_array(NULL)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
~Array()
|
|
||||||
{
|
|
||||||
Clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool RemoveAt(const u32 from, const u32 count = 1)
|
|
||||||
{
|
|
||||||
if(!GetCount()) return false;
|
|
||||||
const u32 to = from + count;
|
|
||||||
if(to > GetCount()) return false;
|
|
||||||
|
|
||||||
for(u32 i=0; i<count; ++i) m_array[from + i].~T();
|
|
||||||
memmove(m_array + from, m_array + to, (m_count-to) * sizeof(T));
|
|
||||||
m_count -= count;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void InsertRoomEnd(const u32 size)
|
|
||||||
{
|
|
||||||
_InsertRoomEnd(size);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool InsertRoom(const u32 pos, const u32 size)
|
|
||||||
{
|
|
||||||
if(pos >= m_count) return false;
|
|
||||||
|
|
||||||
_InsertRoomEnd(size);
|
|
||||||
memmove(m_array + pos + size, m_array + pos, sizeof(T) * (m_count - size - pos));
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool Move(const u32 pos, T* data)
|
|
||||||
{
|
|
||||||
if(!InsertRoom(pos, 1)) return false;
|
|
||||||
|
|
||||||
memcpy(m_array + pos, data, sizeof(T));
|
|
||||||
free(data);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline u32 Move(T* data)
|
|
||||||
{
|
|
||||||
_InsertRoomEnd(1);
|
|
||||||
|
|
||||||
memcpy(m_array + GetCount() - 1, data, sizeof(T));
|
|
||||||
free(data);
|
|
||||||
|
|
||||||
return m_count - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool Add(const u32 pos, T*& data)
|
|
||||||
{
|
|
||||||
if(!InsertRoom(pos, 1)) return false;
|
|
||||||
|
|
||||||
memcpy(m_array + pos, data, sizeof(T));
|
|
||||||
free(data);
|
|
||||||
data = m_array + pos;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline u32 Add(T*& data)
|
|
||||||
{
|
|
||||||
_InsertRoomEnd(1);
|
|
||||||
|
|
||||||
memcpy(m_array + GetCount() - 1, data, sizeof(T));
|
|
||||||
free(data);
|
|
||||||
data = m_array + GetCount() - 1;
|
|
||||||
|
|
||||||
return m_count - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool AddCpy(const u32 pos, const T* data, u32 count = 1)
|
|
||||||
{
|
|
||||||
if(!InsertRoom(pos, count)) return false;
|
|
||||||
|
|
||||||
for(u32 i=0; i<count; ++i)
|
|
||||||
{
|
|
||||||
new (m_array + pos + i) T(data[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool AddCpy(const u32 pos, const T& data)
|
|
||||||
{
|
|
||||||
return AddCpy(pos, &data);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline u32 AddCpy(const T* data, u32 count = 1)
|
|
||||||
{
|
|
||||||
_InsertRoomEnd(count);
|
|
||||||
|
|
||||||
for(u32 i=0; i<count; ++i)
|
|
||||||
{
|
|
||||||
new (m_array + m_count - count + i) T(data[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return m_count - count;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline u32 AddCpy(const T& data)
|
|
||||||
{
|
|
||||||
return AddCpy(&data);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void Clear()
|
|
||||||
{
|
|
||||||
u32 count = m_count;
|
|
||||||
m_count = 0;
|
|
||||||
for(u32 i=0; i<count; ++i) m_array[i].~T();
|
|
||||||
safe_free(m_array);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void ClearF()
|
|
||||||
{
|
|
||||||
m_count = 0;
|
|
||||||
safe_free(m_array);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline T& Get(u32 num)
|
|
||||||
{
|
|
||||||
//if(num >= GetCount()) return *new T();
|
|
||||||
return m_array[num];
|
|
||||||
}
|
|
||||||
|
|
||||||
u32 GetCount() const { return m_count; }
|
|
||||||
|
|
||||||
void SetCount(const u32 count, bool memzero = true)
|
|
||||||
{
|
|
||||||
if(m_count >= count) return;
|
|
||||||
|
|
||||||
_InsertRoomEnd(count - m_count);
|
|
||||||
|
|
||||||
if(memzero) memset(m_array + m_count - count, 0, sizeof(T) * (m_count - count));
|
|
||||||
}
|
|
||||||
|
|
||||||
void Reserve(const u32 count)
|
|
||||||
{
|
|
||||||
SetCount(GetCount() + count);
|
|
||||||
}
|
|
||||||
|
|
||||||
void AppendFrom(const Array<T>& src)
|
|
||||||
{
|
|
||||||
if(!src.GetCount()) return;
|
|
||||||
|
|
||||||
Reserve(src.GetCount());
|
|
||||||
|
|
||||||
memcpy(m_array, &src[0], GetCount() * sizeof(T));
|
|
||||||
}
|
|
||||||
|
|
||||||
void CopyFrom(const Array<T>& src)
|
|
||||||
{
|
|
||||||
Clear();
|
|
||||||
|
|
||||||
AppendFrom(src);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline T* GetPtr() { return m_array; }
|
|
||||||
inline const T* GetPtr() const { return m_array; }
|
|
||||||
|
|
||||||
T& operator[](u32 num) const { return m_array[num]; }
|
|
||||||
|
|
||||||
T* operator + (u32 right) const
|
|
||||||
{
|
|
||||||
return m_array + right;
|
|
||||||
}
|
|
||||||
|
|
||||||
T* operator ->()
|
|
||||||
{
|
|
||||||
return m_array;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
void _InsertRoomEnd(const u32 size)
|
|
||||||
{
|
|
||||||
if(!size) return;
|
|
||||||
|
|
||||||
m_array = m_count ? (T*)realloc(m_array, sizeof(T) * (m_count + size)) : (T*)malloc(sizeof(T) * size);
|
|
||||||
m_count += size;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
template<typename T> struct Stack : public Array<T>
|
|
||||||
{
|
|
||||||
Stack() : Array<T>()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
~Stack()
|
|
||||||
{
|
|
||||||
Array<T>::Clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
void Push(const T data) { Array<T>::AddCpy(data); }
|
|
||||||
|
|
||||||
T Pop()
|
|
||||||
{
|
|
||||||
const u32 pos = Array<T>::GetCount() - 1;
|
|
||||||
|
|
||||||
const T ret = Array<T>::Get(pos);
|
|
||||||
Array<T>::RemoveAt(pos);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
template<typename T, size_t size> class SizedStack
|
template<typename T, size_t size> class SizedStack
|
||||||
{
|
{
|
||||||
T m_ptr[size];
|
T m_ptr[size];
|
||||||
|
|
@ -278,106 +55,6 @@ public:
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename T> class ArrayF
|
|
||||||
{
|
|
||||||
u32 m_count;
|
|
||||||
T** m_array;
|
|
||||||
|
|
||||||
public:
|
|
||||||
ArrayF()
|
|
||||||
: m_count(0)
|
|
||||||
, m_array(NULL)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ~ArrayF()
|
|
||||||
{
|
|
||||||
Clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool RemoveFAt(const u32 from, const u32 count = 1)
|
|
||||||
{
|
|
||||||
if(from + count > m_count) return false;
|
|
||||||
|
|
||||||
memmove(&m_array[from], &m_array[from+count], (m_count-(from+count)) * sizeof(T**));
|
|
||||||
|
|
||||||
m_count -= count;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool RemoveAt(const u32 from, const u32 count = 1)
|
|
||||||
{
|
|
||||||
if(from + count > m_count) return false;
|
|
||||||
|
|
||||||
for(uint i = from; i < from + count; ++i)
|
|
||||||
{
|
|
||||||
free(m_array[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return RemoveFAt(from, count);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline u32 Add(T& data)
|
|
||||||
{
|
|
||||||
return Add(&data);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline u32 Add(T* data)
|
|
||||||
{
|
|
||||||
if(!m_array)
|
|
||||||
{
|
|
||||||
m_array = (T**)malloc(sizeof(T*));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_array = (T**)realloc(m_array, sizeof(T*) * (m_count + 1));
|
|
||||||
}
|
|
||||||
|
|
||||||
m_array[m_count] = data;
|
|
||||||
return m_count++;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void ClearF()
|
|
||||||
{
|
|
||||||
if(m_count == 0) return;
|
|
||||||
|
|
||||||
m_count = 0;
|
|
||||||
m_array = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void Clear()
|
|
||||||
{
|
|
||||||
if(m_count == 0) return;
|
|
||||||
|
|
||||||
m_count = 0;
|
|
||||||
safe_free(m_array);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline T& Get(const u64 num)
|
|
||||||
{
|
|
||||||
//if(m_count <= num) *m_array[0]; //TODO
|
|
||||||
return *m_array[num];
|
|
||||||
}
|
|
||||||
|
|
||||||
T** operator + (u32 right) const
|
|
||||||
{
|
|
||||||
return m_array + right;
|
|
||||||
}
|
|
||||||
|
|
||||||
T* operator ->()
|
|
||||||
{
|
|
||||||
return *m_array;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline T** GetPtr()
|
|
||||||
{
|
|
||||||
return m_array;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline u32 GetCount() const { return m_count; }
|
|
||||||
T& operator[](u32 num) const { return *m_array[num]; }
|
|
||||||
};
|
|
||||||
|
|
||||||
template<typename T> struct ScopedPtr
|
template<typename T> struct ScopedPtr
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
|
|
|
||||||
|
|
@ -57,13 +57,14 @@ public:
|
||||||
be_t() noexcept = default;
|
be_t() noexcept = default;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
be_t(const be_t<T,size>& value) = default;
|
||||||
be_t(const T& value)
|
be_t(const T& value)
|
||||||
{
|
{
|
||||||
FromLE(value);
|
FromLE(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T1>
|
template<typename T1>
|
||||||
be_t(const be_t<T1>& value)
|
explicit be_t(const be_t<T1>& value)
|
||||||
{
|
{
|
||||||
FromBE(value.ToBE());
|
FromBE(value.ToBE());
|
||||||
}
|
}
|
||||||
|
|
@ -126,11 +127,7 @@ public:
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
be_t& operator = (const be_t& right)
|
be_t<T,size>& operator = (const be_t<T,size>& right) = default;
|
||||||
{
|
|
||||||
m_data = right.m_data;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
template<typename T1> be_t& operator += (T1 right) { return *this = T(*this) + right; }
|
template<typename T1> be_t& operator += (T1 right) { return *this = T(*this) + right; }
|
||||||
template<typename T1> be_t& operator -= (T1 right) { return *this = T(*this) - right; }
|
template<typename T1> be_t& operator -= (T1 right) { return *this = T(*this) - right; }
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,9 @@
|
||||||
|
|
||||||
#if defined(__GNUG__)
|
#if defined(__GNUG__)
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <malloc.h>
|
||||||
|
|
||||||
#define _fpclass(x) std::fpclassify(x)
|
#define _fpclass(x) std::fpclassify(x)
|
||||||
#define __forceinline __attribute__((always_inline))
|
#define __forceinline __attribute__((always_inline))
|
||||||
#define _byteswap_ushort(x) __builtin_bswap16(x)
|
#define _byteswap_ushort(x) __builtin_bswap16(x)
|
||||||
|
|
@ -13,7 +16,8 @@
|
||||||
#define _CRT_ALIGN(x) __attribute__((aligned(x)))
|
#define _CRT_ALIGN(x) __attribute__((aligned(x)))
|
||||||
#define InterlockedCompareExchange(ptr,new_val,old_val) __sync_val_compare_and_swap(ptr,old_val,new_val)
|
#define InterlockedCompareExchange(ptr,new_val,old_val) __sync_val_compare_and_swap(ptr,old_val,new_val)
|
||||||
#define InterlockedCompareExchange64(ptr,new_val,old_val) __sync_val_compare_and_swap(ptr,old_val,new_val)
|
#define InterlockedCompareExchange64(ptr,new_val,old_val) __sync_val_compare_and_swap(ptr,old_val,new_val)
|
||||||
#define _aligned_malloc(size,alignment) aligned_alloc(alignment,size)
|
#define _aligned_malloc(size,alignment) memalign(alignment,size)
|
||||||
#define _aligned_free(pointer) free(pointer)
|
#define _aligned_free free
|
||||||
#define DWORD int32_t
|
#define DWORD int32_t
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,14 @@ struct ID
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ID(ID&& other)
|
||||||
|
{
|
||||||
|
m_name = other.m_name;
|
||||||
|
m_attr = other.m_attr;
|
||||||
|
m_data = other.m_data;
|
||||||
|
other.m_data = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
void Kill()
|
void Kill()
|
||||||
{
|
{
|
||||||
delete m_data;
|
delete m_data;
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,8 @@ ThreadBase::~ThreadBase()
|
||||||
{
|
{
|
||||||
if(IsAlive())
|
if(IsAlive())
|
||||||
Stop(false);
|
Stop(false);
|
||||||
|
|
||||||
|
safe_delete(m_executor);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ThreadBase::Start()
|
void ThreadBase::Start()
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
#include "Array.h"
|
#include "Array.h"
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
#include <vector>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <condition_variable>
|
#include <condition_variable>
|
||||||
|
|
@ -73,7 +74,7 @@ template<typename T> class MTPacketBuffer
|
||||||
protected:
|
protected:
|
||||||
volatile bool m_busy;
|
volatile bool m_busy;
|
||||||
volatile u32 m_put, m_get;
|
volatile u32 m_put, m_get;
|
||||||
Array<u8> m_buffer;
|
std::vector<u8> m_buffer;
|
||||||
u32 m_max_buffer_size;
|
u32 m_max_buffer_size;
|
||||||
mutable std::recursive_mutex m_cs_main;
|
mutable std::recursive_mutex m_cs_main;
|
||||||
|
|
||||||
|
|
@ -98,7 +99,7 @@ public:
|
||||||
{
|
{
|
||||||
std::lock_guard<std::recursive_mutex> lock(m_cs_main);
|
std::lock_guard<std::recursive_mutex> lock(m_cs_main);
|
||||||
m_put = m_get = 0;
|
m_put = m_get = 0;
|
||||||
m_buffer.Clear();
|
m_buffer.clear();
|
||||||
m_busy = false;
|
m_busy = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
96
rpcs3.sln
96
rpcs3.sln
|
|
@ -84,12 +84,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjit", "asmjit.vcxproj",
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug - MemLeak|Win32 = Debug - MemLeak|Win32
|
||||||
|
Debug - MemLeak|x64 = Debug - MemLeak|x64
|
||||||
Debug|Win32 = Debug|Win32
|
Debug|Win32 = Debug|Win32
|
||||||
Debug|x64 = Debug|x64
|
Debug|x64 = Debug|x64
|
||||||
Release|Win32 = Release|Win32
|
Release|Win32 = Release|Win32
|
||||||
Release|x64 = Release|x64
|
Release|x64 = Release|x64
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - MemLeak|Win32.ActiveCfg = Debug - MemLeak|Win32
|
||||||
|
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - MemLeak|Win32.Build.0 = Debug - MemLeak|Win32
|
||||||
|
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64
|
||||||
|
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - MemLeak|x64.Build.0 = Debug - MemLeak|x64
|
||||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|Win32.ActiveCfg = Debug|Win32
|
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|Win32.Build.0 = Debug|Win32
|
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.ActiveCfg = Debug|x64
|
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -98,6 +104,10 @@ Global
|
||||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|Win32.Build.0 = Release|Win32
|
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|Win32.Build.0 = Release|Win32
|
||||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.ActiveCfg = Release|x64
|
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.ActiveCfg = Release|x64
|
||||||
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.Build.0 = Release|x64
|
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.Build.0 = Release|x64
|
||||||
|
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug|Win32.ActiveCfg = Debug|Win32
|
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug|Win32.Build.0 = Debug|Win32
|
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug|x64.ActiveCfg = Debug|x64
|
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -106,6 +116,10 @@ Global
|
||||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Release|Win32.Build.0 = Release|Win32
|
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Release|Win32.Build.0 = Release|Win32
|
||||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Release|x64.ActiveCfg = Release|x64
|
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Release|x64.ActiveCfg = Release|x64
|
||||||
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Release|x64.Build.0 = Release|x64
|
{6FCB55A5-563F-4039-1D79-1EB6ED8AAB82}.Release|x64.Build.0 = Release|x64
|
||||||
|
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug|Win32.ActiveCfg = Debug|Win32
|
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug|Win32.Build.0 = Debug|Win32
|
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug|x64.ActiveCfg = Debug|x64
|
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -114,6 +128,10 @@ Global
|
||||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Release|Win32.Build.0 = Release|Win32
|
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Release|Win32.Build.0 = Release|Win32
|
||||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Release|x64.ActiveCfg = Release|x64
|
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Release|x64.ActiveCfg = Release|x64
|
||||||
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Release|x64.Build.0 = Release|x64
|
{7047EE97-7F80-A70D-6147-BC11102DB6F4}.Release|x64.Build.0 = Release|x64
|
||||||
|
{3111D679-7796-23C4-BA0C-271F1145DA24}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{3111D679-7796-23C4-BA0C-271F1145DA24}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{3111D679-7796-23C4-BA0C-271F1145DA24}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{3111D679-7796-23C4-BA0C-271F1145DA24}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.Debug|Win32.ActiveCfg = Debug|Win32
|
{3111D679-7796-23C4-BA0C-271F1145DA24}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.Debug|Win32.Build.0 = Debug|Win32
|
{3111D679-7796-23C4-BA0C-271F1145DA24}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.Debug|x64.ActiveCfg = Debug|x64
|
{3111D679-7796-23C4-BA0C-271F1145DA24}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -122,6 +140,10 @@ Global
|
||||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.Release|Win32.Build.0 = Release|Win32
|
{3111D679-7796-23C4-BA0C-271F1145DA24}.Release|Win32.Build.0 = Release|Win32
|
||||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.Release|x64.ActiveCfg = Release|x64
|
{3111D679-7796-23C4-BA0C-271F1145DA24}.Release|x64.ActiveCfg = Release|x64
|
||||||
{3111D679-7796-23C4-BA0C-271F1145DA24}.Release|x64.Build.0 = Release|x64
|
{3111D679-7796-23C4-BA0C-271F1145DA24}.Release|x64.Build.0 = Release|x64
|
||||||
|
{067D9406-2A93-DACA-9449-93A2D356357D}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{067D9406-2A93-DACA-9449-93A2D356357D}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{067D9406-2A93-DACA-9449-93A2D356357D}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{067D9406-2A93-DACA-9449-93A2D356357D}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{067D9406-2A93-DACA-9449-93A2D356357D}.Debug|Win32.ActiveCfg = Debug|Win32
|
{067D9406-2A93-DACA-9449-93A2D356357D}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{067D9406-2A93-DACA-9449-93A2D356357D}.Debug|Win32.Build.0 = Debug|Win32
|
{067D9406-2A93-DACA-9449-93A2D356357D}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{067D9406-2A93-DACA-9449-93A2D356357D}.Debug|x64.ActiveCfg = Debug|x64
|
{067D9406-2A93-DACA-9449-93A2D356357D}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -130,6 +152,10 @@ Global
|
||||||
{067D9406-2A93-DACA-9449-93A2D356357D}.Release|Win32.Build.0 = Release|Win32
|
{067D9406-2A93-DACA-9449-93A2D356357D}.Release|Win32.Build.0 = Release|Win32
|
||||||
{067D9406-2A93-DACA-9449-93A2D356357D}.Release|x64.ActiveCfg = Release|x64
|
{067D9406-2A93-DACA-9449-93A2D356357D}.Release|x64.ActiveCfg = Release|x64
|
||||||
{067D9406-2A93-DACA-9449-93A2D356357D}.Release|x64.Build.0 = Release|x64
|
{067D9406-2A93-DACA-9449-93A2D356357D}.Release|x64.Build.0 = Release|x64
|
||||||
|
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug|Win32.ActiveCfg = Debug|Win32
|
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug|Win32.Build.0 = Debug|Win32
|
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug|x64.ActiveCfg = Debug|x64
|
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -138,6 +164,10 @@ Global
|
||||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Release|Win32.Build.0 = Release|Win32
|
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Release|Win32.Build.0 = Release|Win32
|
||||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Release|x64.ActiveCfg = Release|x64
|
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Release|x64.ActiveCfg = Release|x64
|
||||||
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Release|x64.Build.0 = Release|x64
|
{9ED1866B-D4AE-3440-24E4-7A9475B163B2}.Release|x64.Build.0 = Release|x64
|
||||||
|
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug|Win32.ActiveCfg = Debug|Win32
|
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug|Win32.Build.0 = Debug|Win32
|
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug|x64.ActiveCfg = Debug|x64
|
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -146,6 +176,10 @@ Global
|
||||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Release|Win32.Build.0 = Release|Win32
|
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Release|Win32.Build.0 = Release|Win32
|
||||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Release|x64.ActiveCfg = Release|x64
|
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Release|x64.ActiveCfg = Release|x64
|
||||||
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Release|x64.Build.0 = Release|x64
|
{99C9EB95-DB4C-1996-490E-5212EFBF07C3}.Release|x64.Build.0 = Release|x64
|
||||||
|
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug|Win32.ActiveCfg = Debug|Win32
|
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug|Win32.Build.0 = Debug|Win32
|
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug|x64.ActiveCfg = Debug|x64
|
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -154,6 +188,10 @@ Global
|
||||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Release|Win32.Build.0 = Release|Win32
|
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Release|Win32.Build.0 = Release|Win32
|
||||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Release|x64.ActiveCfg = Release|x64
|
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Release|x64.ActiveCfg = Release|x64
|
||||||
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Release|x64.Build.0 = Release|x64
|
{6EDC3B79-D217-F11A-406F-F11D856493F9}.Release|x64.Build.0 = Release|x64
|
||||||
|
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug|Win32.ActiveCfg = Debug|Win32
|
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug|Win32.Build.0 = Debug|Win32
|
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug|x64.ActiveCfg = Debug|x64
|
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -162,6 +200,10 @@ Global
|
||||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Release|Win32.Build.0 = Release|Win32
|
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Release|Win32.Build.0 = Release|Win32
|
||||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Release|x64.ActiveCfg = Release|x64
|
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Release|x64.ActiveCfg = Release|x64
|
||||||
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Release|x64.Build.0 = Release|x64
|
{A9AC9CF5-8E6C-0BA2-0769-6E42EDB88E25}.Release|x64.Build.0 = Release|x64
|
||||||
|
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug|Win32.ActiveCfg = Debug|Win32
|
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug|Win32.Build.0 = Debug|Win32
|
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug|x64.ActiveCfg = Debug|x64
|
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -170,6 +212,10 @@ Global
|
||||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Release|Win32.Build.0 = Release|Win32
|
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Release|Win32.Build.0 = Release|Win32
|
||||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Release|x64.ActiveCfg = Release|x64
|
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Release|x64.ActiveCfg = Release|x64
|
||||||
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Release|x64.Build.0 = Release|x64
|
{CD478F02-7550-58A5-E085-CE4BC0C0AD23}.Release|x64.Build.0 = Release|x64
|
||||||
|
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug|Win32.ActiveCfg = Debug|Win32
|
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug|Win32.Build.0 = Debug|Win32
|
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug|x64.ActiveCfg = Debug|x64
|
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -178,6 +224,10 @@ Global
|
||||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Release|Win32.Build.0 = Release|Win32
|
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Release|Win32.Build.0 = Release|Win32
|
||||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Release|x64.ActiveCfg = Release|x64
|
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Release|x64.ActiveCfg = Release|x64
|
||||||
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Release|x64.Build.0 = Release|x64
|
{22B14659-C5B6-B775-868D-A49198FEAD4A}.Release|x64.Build.0 = Release|x64
|
||||||
|
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug|Win32.ActiveCfg = Debug|Win32
|
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug|Win32.Build.0 = Debug|Win32
|
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug|x64.ActiveCfg = Debug|x64
|
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -186,6 +236,10 @@ Global
|
||||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Release|Win32.Build.0 = Release|Win32
|
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Release|Win32.Build.0 = Release|Win32
|
||||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Release|x64.ActiveCfg = Release|x64
|
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Release|x64.ActiveCfg = Release|x64
|
||||||
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Release|x64.Build.0 = Release|x64
|
{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}.Release|x64.Build.0 = Release|x64
|
||||||
|
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug|Win32.ActiveCfg = Debug|Win32
|
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug|Win32.Build.0 = Debug|Win32
|
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug|x64.ActiveCfg = Debug|x64
|
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -194,6 +248,10 @@ Global
|
||||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Release|Win32.Build.0 = Release|Win32
|
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Release|Win32.Build.0 = Release|Win32
|
||||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Release|x64.ActiveCfg = Release|x64
|
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Release|x64.ActiveCfg = Release|x64
|
||||||
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Release|x64.Build.0 = Release|x64
|
{46333DC3-B4A5-3DCC-E8BF-A3F20ADC56D2}.Release|x64.Build.0 = Release|x64
|
||||||
|
{5C363C34-4741-7036-861C-2E2279CF552E}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{5C363C34-4741-7036-861C-2E2279CF552E}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{5C363C34-4741-7036-861C-2E2279CF552E}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{5C363C34-4741-7036-861C-2E2279CF552E}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{5C363C34-4741-7036-861C-2E2279CF552E}.Debug|Win32.ActiveCfg = Debug|Win32
|
{5C363C34-4741-7036-861C-2E2279CF552E}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{5C363C34-4741-7036-861C-2E2279CF552E}.Debug|Win32.Build.0 = Debug|Win32
|
{5C363C34-4741-7036-861C-2E2279CF552E}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{5C363C34-4741-7036-861C-2E2279CF552E}.Debug|x64.ActiveCfg = Debug|x64
|
{5C363C34-4741-7036-861C-2E2279CF552E}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -202,6 +260,10 @@ Global
|
||||||
{5C363C34-4741-7036-861C-2E2279CF552E}.Release|Win32.Build.0 = Release|Win32
|
{5C363C34-4741-7036-861C-2E2279CF552E}.Release|Win32.Build.0 = Release|Win32
|
||||||
{5C363C34-4741-7036-861C-2E2279CF552E}.Release|x64.ActiveCfg = Release|x64
|
{5C363C34-4741-7036-861C-2E2279CF552E}.Release|x64.ActiveCfg = Release|x64
|
||||||
{5C363C34-4741-7036-861C-2E2279CF552E}.Release|x64.Build.0 = Release|x64
|
{5C363C34-4741-7036-861C-2E2279CF552E}.Release|x64.Build.0 = Release|x64
|
||||||
|
{76169FE8-0814-4F36-6409-699EF1A23001}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{76169FE8-0814-4F36-6409-699EF1A23001}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{76169FE8-0814-4F36-6409-699EF1A23001}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{76169FE8-0814-4F36-6409-699EF1A23001}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{76169FE8-0814-4F36-6409-699EF1A23001}.Debug|Win32.ActiveCfg = Debug|Win32
|
{76169FE8-0814-4F36-6409-699EF1A23001}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{76169FE8-0814-4F36-6409-699EF1A23001}.Debug|Win32.Build.0 = Debug|Win32
|
{76169FE8-0814-4F36-6409-699EF1A23001}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{76169FE8-0814-4F36-6409-699EF1A23001}.Debug|x64.ActiveCfg = Debug|x64
|
{76169FE8-0814-4F36-6409-699EF1A23001}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -210,6 +272,10 @@ Global
|
||||||
{76169FE8-0814-4F36-6409-699EF1A23001}.Release|Win32.Build.0 = Release|Win32
|
{76169FE8-0814-4F36-6409-699EF1A23001}.Release|Win32.Build.0 = Release|Win32
|
||||||
{76169FE8-0814-4F36-6409-699EF1A23001}.Release|x64.ActiveCfg = Release|x64
|
{76169FE8-0814-4F36-6409-699EF1A23001}.Release|x64.ActiveCfg = Release|x64
|
||||||
{76169FE8-0814-4F36-6409-699EF1A23001}.Release|x64.Build.0 = Release|x64
|
{76169FE8-0814-4F36-6409-699EF1A23001}.Release|x64.Build.0 = Release|x64
|
||||||
|
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug|Win32.ActiveCfg = Debug|Win32
|
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug|Win32.Build.0 = Debug|Win32
|
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug|x64.ActiveCfg = Debug|x64
|
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -218,6 +284,10 @@ Global
|
||||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Release|Win32.Build.0 = Release|Win32
|
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Release|Win32.Build.0 = Release|Win32
|
||||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Release|x64.ActiveCfg = Release|x64
|
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Release|x64.ActiveCfg = Release|x64
|
||||||
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Release|x64.Build.0 = Release|x64
|
{949C6DB8-E638-6EC6-AB31-BCCFD1379E01}.Release|x64.Build.0 = Release|x64
|
||||||
|
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug|Win32.ActiveCfg = Debug|Win32
|
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug|Win32.Build.0 = Debug|Win32
|
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug|x64.ActiveCfg = Debug|x64
|
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -226,6 +296,10 @@ Global
|
||||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Release|Win32.Build.0 = Release|Win32
|
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Release|Win32.Build.0 = Release|Win32
|
||||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Release|x64.ActiveCfg = Release|x64
|
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Release|x64.ActiveCfg = Release|x64
|
||||||
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Release|x64.Build.0 = Release|x64
|
{B87216CD-6C64-1DB0-D900-BC6E745C1DF9}.Release|x64.Build.0 = Release|x64
|
||||||
|
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug|Win32.ActiveCfg = Debug|Win32
|
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug|Win32.Build.0 = Debug|Win32
|
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug|x64.ActiveCfg = Debug|x64
|
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -234,6 +308,10 @@ Global
|
||||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Release|Win32.Build.0 = Release|Win32
|
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Release|Win32.Build.0 = Release|Win32
|
||||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Release|x64.ActiveCfg = Release|x64
|
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Release|x64.ActiveCfg = Release|x64
|
||||||
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Release|x64.Build.0 = Release|x64
|
{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}.Release|x64.Build.0 = Release|x64
|
||||||
|
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug|Win32.ActiveCfg = Debug|Win32
|
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug|Win32.Build.0 = Debug|Win32
|
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug|x64.ActiveCfg = Debug|x64
|
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -242,6 +320,10 @@ Global
|
||||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Release|Win32.Build.0 = Release|Win32
|
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Release|Win32.Build.0 = Release|Win32
|
||||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Release|x64.ActiveCfg = Release|x64
|
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Release|x64.ActiveCfg = Release|x64
|
||||||
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Release|x64.Build.0 = Release|x64
|
{6FDC76D5-CB44-B9F8-5EF6-C59B020719DF}.Release|x64.Build.0 = Release|x64
|
||||||
|
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug|Win32.ActiveCfg = Debug|Win32
|
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug|Win32.Build.0 = Debug|Win32
|
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug|x64.ActiveCfg = Debug|x64
|
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -250,6 +332,10 @@ Global
|
||||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Release|Win32.Build.0 = Release|Win32
|
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Release|Win32.Build.0 = Release|Win32
|
||||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Release|x64.ActiveCfg = Release|x64
|
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Release|x64.ActiveCfg = Release|x64
|
||||||
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Release|x64.Build.0 = Release|x64
|
{8BECCA95-C7D7-CFF8-FDB1-4950E9F8E8E6}.Release|x64.Build.0 = Release|x64
|
||||||
|
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32
|
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32
|
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.ActiveCfg = Debug|x64
|
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -258,6 +344,10 @@ Global
|
||||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32
|
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32
|
||||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.ActiveCfg = Release|x64
|
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.ActiveCfg = Release|x64
|
||||||
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.Build.0 = Release|x64
|
{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.Build.0 = Release|x64
|
||||||
|
{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.ActiveCfg = Debug|Win32
|
{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.Build.0 = Debug|Win32
|
{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.ActiveCfg = Debug|x64
|
{23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -266,6 +356,10 @@ Global
|
||||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.Build.0 = Release|Win32
|
{23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.Build.0 = Release|Win32
|
||||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.ActiveCfg = Release|x64
|
{23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.ActiveCfg = Release|x64
|
||||||
{23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.Build.0 = Release|x64
|
{23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.Build.0 = Release|x64
|
||||||
|
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug - MemLeak|Win32.Build.0 = Debug|Win32
|
||||||
|
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
|
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug - MemLeak|x64.Build.0 = Debug|x64
|
||||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.ActiveCfg = Debug|Win32
|
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.Build.0 = Debug|Win32
|
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.ActiveCfg = Debug|x64
|
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
@ -274,6 +368,8 @@ Global
|
||||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.Build.0 = Release|Win32
|
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.Build.0 = Release|Win32
|
||||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.ActiveCfg = Release|x64
|
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.ActiveCfg = Release|x64
|
||||||
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.Build.0 = Release|x64
|
{74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.Build.0 = Release|x64
|
||||||
|
{AC40FF01-426E-4838-A317-66354CEFAE88}.Debug - MemLeak|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{AC40FF01-426E-4838-A317-66354CEFAE88}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
|
||||||
{AC40FF01-426E-4838-A317-66354CEFAE88}.Debug|Win32.ActiveCfg = Debug|Win32
|
{AC40FF01-426E-4838-A317-66354CEFAE88}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{AC40FF01-426E-4838-A317-66354CEFAE88}.Debug|Win32.Build.0 = Debug|Win32
|
{AC40FF01-426E-4838-A317-66354CEFAE88}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{AC40FF01-426E-4838-A317-66354CEFAE88}.Debug|x64.ActiveCfg = Debug|x64
|
{AC40FF01-426E-4838-A317-66354CEFAE88}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
|
|
||||||
|
|
@ -3,21 +3,21 @@
|
||||||
|
|
||||||
AppConnector::~AppConnector()
|
AppConnector::~AppConnector()
|
||||||
{
|
{
|
||||||
for(uint i=0; i<m_connect_arr.GetCount(); ++i)
|
for(auto& connection : m_connect_arr)
|
||||||
{
|
{
|
||||||
wxGetApp().Disconnect(
|
wxGetApp().Disconnect(
|
||||||
m_connect_arr[i].winid,
|
connection.winid,
|
||||||
m_connect_arr[i].lastId,
|
connection.lastId,
|
||||||
m_connect_arr[i].eventType,
|
connection.eventType,
|
||||||
m_connect_arr[i].func,
|
connection.func,
|
||||||
m_connect_arr[i].userData,
|
connection.userData,
|
||||||
m_connect_arr[i].eventSink);
|
connection.eventSink);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AppConnector::Connect(int winid, int lastId, int eventType, wxObjectEventFunction func, wxObject* userData, wxEvtHandler* eventSink)
|
void AppConnector::Connect(int winid, int lastId, int eventType, wxObjectEventFunction func, wxObject* userData, wxEvtHandler* eventSink)
|
||||||
{
|
{
|
||||||
m_connect_arr.Move(new ConnectInfo(winid, lastId, eventType, func, userData, eventSink));
|
m_connect_arr.emplace_back(winid, lastId, eventType, func, userData, eventSink);
|
||||||
wxGetApp().Connect(winid, lastId, eventType, func, userData, eventSink);
|
wxGetApp().Connect(winid, lastId, eventType, func, userData, eventSink);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ class AppConnector
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
Array<ConnectInfo> m_connect_arr;
|
std::vector<ConnectInfo> m_connect_arr;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
~AppConnector();
|
~AppConnector();
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
|
||||||
add_definitions(-msse2)
|
add_definitions(-msse2)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules)
|
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
|
||||||
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../bin")
|
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../bin")
|
||||||
|
|
||||||
add_definitions(-DGL_GLEXT_PROTOTYPES)
|
add_definitions(-DGL_GLEXT_PROTOTYPES)
|
||||||
|
|
@ -34,28 +34,28 @@ endif()
|
||||||
include_directories(
|
include_directories(
|
||||||
${wxWidgets_INCLUDE_DIRS}
|
${wxWidgets_INCLUDE_DIRS}
|
||||||
${OPENAL_INCLUDE_DIR}
|
${OPENAL_INCLUDE_DIR}
|
||||||
${CMAKE_SOURCE_DIR}/../ffmpeg/${PLATFORM_ARCH}/include
|
"${CMAKE_SOURCE_DIR}/../ffmpeg/${PLATFORM_ARCH}/include"
|
||||||
${CMAKE_SOURCE_DIR}
|
"${CMAKE_SOURCE_DIR}"
|
||||||
${CMAKE_SOURCE_DIR}/Emu
|
"${CMAKE_SOURCE_DIR}/Emu"
|
||||||
${CMAKE_SOURCE_DIR}/Gui
|
"${CMAKE_SOURCE_DIR}/Gui"
|
||||||
${CMAKE_SOURCE_DIR}/Loader
|
"${CMAKE_SOURCE_DIR}/Loader"
|
||||||
${CMAKE_SOURCE_DIR}/Crypto
|
"${CMAKE_SOURCE_DIR}/Crypto"
|
||||||
${CMAKE_SOURCE_DIR}/..
|
"${CMAKE_SOURCE_DIR}/.."
|
||||||
)
|
)
|
||||||
|
|
||||||
link_directories(${CMAKE_SOURCE_DIR}/../ffmpeg/${PLATFORM_ARCH}/lib)
|
link_directories("${CMAKE_SOURCE_DIR}/../ffmpeg/${PLATFORM_ARCH}/lib")
|
||||||
|
|
||||||
file(
|
file(
|
||||||
GLOB_RECURSE
|
GLOB_RECURSE
|
||||||
RPCS3_SRC
|
RPCS3_SRC
|
||||||
${CMAKE_SOURCE_DIR}/rpcs3.cpp
|
"${CMAKE_SOURCE_DIR}/rpcs3.cpp"
|
||||||
${CMAKE_SOURCE_DIR}/AppConnector.cpp
|
"${CMAKE_SOURCE_DIR}/AppConnector.cpp"
|
||||||
${CMAKE_SOURCE_DIR}/Ini.cpp
|
"${CMAKE_SOURCE_DIR}/Ini.cpp"
|
||||||
${CMAKE_SOURCE_DIR}/Emu/*
|
"${CMAKE_SOURCE_DIR}/Emu/*"
|
||||||
${CMAKE_SOURCE_DIR}/Gui/*
|
"${CMAKE_SOURCE_DIR}/Gui/*"
|
||||||
${CMAKE_SOURCE_DIR}/Loader/*
|
"${CMAKE_SOURCE_DIR}/Loader/*"
|
||||||
${CMAKE_SOURCE_DIR}/Crypto/*
|
"${CMAKE_SOURCE_DIR}/Crypto/*"
|
||||||
${CMAKE_SOURCE_DIR}/../Utilities/*
|
"${CMAKE_SOURCE_DIR}/../Utilities/*"
|
||||||
)
|
)
|
||||||
|
|
||||||
add_executable(rpcs3 ${RPCS3_SRC})
|
add_executable(rpcs3 ${RPCS3_SRC})
|
||||||
|
|
|
||||||
|
|
@ -7,665 +7,576 @@ KeyVault::KeyVault()
|
||||||
|
|
||||||
void KeyVault::LoadSelfLV0Keys()
|
void KeyVault::LoadSelfLV0Keys()
|
||||||
{
|
{
|
||||||
sk_LV0_arr.Clear();
|
sk_LV0_arr.clear();
|
||||||
sk_LV0_arr.Move(
|
sk_LV0_arr.emplace_back(0x0000000000000000, 0x0000, KEY_LV0,
|
||||||
new SELF_KEY(0x0000000000000000, 0x0000, KEY_LV0,
|
|
||||||
"CA7A24EC38BDB45B98CCD7D363EA2AF0C326E65081E0630CB9AB2D215865878A",
|
"CA7A24EC38BDB45B98CCD7D363EA2AF0C326E65081E0630CB9AB2D215865878A",
|
||||||
"F9205F46F6021697E670F13DFA726212",
|
"F9205F46F6021697E670F13DFA726212",
|
||||||
"A8FD6DB24532D094EFA08CB41C9A72287D905C6B27B42BE4AB925AAF4AFFF34D41EEB54DD128700D",
|
"A8FD6DB24532D094EFA08CB41C9A72287D905C6B27B42BE4AB925AAF4AFFF34D41EEB54DD128700D",
|
||||||
"001AD976FCDE86F5B8FF3E63EF3A7F94E861975BA3",
|
"001AD976FCDE86F5B8FF3E63EF3A7F94E861975BA3",
|
||||||
0x33));
|
0x33);
|
||||||
}
|
}
|
||||||
|
|
||||||
void KeyVault::LoadSelfLDRKeys()
|
void KeyVault::LoadSelfLDRKeys()
|
||||||
{
|
{
|
||||||
sk_LDR_arr.Clear();
|
sk_LDR_arr.clear();
|
||||||
sk_LDR_arr.Move(
|
sk_LDR_arr.emplace_back(0x0000000000000000, 0x0000, KEY_LDR,
|
||||||
new SELF_KEY(0x0000000000000000, 0x0000, KEY_LDR,
|
|
||||||
"C0CEFE84C227F75BD07A7EB846509F93B238E770DACB9FF4A388F812482BE21B",
|
"C0CEFE84C227F75BD07A7EB846509F93B238E770DACB9FF4A388F812482BE21B",
|
||||||
"47EE7454E4774CC9B8960C7B59F4C14D",
|
"47EE7454E4774CC9B8960C7B59F4C14D",
|
||||||
"C2D4AAF319355019AF99D44E2B58CA29252C89123D11D6218F40B138CAB29B7101F3AEB72A975019",
|
"C2D4AAF319355019AF99D44E2B58CA29252C89123D11D6218F40B138CAB29B7101F3AEB72A975019",
|
||||||
"00C5B2BFA1A413DD16F26D31C0F2ED4720DCFB0670",
|
"00C5B2BFA1A413DD16F26D31C0F2ED4720DCFB0670",
|
||||||
0x20));
|
0x20);
|
||||||
}
|
}
|
||||||
|
|
||||||
void KeyVault::LoadSelfLV1Keys()
|
void KeyVault::LoadSelfLV1Keys()
|
||||||
{
|
{
|
||||||
sk_LV1_arr.Clear();
|
sk_LV1_arr.clear();
|
||||||
sk_LV1_arr.Move(
|
sk_LV1_arr.emplace_back(0x0003003000000000, 0x0000, KEY_LV1,
|
||||||
new SELF_KEY(0x0003003000000000, 0x0000, KEY_LV1,
|
|
||||||
"B9F3F9E6107CFF2680A91E118C2403CF4A6F18F3C7EFD7D13D1AC4DB760BD222",
|
"B9F3F9E6107CFF2680A91E118C2403CF4A6F18F3C7EFD7D13D1AC4DB760BD222",
|
||||||
"B43661B9A79BAD9D8E2B046469CDA1E7",
|
"B43661B9A79BAD9D8E2B046469CDA1E7",
|
||||||
"4C870BE86DDD996A92A3F7F404F33604244A1D02AB5B78BC9DAF030B78BE8867CF586171B7D45D20",
|
"4C870BE86DDD996A92A3F7F404F33604244A1D02AB5B78BC9DAF030B78BE8867CF586171B7D45D20",
|
||||||
"002CC736C7AD06D264E9AB663EB1F35F5DC159248C",
|
"002CC736C7AD06D264E9AB663EB1F35F5DC159248C",
|
||||||
0x33));
|
0x33);
|
||||||
sk_LV1_arr.Move(
|
sk_LV1_arr.emplace_back(0x0003004200000000, 0x0000, KEY_LV1,
|
||||||
new SELF_KEY(0x0003004200000000, 0x0000, KEY_LV1,
|
|
||||||
"B880593856C8C6D2037585626A12977F50DCFCF3F132D2C89AA6E670EAFC1646",
|
"B880593856C8C6D2037585626A12977F50DCFCF3F132D2C89AA6E670EAFC1646",
|
||||||
"A79B05D4E37B8117A95E6E7C14FB640E",
|
"A79B05D4E37B8117A95E6E7C14FB640E",
|
||||||
"7454C7CCBFC2F66C142D78A730A3A6F973CC0FB75A46FCBB390790138910A0CAC78E5E21F4DA3375",
|
"7454C7CCBFC2F66C142D78A730A3A6F973CC0FB75A46FCBB390790138910A0CAC78E5E21F4DA3375",
|
||||||
"00033A699FDD2DA6CDD6CCC03B2C6145F998706F74",
|
"00033A699FDD2DA6CDD6CCC03B2C6145F998706F74",
|
||||||
0x34));
|
0x34);
|
||||||
sk_LV1_arr.Move(
|
sk_LV1_arr.emplace_back(0x0003005000000000, 0x0000, KEY_LV1,
|
||||||
new SELF_KEY(0x0003005000000000, 0x0000, KEY_LV1,
|
|
||||||
"1E8EEEA9E80A729F3FA52CF523B25941EA44B4155D94E5DADC5C5A77847620C7",
|
"1E8EEEA9E80A729F3FA52CF523B25941EA44B4155D94E5DADC5C5A77847620C7",
|
||||||
"E034D31A80316960024D1B3D3164FDC3",
|
"E034D31A80316960024D1B3D3164FDC3",
|
||||||
"7E3A196f4A5879F3A7B091A2263F7C24E1716129B580566D308D9C2254B36AEE53DEF30EC85F8398",
|
"7E3A196f4A5879F3A7B091A2263F7C24E1716129B580566D308D9C2254B36AEE53DEF30EC85F8398",
|
||||||
"005815D17125D04C33790321DE29EB6241365100B5",
|
"005815D17125D04C33790321DE29EB6241365100B5",
|
||||||
0x35));
|
0x35);
|
||||||
sk_LV1_arr.Move(
|
sk_LV1_arr.emplace_back(0x0003005500000000, 0x0000, KEY_LV1,
|
||||||
new SELF_KEY(0x0003005500000000, 0x0000, KEY_LV1,
|
|
||||||
"53ABDF84BE08B0351B734F2B97D2BE1621BC6C889E4362E5C70F39D6C3ED9F23",
|
"53ABDF84BE08B0351B734F2B97D2BE1621BC6C889E4362E5C70F39D6C3ED9F23",
|
||||||
"44E652661AC7584DBE08ECB810FB5FC0",
|
"44E652661AC7584DBE08ECB810FB5FC0",
|
||||||
"733198A7759BC07326755BC9773A8A17C8A7043C7BDAB83D88E230512E2EA3852D7DA4263A7E97F9",
|
"733198A7759BC07326755BC9773A8A17C8A7043C7BDAB83D88E230512E2EA3852D7DA4263A7E97F9",
|
||||||
"004312C65347ACBE95CC306442FEFD0AF4C2935EB3",
|
"004312C65347ACBE95CC306442FEFD0AF4C2935EB3",
|
||||||
0x05));
|
0x05);
|
||||||
sk_LV1_arr.Move(
|
sk_LV1_arr.emplace_back(0x0003005600000000, 0x0000, KEY_LV1,
|
||||||
new SELF_KEY(0x0003005600000000, 0x0000, KEY_LV1,
|
|
||||||
"48793EBDDA1AF65D737DA2FDA2DD104447A698F8A82CAAEE992831711BA94E83",
|
"48793EBDDA1AF65D737DA2FDA2DD104447A698F8A82CAAEE992831711BA94E83",
|
||||||
"15DCF3C67147A45D09DE7521EECA07A1",
|
"15DCF3C67147A45D09DE7521EECA07A1",
|
||||||
"85A8868C320127F10B6598964C69221C086702021D31803520E21FDE4DBE827766BE41825CB7328C",
|
"85A8868C320127F10B6598964C69221C086702021D31803520E21FDE4DBE827766BE41825CB7328C",
|
||||||
"",
|
"",
|
||||||
0x07));
|
0x07);
|
||||||
sk_LV1_arr.Move(
|
sk_LV1_arr.emplace_back(0x0003006100000000, 0x0000, KEY_LV1,
|
||||||
new SELF_KEY(0x0003006100000000, 0x0000, KEY_LV1,
|
|
||||||
"5FF17D836E2C4AD69476E2614F64BDD05B9115389A9A6D055B5B544B1C34E3D5",
|
"5FF17D836E2C4AD69476E2614F64BDD05B9115389A9A6D055B5B544B1C34E3D5",
|
||||||
"DF0F50EC3C4743C5B17839D7B49F24A4",
|
"DF0F50EC3C4743C5B17839D7B49F24A4",
|
||||||
"1CDABE30833823F461CA534104115FFF60010B710631E435A7D915E82AE88EDE667264656CB7062E",
|
"1CDABE30833823F461CA534104115FFF60010B710631E435A7D915E82AE88EDE667264656CB7062E",
|
||||||
"",
|
"",
|
||||||
0x05));
|
0x05);
|
||||||
sk_LV1_arr.Move(
|
sk_LV1_arr.emplace_back(0x0003006600000000, 0x0000, KEY_LV1,
|
||||||
new SELF_KEY(0x0003006600000000, 0x0000, KEY_LV1,
|
|
||||||
"BD0621FA19383C3C72ECBC3B008F1CD55FFD7C3BB7510BF11AD0CF0FC2B70951",
|
"BD0621FA19383C3C72ECBC3B008F1CD55FFD7C3BB7510BF11AD0CF0FC2B70951",
|
||||||
"569AF3745E1E02E3E288273CDE244CD8",
|
"569AF3745E1E02E3E288273CDE244CD8",
|
||||||
"21E26F11C2D69478609DD1BD278CDFC940D90386455BA52FCD1FA7E27AC2AFA826C79A10193B625C",
|
"21E26F11C2D69478609DD1BD278CDFC940D90386455BA52FCD1FA7E27AC2AFA826C79A10193B625C",
|
||||||
"",
|
"",
|
||||||
0x07));
|
0x07);
|
||||||
sk_LV1_arr.Move(
|
sk_LV1_arr.emplace_back(0x0003007400000000, 0x0000, KEY_LV1,
|
||||||
new SELF_KEY(0x0003007400000000, 0x0000, KEY_LV1,
|
|
||||||
"41A6E0039041E9D8AAF4EF2F2A2971248EDBD96A3985611ED7B4CE73EE4804FE",
|
"41A6E0039041E9D8AAF4EF2F2A2971248EDBD96A3985611ED7B4CE73EE4804FE",
|
||||||
"C8C98D5A5CE23AF5607A352AECACB0DC",
|
"C8C98D5A5CE23AF5607A352AECACB0DC",
|
||||||
"4389664390265F96C1A882374C0F856364E33DB09BE124A4666F9A12F0DD9C811EDD55BA21ED0667",
|
"4389664390265F96C1A882374C0F856364E33DB09BE124A4666F9A12F0DD9C811EDD55BA21ED0667",
|
||||||
"",
|
"",
|
||||||
0x12));
|
0x12);
|
||||||
sk_LV1_arr.Move(
|
sk_LV1_arr.emplace_back(0x0004001100000000, 0x0000, KEY_LV1,
|
||||||
new SELF_KEY(0x0004001100000000, 0x0000, KEY_LV1,
|
|
||||||
"557EDF6C063F3272B0D44EEC12F418DA774815B5415597CC5F75C21E048BAD74",
|
"557EDF6C063F3272B0D44EEC12F418DA774815B5415597CC5F75C21E048BAD74",
|
||||||
"7144D7574937818517826227EF4AC0B4",
|
"7144D7574937818517826227EF4AC0B4",
|
||||||
"085D38DBF9B757329EB862107929909D32FA1DAE60641BF4AC25319D7650597EE977F8E810FEEA96",
|
"085D38DBF9B757329EB862107929909D32FA1DAE60641BF4AC25319D7650597EE977F8E810FEEA96",
|
||||||
"",
|
"",
|
||||||
0x13));
|
0x13);
|
||||||
sk_LV1_arr.Move(
|
sk_LV1_arr.emplace_back(0x0004005000000000, 0x0000, KEY_LV1,
|
||||||
new SELF_KEY(0x0004005000000000, 0x0000, KEY_LV1,
|
|
||||||
"10CEA04973FCCC12EC19924510822D8D4C41F657FD3D7E73F415A8D687421BCD",
|
"10CEA04973FCCC12EC19924510822D8D4C41F657FD3D7E73F415A8D687421BCD",
|
||||||
"ED8699562C6AC65204FA166257E7FCF4",
|
"ED8699562C6AC65204FA166257E7FCF4",
|
||||||
"9AF86FC869C159FBB62F7D9674EE257ABF12E5A96D5875B4AA73C13C2BC13E2A4079F98B9B935EE2",
|
"9AF86FC869C159FBB62F7D9674EE257ABF12E5A96D5875B4AA73C13C2BC13E2A4079F98B9B935EE2",
|
||||||
"",
|
"",
|
||||||
0x14));
|
0x14);
|
||||||
}
|
}
|
||||||
|
|
||||||
void KeyVault::LoadSelfLV2Keys()
|
void KeyVault::LoadSelfLV2Keys()
|
||||||
{
|
{
|
||||||
sk_LV2_arr.Clear();
|
sk_LV2_arr.clear();
|
||||||
sk_LV2_arr.Move(
|
sk_LV2_arr.emplace_back(0x0003003000000000, 0x0000, KEY_LV2,
|
||||||
new SELF_KEY(0x0003003000000000, 0x0000, KEY_LV2,
|
|
||||||
"94303F69513572AB5AE17C8C2A1839D2C24C28F65389D3BBB11894CE23E0798F",
|
"94303F69513572AB5AE17C8C2A1839D2C24C28F65389D3BBB11894CE23E0798F",
|
||||||
"9769BFD187B90990AE5FEA4E110B9CF5",
|
"9769BFD187B90990AE5FEA4E110B9CF5",
|
||||||
"AFAF5E96AF396CBB69071082C46A8F34A030E8EDB799E0A7BE00AA264DFF3AEBF7923920D559404D",
|
"AFAF5E96AF396CBB69071082C46A8F34A030E8EDB799E0A7BE00AA264DFF3AEBF7923920D559404D",
|
||||||
"0070ABF9361B02291829D479F56AB248203CD3EB46",
|
"0070ABF9361B02291829D479F56AB248203CD3EB46",
|
||||||
0x20));
|
0x20);
|
||||||
sk_LV2_arr.Move(
|
sk_LV2_arr.emplace_back(0x0003004200000000, 0x0000, KEY_LV2,
|
||||||
new SELF_KEY(0x0003004200000000, 0x0000, KEY_LV2,
|
|
||||||
"575B0A6C4B4F2760A03FE4189EBAF4D947279FD982B14070349098B08FF92C10",
|
"575B0A6C4B4F2760A03FE4189EBAF4D947279FD982B14070349098B08FF92C10",
|
||||||
"411CB18F460CE50CAF2C426D8F0D93C8",
|
"411CB18F460CE50CAF2C426D8F0D93C8",
|
||||||
"3FEE313954CB3039C321A7E33B97FFDEC8988A8B55759161B04DBF4731284E4A8191E3F17D32B0EA",
|
"3FEE313954CB3039C321A7E33B97FFDEC8988A8B55759161B04DBF4731284E4A8191E3F17D32B0EA",
|
||||||
"0073076441A08CD179E5FACE349B86DA58B5B7BA78",
|
"0073076441A08CD179E5FACE349B86DA58B5B7BA78",
|
||||||
0x21));
|
0x21);
|
||||||
sk_LV2_arr.Move(
|
sk_LV2_arr.emplace_back(0x0003005000000000, 0x0000, KEY_LV2,
|
||||||
new SELF_KEY(0x0003005000000000, 0x0000, KEY_LV2,
|
|
||||||
"6DBD48D787C58803A8D724DA5ACF04FF8FCE91D7545D2322F2B7ABF57014AF68",
|
"6DBD48D787C58803A8D724DA5ACF04FF8FCE91D7545D2322F2B7ABF57014AF68",
|
||||||
"603A36213708520ED5D745DEC1325BA5",
|
"603A36213708520ED5D745DEC1325BA5",
|
||||||
"5888CB83AC3CCA9610BC173C53141C0CA58B93719E744660CA8823D5EAEE8F9BF736997054E4B7E3",
|
"5888CB83AC3CCA9610BC173C53141C0CA58B93719E744660CA8823D5EAEE8F9BF736997054E4B7E3",
|
||||||
"0009EBC3DE442FA5FBF6C4F3D4F9EAB07778A142BD",
|
"0009EBC3DE442FA5FBF6C4F3D4F9EAB07778A142BD",
|
||||||
0x22));
|
0x22);
|
||||||
sk_LV2_arr.Move(
|
sk_LV2_arr.emplace_back(0x0003005500000000, 0x0000, KEY_LV2,
|
||||||
new SELF_KEY(0x0003005500000000, 0x0000, KEY_LV2,
|
|
||||||
"84015E90FA23139628A3C75CC09714E6427B527A82D18ABC3E91CD8D7DDAFF17",
|
"84015E90FA23139628A3C75CC09714E6427B527A82D18ABC3E91CD8D7DDAFF17",
|
||||||
"5B240444D645F2038118F97FD5A145D5",
|
"5B240444D645F2038118F97FD5A145D5",
|
||||||
"B266318245266B2D33641CD8A864066D077FAC60B7E27399099A70A683454B70F9888E7CC0C2BF72",
|
"B266318245266B2D33641CD8A864066D077FAC60B7E27399099A70A683454B70F9888E7CC0C2BF72",
|
||||||
"009D4CBA2BFB1A8330D3E20E59D281D476D231C73A",
|
"009D4CBA2BFB1A8330D3E20E59D281D476D231C73A",
|
||||||
0x32));
|
0x32);
|
||||||
sk_LV2_arr.Move(
|
sk_LV2_arr.emplace_back(0x0003005600000000, 0x0000, KEY_LV2,
|
||||||
new SELF_KEY(0x0003005600000000, 0x0000, KEY_LV2,
|
|
||||||
"EAE15444048EFDE7A831BFA9F5D96F047C9FCFF50723E292CF50F5417D81E359",
|
"EAE15444048EFDE7A831BFA9F5D96F047C9FCFF50723E292CF50F5417D81E359",
|
||||||
"9CA9282DC7FA9F315EF3156D970B7CD4",
|
"9CA9282DC7FA9F315EF3156D970B7CD4",
|
||||||
"0D58938CB47598A6A672874F1768068F8B80D8D17014D2ABEBAC85E5B0993D9FB6F307DDC3DDA699",
|
"0D58938CB47598A6A672874F1768068F8B80D8D17014D2ABEBAC85E5B0993D9FB6F307DDC3DDA699",
|
||||||
"",
|
"",
|
||||||
0x33));
|
0x33);
|
||||||
sk_LV2_arr.Move(
|
sk_LV2_arr.emplace_back(0x0003006100000000, 0x0000, KEY_LV2,
|
||||||
new SELF_KEY(0x0003006100000000, 0x0000, KEY_LV2,
|
|
||||||
"88AD367EDEC2FEED3E2F99B1C685075C41BDEC90C84F526CAF588F89BBD1CBCC",
|
"88AD367EDEC2FEED3E2F99B1C685075C41BDEC90C84F526CAF588F89BBD1CBCC",
|
||||||
"8D18E8E525230E63DE10291C9DD615BF",
|
"8D18E8E525230E63DE10291C9DD615BF",
|
||||||
"86EED1D65E58890ABDA9ACA486A2BDDB9C0A529C2053FAE301F0F698EAF443DA0F60595A597A7027",
|
"86EED1D65E58890ABDA9ACA486A2BDDB9C0A529C2053FAE301F0F698EAF443DA0F60595A597A7027",
|
||||||
"",
|
"",
|
||||||
0x32));
|
0x32);
|
||||||
sk_LV2_arr.Move(
|
sk_LV2_arr.emplace_back(0x0003006600000000, 0x0000, KEY_LV2,
|
||||||
new SELF_KEY(0x0003006600000000, 0x0000, KEY_LV2,
|
|
||||||
"688D5FCAC6F4EA35AC6AC79B10506007286131EE038116DB8AA2C0B0340D9FB0",
|
"688D5FCAC6F4EA35AC6AC79B10506007286131EE038116DB8AA2C0B0340D9FB0",
|
||||||
"75E0239D18B0B669EAE650972F99726B",
|
"75E0239D18B0B669EAE650972F99726B",
|
||||||
"008E1C820AC567D1BFB8FE3CC6AD2E1845A1D1B19ED2E18B18CA34A8D28A83EC60C63859CDB3DACA",
|
"008E1C820AC567D1BFB8FE3CC6AD2E1845A1D1B19ED2E18B18CA34A8D28A83EC60C63859CDB3DACA",
|
||||||
"",
|
"",
|
||||||
0x33));
|
0x33);
|
||||||
sk_LV2_arr.Move(
|
sk_LV2_arr.emplace_back(0x0003007400000000, 0x0000, KEY_LV2,
|
||||||
new SELF_KEY(0x0003007400000000, 0x0000, KEY_LV2,
|
|
||||||
"E81C5B04C29FB079A4A2687A39D4EA97BFB49D80EF546CEB292979A5F77A6254",
|
"E81C5B04C29FB079A4A2687A39D4EA97BFB49D80EF546CEB292979A5F77A6254",
|
||||||
"15058FA7F2CAD7C528B5F605F6444EB0",
|
"15058FA7F2CAD7C528B5F605F6444EB0",
|
||||||
"438D0E5C1E7AFB18234DB6867472FF5F52B750F30C379C7DD1EE0FD23E417B3EA819CC01BAC480ED",
|
"438D0E5C1E7AFB18234DB6867472FF5F52B750F30C379C7DD1EE0FD23E417B3EA819CC01BAC480ED",
|
||||||
"",
|
"",
|
||||||
0x11));
|
0x11);
|
||||||
sk_LV2_arr.Move(
|
sk_LV2_arr.emplace_back(0x0004001100000000, 0x0000, KEY_LV2,
|
||||||
new SELF_KEY(0x0004001100000000, 0x0000, KEY_LV2,
|
|
||||||
"A1E4B86ED02BF7F1372A2C73FE02BC738907EB37CE3BA605FE783C999FAFDB97",
|
"A1E4B86ED02BF7F1372A2C73FE02BC738907EB37CE3BA605FE783C999FAFDB97",
|
||||||
"BBE7799B9A37CB272E386618FDFD4AEC",
|
"BBE7799B9A37CB272E386618FDFD4AEC",
|
||||||
"5B31A8E2A663EBD673196E2E1022E0D64988C4E1BBFE5E474415883A3BA0D9C562A2BE9C30E9B4A8",
|
"5B31A8E2A663EBD673196E2E1022E0D64988C4E1BBFE5E474415883A3BA0D9C562A2BE9C30E9B4A8",
|
||||||
"",
|
"",
|
||||||
0x07));
|
0x07);
|
||||||
sk_LV2_arr.Move(
|
sk_LV2_arr.emplace_back(0x0004005000000000, 0x0000, KEY_LV2,
|
||||||
new SELF_KEY(0x0004005000000000, 0x0000, KEY_LV2,
|
|
||||||
"0CAF212B6FA53C0DA7E2C575ADF61DBE68F34A33433B1B891ABF5C4251406A03",
|
"0CAF212B6FA53C0DA7E2C575ADF61DBE68F34A33433B1B891ABF5C4251406A03",
|
||||||
"9B79374722AD888EB6A35A2DF25A8B3E",
|
"9B79374722AD888EB6A35A2DF25A8B3E",
|
||||||
"1034A6F98AF6625CC3E3604B59B971CA617DF337538D2179EBB22F3BDC9D0C6DA56BA7DDFD205A50",
|
"1034A6F98AF6625CC3E3604B59B971CA617DF337538D2179EBB22F3BDC9D0C6DA56BA7DDFD205A50",
|
||||||
"",
|
"",
|
||||||
0x14));
|
0x14);
|
||||||
}
|
}
|
||||||
|
|
||||||
void KeyVault::LoadSelfISOKeys()
|
void KeyVault::LoadSelfISOKeys()
|
||||||
{
|
{
|
||||||
sk_ISO_arr.Clear();
|
sk_ISO_arr.clear();
|
||||||
sk_ISO_arr.Move(
|
sk_ISO_arr.emplace_back(0x0003003000000000, 0x0001, KEY_ISO,
|
||||||
new SELF_KEY(0x0003003000000000, 0x0001, KEY_ISO,
|
|
||||||
"8860D0CFF4D0DC688D3223321B96B59A777E6914961488E07048DAECB020ECA4",
|
"8860D0CFF4D0DC688D3223321B96B59A777E6914961488E07048DAECB020ECA4",
|
||||||
"C82D015D46CF152F1DD0C16F18B5B1E5",
|
"C82D015D46CF152F1DD0C16F18B5B1E5",
|
||||||
"733918D7C888130509346E6B4A8B6CAA357AB557E814E8122BF102C14A314BF9475B9D70EAF9EC29",
|
"733918D7C888130509346E6B4A8B6CAA357AB557E814E8122BF102C14A314BF9475B9D70EAF9EC29",
|
||||||
"009BE892E122A5C943C1BB7403A67318AA9E1B286F",
|
"009BE892E122A5C943C1BB7403A67318AA9E1B286F",
|
||||||
0x36));
|
0x36);
|
||||||
sk_ISO_arr.Move(
|
sk_ISO_arr.emplace_back(0x0003004200000000, 0x0001, KEY_ISO,
|
||||||
new SELF_KEY(0x0003004200000000, 0x0001, KEY_ISO,
|
|
||||||
"101E27F3FA2FB53ACA924F783AD553162D56B975D05B81351A1111799F20254D",
|
"101E27F3FA2FB53ACA924F783AD553162D56B975D05B81351A1111799F20254D",
|
||||||
"8D2E9C6297B8AD252998458296AC773C",
|
"8D2E9C6297B8AD252998458296AC773C",
|
||||||
"138446EE0BDDA5638F97328C8956E6489CBBFE57C5961D40DD5C43BB4138F1C400A8B27204A5D625",
|
"138446EE0BDDA5638F97328C8956E6489CBBFE57C5961D40DD5C43BB4138F1C400A8B27204A5D625",
|
||||||
"00849DBC57D3B92F01864E6E82EB4EF0EF6311E122",
|
"00849DBC57D3B92F01864E6E82EB4EF0EF6311E122",
|
||||||
0x32));
|
0x32);
|
||||||
sk_ISO_arr.Move(
|
sk_ISO_arr.emplace_back(0x0003005000000000, 0x0001, KEY_ISO,
|
||||||
new SELF_KEY(0x0003005000000000, 0x0001, KEY_ISO,
|
|
||||||
"3F2604FA27AEADFBE1AC69EB00BB16EF196C2193CBD62900FFD8C25041680843",
|
"3F2604FA27AEADFBE1AC69EB00BB16EF196C2193CBD62900FFD8C25041680843",
|
||||||
"A414AC1DB7987E43777651B330B899E1",
|
"A414AC1DB7987E43777651B330B899E1",
|
||||||
"1F4633AFDE18614D6CEF38A2FD6C4CCAC7B6EB8109D72CD066ECEBA0193EA3F43C37AE83179A4E5F",
|
"1F4633AFDE18614D6CEF38A2FD6C4CCAC7B6EB8109D72CD066ECEBA0193EA3F43C37AE83179A4E5F",
|
||||||
"0085B4B05DEBA7E6AD831653C974D95149803BB272",
|
"0085B4B05DEBA7E6AD831653C974D95149803BB272",
|
||||||
0x33));
|
0x33);
|
||||||
sk_ISO_arr.Move(
|
sk_ISO_arr.emplace_back(0x0003005500000000, 0x0001, KEY_ISO,
|
||||||
new SELF_KEY(0x0003005500000000, 0x0001, KEY_ISO,
|
|
||||||
"BDB74AA6E3BA2DC10B1BD7F17198399A158DBE1FA0BEA68C90FCACBE4D04BE37",
|
"BDB74AA6E3BA2DC10B1BD7F17198399A158DBE1FA0BEA68C90FCACBE4D04BE37",
|
||||||
"0207A479B1574F8E7F697528F05D5435",
|
"0207A479B1574F8E7F697528F05D5435",
|
||||||
"917E1F1DC48A54EB5F10B38E7569BB5383628A7C906F0DCA62FDA33805C15FAB270016940A09DB58",
|
"917E1F1DC48A54EB5F10B38E7569BB5383628A7C906F0DCA62FDA33805C15FAB270016940A09DB58",
|
||||||
"00294411363290975BA551336D3965D88AF029A17B",
|
"00294411363290975BA551336D3965D88AF029A17B",
|
||||||
0x03));
|
0x03);
|
||||||
sk_ISO_arr.Move(
|
sk_ISO_arr.emplace_back(0x0003005600000000, 0x0001, KEY_ISO,
|
||||||
new SELF_KEY(0x0003005600000000, 0x0001, KEY_ISO,
|
|
||||||
"311C015F169F2A1E0757F7064B14C7C9F3A3FFEE015BD4E3A22401A2667857CE",
|
"311C015F169F2A1E0757F7064B14C7C9F3A3FFEE015BD4E3A22401A2667857CE",
|
||||||
"7BB8B3F5AC8E0890E3148AE5688C7350",
|
"7BB8B3F5AC8E0890E3148AE5688C7350",
|
||||||
"3F040EFA2335FED5670BA4D5C3AB2D9D0B4BA69D154A0062EA995A7D21DBAF0DC5A0DAD333D1C1DD",
|
"3F040EFA2335FED5670BA4D5C3AB2D9D0B4BA69D154A0062EA995A7D21DBAF0DC5A0DAD333D1C1DD",
|
||||||
"",
|
"",
|
||||||
0x08));
|
0x08);
|
||||||
sk_ISO_arr.Move(
|
sk_ISO_arr.emplace_back(0x0003006100000000, 0x0001, KEY_ISO,
|
||||||
new SELF_KEY(0x0003006100000000, 0x0001, KEY_ISO,
|
|
||||||
"8474ADCA3B3244931EECEB9357841442442A1C4A4BCF4E498E6738950F4E4093",
|
"8474ADCA3B3244931EECEB9357841442442A1C4A4BCF4E498E6738950F4E4093",
|
||||||
"FFF9CACCC4129125CAFB240F419E5F39",
|
"FFF9CACCC4129125CAFB240F419E5F39",
|
||||||
"098E1A53E59A95316B00D5A29C05FFEBAE41D1A8A386F9DA96F98858FD25E07BB7A3BC96A5D5B556",
|
"098E1A53E59A95316B00D5A29C05FFEBAE41D1A8A386F9DA96F98858FD25E07BB7A3BC96A5D5B556",
|
||||||
"",
|
"",
|
||||||
0x03));
|
0x03);
|
||||||
sk_ISO_arr.Move(
|
sk_ISO_arr.emplace_back(0x0003006600000000, 0x0001, KEY_ISO,
|
||||||
new SELF_KEY(0x0003006600000000, 0x0001, KEY_ISO,
|
|
||||||
"E6A21C599B75696C169EC02582BDA74A776134A6E05108EA701EC0CA2AC03592",
|
"E6A21C599B75696C169EC02582BDA74A776134A6E05108EA701EC0CA2AC03592",
|
||||||
"D292A7BD57C0BB2EABBCA1252FA9EDEF",
|
"D292A7BD57C0BB2EABBCA1252FA9EDEF",
|
||||||
"2ED078A13DC4617EB550AD06E228C83C142A2D588EB5E729402D18038A14842FD65B277DCAD225A5",
|
"2ED078A13DC4617EB550AD06E228C83C142A2D588EB5E729402D18038A14842FD65B277DCAD225A5",
|
||||||
"",
|
"",
|
||||||
0x08));
|
0x08);
|
||||||
sk_ISO_arr.Move(
|
sk_ISO_arr.emplace_back(0x0003007400000000, 0x0001, KEY_ISO,
|
||||||
new SELF_KEY(0x0003007400000000, 0x0001, KEY_ISO,
|
|
||||||
"072D3A5C3BDB0D674DE209381432B20414BC9BDA0F583ECB94BD9A134176DD51",
|
"072D3A5C3BDB0D674DE209381432B20414BC9BDA0F583ECB94BD9A134176DD51",
|
||||||
"8516A81F02CF938740498A406C880871",
|
"8516A81F02CF938740498A406C880871",
|
||||||
"5A778DEB5C4F12E8D48E06A2BBBBE3C90FA8C6C47DF9BDB5697FD4A8EB7941CE3F59A557E81C787D",
|
"5A778DEB5C4F12E8D48E06A2BBBBE3C90FA8C6C47DF9BDB5697FD4A8EB7941CE3F59A557E81C787D",
|
||||||
"",
|
"",
|
||||||
0x21));
|
0x21);
|
||||||
sk_ISO_arr.Move(
|
sk_ISO_arr.emplace_back(0x0003007400000000, 0x0100, KEY_ISO,
|
||||||
new SELF_KEY(0x0003007400000000, 0x0100, KEY_ISO,
|
|
||||||
"786FAB8A0B89474A2CB80B3EA104CCCB9E13F66B45EC499BB31865D07C661EA8",
|
"786FAB8A0B89474A2CB80B3EA104CCCB9E13F66B45EC499BB31865D07C661EA8",
|
||||||
"94662F13D99A9F5D211C979FFDF65FE3",
|
"94662F13D99A9F5D211C979FFDF65FE3",
|
||||||
"912C94C252B7799CEB45DFBB73EF7CAD9BCC0793A3331BBB79E3C47C0F5C782F698065A8D4DB0D8B",
|
"912C94C252B7799CEB45DFBB73EF7CAD9BCC0793A3331BBB79E3C47C0F5C782F698065A8D4DB0D8B",
|
||||||
"",
|
"",
|
||||||
0x0E));
|
0x0E);
|
||||||
sk_ISO_arr.Move(
|
sk_ISO_arr.emplace_back(0x0004001100000000, 0x0001, KEY_ISO,
|
||||||
new SELF_KEY(0x0004001100000000, 0x0001, KEY_ISO,
|
|
||||||
"4262657A3185D9480F82C8BD2F81766FCC2C8FD7DD5EBE8657B00B939E0C75BD",
|
"4262657A3185D9480F82C8BD2F81766FCC2C8FD7DD5EBE8657B00B939E0C75BD",
|
||||||
"4F1E3EF07D893A4714B1B3D5A4E50479",
|
"4F1E3EF07D893A4714B1B3D5A4E50479",
|
||||||
"4DBFCFA68B52F1D66E09AFA6C18EC65479EDBD027B6B8C6A5D85FE5C84D43EA40CEF1672078A0702",
|
"4DBFCFA68B52F1D66E09AFA6C18EC65479EDBD027B6B8C6A5D85FE5C84D43EA40CEF1672078A0702",
|
||||||
"",
|
"",
|
||||||
0x11));
|
0x11);
|
||||||
sk_ISO_arr.Move(
|
sk_ISO_arr.emplace_back(0x0004001100000000, 0x0100, KEY_ISO,
|
||||||
new SELF_KEY(0x0004001100000000, 0x0100, KEY_ISO,
|
|
||||||
"16AA7D7C35399E2B1BFAF68CD19D7512A7855029C08BECC4CC3F035DF7F9C70B",
|
"16AA7D7C35399E2B1BFAF68CD19D7512A7855029C08BECC4CC3F035DF7F9C70B",
|
||||||
"0E50DB6D937D262CB0499136852FCB80",
|
"0E50DB6D937D262CB0499136852FCB80",
|
||||||
"AEE2795BF295662A50DFAFE70D1B0B6F0A2EBB211E1323A275FC6E2D13BE4F2F10CA34784F4CF1EC",
|
"AEE2795BF295662A50DFAFE70D1B0B6F0A2EBB211E1323A275FC6E2D13BE4F2F10CA34784F4CF1EC",
|
||||||
"",
|
"",
|
||||||
0x0F));
|
0x0F);
|
||||||
sk_ISO_arr.Move(
|
sk_ISO_arr.emplace_back(0x0004005000000000, 0x0001, KEY_ISO,
|
||||||
new SELF_KEY(0x0004005000000000, 0x0001, KEY_ISO,
|
|
||||||
"63565DBE98C3B1A52AADC907C47130FE57A10734E84F22592670F86ED2B0A086",
|
"63565DBE98C3B1A52AADC907C47130FE57A10734E84F22592670F86ED2B0A086",
|
||||||
"953F6A99891B4739358F5363A00C08B9",
|
"953F6A99891B4739358F5363A00C08B9",
|
||||||
"26BE7B02E7D65C6C21BF4063CDB8C0092FE1679D62FA1A8CCC284A1D21885473A959992537A06612",
|
"26BE7B02E7D65C6C21BF4063CDB8C0092FE1679D62FA1A8CCC284A1D21885473A959992537A06612",
|
||||||
"",
|
"",
|
||||||
0x15));
|
0x15);
|
||||||
sk_ISO_arr.Move(
|
sk_ISO_arr.emplace_back(0x0004005000000000, 0x0100, KEY_ISO,
|
||||||
new SELF_KEY(0x0004005000000000, 0x0100, KEY_ISO,
|
|
||||||
"B96EA32CB96EA32DB96EA32CB96EA32CB96EA32CB96EA32DB96EA32CB96EA32C",
|
"B96EA32CB96EA32DB96EA32CB96EA32CB96EA32CB96EA32DB96EA32CB96EA32C",
|
||||||
"B96EA32CB96EA32DB96EA32DB96EA32C",
|
"B96EA32CB96EA32DB96EA32DB96EA32C",
|
||||||
"2D7066E68C6AC3373B1346FD76FE7D18A207C811500E65D85DB57BC4A27AD78F59FD53F38F50E151",
|
"2D7066E68C6AC3373B1346FD76FE7D18A207C811500E65D85DB57BC4A27AD78F59FD53F38F50E151",
|
||||||
"0044AA25B4276D79B494A29CB8DE104642424F8EEF",
|
"0044AA25B4276D79B494A29CB8DE104642424F8EEF",
|
||||||
0x02));
|
0x02);
|
||||||
}
|
}
|
||||||
|
|
||||||
void KeyVault::LoadSelfAPPKeys()
|
void KeyVault::LoadSelfAPPKeys()
|
||||||
{
|
{
|
||||||
sk_APP_arr.Clear();
|
sk_APP_arr.clear();
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0000009200000000, 0x0000, KEY_APP,
|
||||||
new SELF_KEY(0x0000009200000000, 0x0000, KEY_APP,
|
|
||||||
"95F50019E7A68E341FA72EFDF4D60ED376E25CF46BB48DFDD1F080259DC93F04",
|
"95F50019E7A68E341FA72EFDF4D60ED376E25CF46BB48DFDD1F080259DC93F04",
|
||||||
"4A0955D946DB70D691A640BB7FAECC4C",
|
"4A0955D946DB70D691A640BB7FAECC4C",
|
||||||
"6F8DF8EBD0A1D1DB08B30DD3A951E3F1F27E34030B42C729C55555232D61B834B8BDFFB07E54B343",
|
"6F8DF8EBD0A1D1DB08B30DD3A951E3F1F27E34030B42C729C55555232D61B834B8BDFFB07E54B343",
|
||||||
"006C3E4CCB2C69A5AD7C6F60448E50C7F9184EEAF4",
|
"006C3E4CCB2C69A5AD7C6F60448E50C7F9184EEAF4",
|
||||||
0x21));
|
0x21);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003003000000000, 0x0001, KEY_APP,
|
||||||
new SELF_KEY(0x0003003000000000, 0x0001, KEY_APP,
|
|
||||||
"79481839C406A632BDB4AC093D73D99AE1587F24CE7E69192C1CD0010274A8AB",
|
"79481839C406A632BDB4AC093D73D99AE1587F24CE7E69192C1CD0010274A8AB",
|
||||||
"6F0F25E1C8C4B7AE70DF968B04521DDA",
|
"6F0F25E1C8C4B7AE70DF968B04521DDA",
|
||||||
"94D1B7378BAFF5DFED269240A7A364ED68446741622E50BC6079B6E606A2F8E0A4C56E5CFF836526",
|
"94D1B7378BAFF5DFED269240A7A364ED68446741622E50BC6079B6E606A2F8E0A4C56E5CFF836526",
|
||||||
"003DE80167D2F0E9D30F2145144A558D1174F5410C",
|
"003DE80167D2F0E9D30F2145144A558D1174F5410C",
|
||||||
0x11));
|
0x11);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003003000000000, 0x0002, KEY_APP,
|
||||||
new SELF_KEY(0x0003003000000000, 0x0002, KEY_APP,
|
|
||||||
"4F89BE98DDD43CAD343F5BA6B1A133B0A971566F770484AAC20B5DD1DC9FA06A",
|
"4F89BE98DDD43CAD343F5BA6B1A133B0A971566F770484AAC20B5DD1DC9FA06A",
|
||||||
"90C127A9B43BA9D8E89FE6529E25206F",
|
"90C127A9B43BA9D8E89FE6529E25206F",
|
||||||
"8CA6905F46148D7D8D84D2AFCEAE61B41E6750FC22EA435DFA61FCE6F4F860EE4F54D9196CA5290E",
|
"8CA6905F46148D7D8D84D2AFCEAE61B41E6750FC22EA435DFA61FCE6F4F860EE4F54D9196CA5290E",
|
||||||
"",
|
"",
|
||||||
0x13));
|
0x13);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003003000000000, 0x0003, KEY_APP,
|
||||||
new SELF_KEY(0x0003003000000000, 0x0003, KEY_APP,
|
|
||||||
"C1E6A351FCED6A0636BFCB6801A0942DB7C28BDFC5E0A053A3F52F52FCE9754E",
|
"C1E6A351FCED6A0636BFCB6801A0942DB7C28BDFC5E0A053A3F52F52FCE9754E",
|
||||||
"E0908163F457576440466ACAA443AE7C",
|
"E0908163F457576440466ACAA443AE7C",
|
||||||
"50022D5D37C97905F898E78E7AA14A0B5CAAD5CE8190AE5629A10D6F0CF4173597B37A95A7545C92",
|
"50022D5D37C97905F898E78E7AA14A0B5CAAD5CE8190AE5629A10D6F0CF4173597B37A95A7545C92",
|
||||||
"",
|
"",
|
||||||
0x0B));
|
0x0B);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003004200000000, 0x0004, KEY_APP,
|
||||||
new SELF_KEY(0x0003004200000000, 0x0004, KEY_APP,
|
|
||||||
"838F5860CF97CDAD75B399CA44F4C214CDF951AC795298D71DF3C3B7E93AAEDA",
|
"838F5860CF97CDAD75B399CA44F4C214CDF951AC795298D71DF3C3B7E93AAEDA",
|
||||||
"7FDBB2E924D182BB0D69844ADC4ECA5B",
|
"7FDBB2E924D182BB0D69844ADC4ECA5B",
|
||||||
"1F140E8EF887DAB52F079A06E6915A6460B75CD256834A43FA7AF90C23067AF412EDAFE2C1778D69",
|
"1F140E8EF887DAB52F079A06E6915A6460B75CD256834A43FA7AF90C23067AF412EDAFE2C1778D69",
|
||||||
"0074E922FDEE5DC4CDF22FC8D7986477F813400860",
|
"0074E922FDEE5DC4CDF22FC8D7986477F813400860",
|
||||||
0x14));
|
0x14);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003004200000000, 0x0005, KEY_APP,
|
||||||
new SELF_KEY(0x0003004200000000, 0x0005, KEY_APP,
|
|
||||||
"C109AB56593DE5BE8BA190578E7D8109346E86A11088B42C727E2B793FD64BDC",
|
"C109AB56593DE5BE8BA190578E7D8109346E86A11088B42C727E2B793FD64BDC",
|
||||||
"15D3F191295C94B09B71EBDE088A187A",
|
"15D3F191295C94B09B71EBDE088A187A",
|
||||||
"B6BB0A84C649A90D97EBA55B555366F52381BB38A84C8BB71DA5A5A0949043C6DB249029A43156F7",
|
"B6BB0A84C649A90D97EBA55B555366F52381BB38A84C8BB71DA5A5A0949043C6DB249029A43156F7",
|
||||||
"",
|
"",
|
||||||
0x15));
|
0x15);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003004200000000, 0x0006, KEY_APP,
|
||||||
new SELF_KEY(0x0003004200000000, 0x0006, KEY_APP,
|
|
||||||
"6DFD7AFB470D2B2C955AB22264B1FF3C67F180983B26C01615DE9F2ECCBE7F41",
|
"6DFD7AFB470D2B2C955AB22264B1FF3C67F180983B26C01615DE9F2ECCBE7F41",
|
||||||
"24BD1C19D2A8286B8ACE39E4A37801C2",
|
"24BD1C19D2A8286B8ACE39E4A37801C2",
|
||||||
"71F46AC33FF89DF589A100A7FB64CEAC244C9A0CBBC1FDCE80FB4BF8A0D2E66293309CB8EE8CFA95",
|
"71F46AC33FF89DF589A100A7FB64CEAC244C9A0CBBC1FDCE80FB4BF8A0D2E66293309CB8EE8CFA95",
|
||||||
"",
|
"",
|
||||||
0x2C));
|
0x2C);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003005000000000, 0x0007, KEY_APP,
|
||||||
new SELF_KEY(0x0003005000000000, 0x0007, KEY_APP,
|
|
||||||
"945B99C0E69CAF0558C588B95FF41B232660ECB017741F3218C12F9DFDEEDE55",
|
"945B99C0E69CAF0558C588B95FF41B232660ECB017741F3218C12F9DFDEEDE55",
|
||||||
"1D5EFBE7C5D34AD60F9FBC46A5977FCE",
|
"1D5EFBE7C5D34AD60F9FBC46A5977FCE",
|
||||||
"AB284CA549B2DE9AA5C903B75652F78D192F8F4A8F3CD99209415C0A84C5C9FD6BF3095C1C18FFCD",
|
"AB284CA549B2DE9AA5C903B75652F78D192F8F4A8F3CD99209415C0A84C5C9FD6BF3095C1C18FFCD",
|
||||||
"002CF896D35DB871D0E6A252E799876A70D043C23E",
|
"002CF896D35DB871D0E6A252E799876A70D043C23E",
|
||||||
0x15));
|
0x15);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003005000000000, 0x0008, KEY_APP,
|
||||||
new SELF_KEY(0x0003005000000000, 0x0008, KEY_APP,
|
|
||||||
"2C9E8969EC44DFB6A8771DC7F7FDFBCCAF329EC3EC070900CABB23742A9A6E13",
|
"2C9E8969EC44DFB6A8771DC7F7FDFBCCAF329EC3EC070900CABB23742A9A6E13",
|
||||||
"5A4CEFD5A9C3C093D0B9352376D19405",
|
"5A4CEFD5A9C3C093D0B9352376D19405",
|
||||||
"6E82F6B54A0E9DEBE4A8B3043EE3B24CD9BBB62B4416B0482582E419A2552E29AB4BEA0A4D7FA2D5",
|
"6E82F6B54A0E9DEBE4A8B3043EE3B24CD9BBB62B4416B0482582E419A2552E29AB4BEA0A4D7FA2D5",
|
||||||
"",
|
"",
|
||||||
0x16));
|
0x16);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003005000000000, 0x0009, KEY_APP,
|
||||||
new SELF_KEY(0x0003005000000000, 0x0009, KEY_APP,
|
|
||||||
"F69E4A2934F114D89F386CE766388366CDD210F1D8913E3B973257F1201D632B",
|
"F69E4A2934F114D89F386CE766388366CDD210F1D8913E3B973257F1201D632B",
|
||||||
"F4D535069301EE888CC2A852DB654461",
|
"F4D535069301EE888CC2A852DB654461",
|
||||||
"1D7B974D10E61C2ED087A0981535904677EC07E96260F89565FF7EBDA4EE035C2AA9BCBDD5893F99",
|
"1D7B974D10E61C2ED087A0981535904677EC07E96260F89565FF7EBDA4EE035C2AA9BCBDD5893F99",
|
||||||
"",
|
"",
|
||||||
0x2D));
|
0x2D);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003005500000000, 0x000A, KEY_APP,
|
||||||
new SELF_KEY(0x0003005500000000, 0x000A, KEY_APP,
|
|
||||||
"29805302E7C92F204009161CA93F776A072141A8C46A108E571C46D473A176A3",
|
"29805302E7C92F204009161CA93F776A072141A8C46A108E571C46D473A176A3",
|
||||||
"5D1FAB844107676ABCDFC25EAEBCB633",
|
"5D1FAB844107676ABCDFC25EAEBCB633",
|
||||||
"09301B6436C85B53CB1585300A3F1AF9FB14DB7C30088C4642AD66D5C148B8995BB1A698A8C71827",
|
"09301B6436C85B53CB1585300A3F1AF9FB14DB7C30088C4642AD66D5C148B8995BB1A698A8C71827",
|
||||||
"0010818ED8A666051C6198662C3D6DDE2CA4901DDC",
|
"0010818ED8A666051C6198662C3D6DDE2CA4901DDC",
|
||||||
0x25));
|
0x25);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003005500000000, 0x000B, KEY_APP,
|
||||||
new SELF_KEY(0x0003005500000000, 0x000B, KEY_APP,
|
|
||||||
"A4C97402CC8A71BC7748661FE9CE7DF44DCE95D0D58938A59F47B9E9DBA7BFC3",
|
"A4C97402CC8A71BC7748661FE9CE7DF44DCE95D0D58938A59F47B9E9DBA7BFC3",
|
||||||
"E4792F2B9DB30CB8D1596077A13FB3B5",
|
"E4792F2B9DB30CB8D1596077A13FB3B5",
|
||||||
"2733C889D289550FE00EAA5A47A34CEF0C1AF187610EB07BA35D2C09BB73C80B244EB4147700D1BF",
|
"2733C889D289550FE00EAA5A47A34CEF0C1AF187610EB07BA35D2C09BB73C80B244EB4147700D1BF",
|
||||||
"",
|
"",
|
||||||
0x26));
|
0x26);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003005500000000, 0x000C, KEY_APP,
|
||||||
new SELF_KEY(0x0003005500000000, 0x000C, KEY_APP,
|
|
||||||
"9814EFFF67B7074D1B263BF85BDC8576CE9DEC914123971B169472A1BC2387FA",
|
"9814EFFF67B7074D1B263BF85BDC8576CE9DEC914123971B169472A1BC2387FA",
|
||||||
"D43B1FA8BE15714B3078C23908BB2BCA",
|
"D43B1FA8BE15714B3078C23908BB2BCA",
|
||||||
"7D1986C6BEE6CE1E0C5893BD2DF203881F40D5056761CC3F1F2E9D9A378617A2DE40BA5F09844CEB",
|
"7D1986C6BEE6CE1E0C5893BD2DF203881F40D5056761CC3F1F2E9D9A378617A2DE40BA5F09844CEB",
|
||||||
"",
|
"",
|
||||||
0x3D));
|
0x3D);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003005600000000, 0x000D, KEY_APP,
|
||||||
new SELF_KEY(0x0003005600000000, 0x000D, KEY_APP,
|
|
||||||
"03B4C421E0C0DE708C0F0B71C24E3EE04306AE7383D8C5621394CCB99FF7A194",
|
"03B4C421E0C0DE708C0F0B71C24E3EE04306AE7383D8C5621394CCB99FF7A194",
|
||||||
"5ADB9EAFE897B54CB1060D6885BE22CF",
|
"5ADB9EAFE897B54CB1060D6885BE22CF",
|
||||||
"71502ADB5783583AB88B2D5F23F419AF01C8B1E72FCA1E694AD49FE3266F1F9C61EFC6F29B351142",
|
"71502ADB5783583AB88B2D5F23F419AF01C8B1E72FCA1E694AD49FE3266F1F9C61EFC6F29B351142",
|
||||||
"",
|
"",
|
||||||
0x12));
|
0x12);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003005600000000, 0x000E, KEY_APP,
|
||||||
new SELF_KEY(0x0003005600000000, 0x000E, KEY_APP,
|
|
||||||
"39A870173C226EB8A3EEE9CA6FB675E82039B2D0CCB22653BFCE4DB013BAEA03",
|
"39A870173C226EB8A3EEE9CA6FB675E82039B2D0CCB22653BFCE4DB013BAEA03",
|
||||||
"90266C98CBAA06C1BF145FF760EA1B45",
|
"90266C98CBAA06C1BF145FF760EA1B45",
|
||||||
"84DE5692809848E5ACBE25BE548F6981E3DB14735A5DDE1A0FD1F475866532B862B1AB6A004B7255",
|
"84DE5692809848E5ACBE25BE548F6981E3DB14735A5DDE1A0FD1F475866532B862B1AB6A004B7255",
|
||||||
"",
|
"",
|
||||||
0x27));
|
0x27);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003005600000000, 0x000F, KEY_APP,
|
||||||
new SELF_KEY(0x0003005600000000, 0x000F, KEY_APP,
|
|
||||||
"FD52DFA7C6EEF5679628D12E267AA863B9365E6DB95470949CFD235B3FCA0F3B",
|
"FD52DFA7C6EEF5679628D12E267AA863B9365E6DB95470949CFD235B3FCA0F3B",
|
||||||
"64F50296CF8CF49CD7C643572887DA0B",
|
"64F50296CF8CF49CD7C643572887DA0B",
|
||||||
"0696D6CCBD7CF585EF5E00D547503C185D7421581BAD196E081723CD0A97FA40B2C0CD2492B0B5A1",
|
"0696D6CCBD7CF585EF5E00D547503C185D7421581BAD196E081723CD0A97FA40B2C0CD2492B0B5A1",
|
||||||
"",
|
"",
|
||||||
0x3A));
|
0x3A);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003006100000000, 0x0010, KEY_APP,
|
||||||
new SELF_KEY(0x0003006100000000, 0x0010, KEY_APP,
|
|
||||||
"A5E51AD8F32FFBDE808972ACEE46397F2D3FE6BC823C8218EF875EE3A9B0584F",
|
"A5E51AD8F32FFBDE808972ACEE46397F2D3FE6BC823C8218EF875EE3A9B0584F",
|
||||||
"7A203D5112F799979DF0E1B8B5B52AA4",
|
"7A203D5112F799979DF0E1B8B5B52AA4",
|
||||||
"50597B7F680DD89F6594D9BDC0CBEE03666AB53647D0487F7F452FE2DD02694631EA755548C9E934",
|
"50597B7F680DD89F6594D9BDC0CBEE03666AB53647D0487F7F452FE2DD02694631EA755548C9E934",
|
||||||
"",
|
"",
|
||||||
0x25));
|
0x25);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003006100000000, 0x0011, KEY_APP,
|
||||||
new SELF_KEY(0x0003006100000000, 0x0011, KEY_APP,
|
|
||||||
"0F8EAB8884A51D092D7250597388E3B8B75444AC138B9D36E5C7C5B8C3DF18FD",
|
"0F8EAB8884A51D092D7250597388E3B8B75444AC138B9D36E5C7C5B8C3DF18FD",
|
||||||
"97AF39C383E7EF1C98FA447C597EA8FE",
|
"97AF39C383E7EF1C98FA447C597EA8FE",
|
||||||
"2FDA7A56AAEA65921C0284FF1942C6DE137370093D106034B59191951A5201B422D462F8726F852D",
|
"2FDA7A56AAEA65921C0284FF1942C6DE137370093D106034B59191951A5201B422D462F8726F852D",
|
||||||
"",
|
"",
|
||||||
0x26));
|
0x26);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003006600000000, 0x0013, KEY_APP,
|
||||||
new SELF_KEY(0x0003006600000000, 0x0013, KEY_APP,
|
|
||||||
"DBF62D76FC81C8AC92372A9D631DDC9219F152C59C4B20BFF8F96B64AB065E94",
|
"DBF62D76FC81C8AC92372A9D631DDC9219F152C59C4B20BFF8F96B64AB065E94",
|
||||||
"CB5DD4BE8CF115FFB25801BC6086E729",
|
"CB5DD4BE8CF115FFB25801BC6086E729",
|
||||||
"B26FE6D3E3A1E766FAE79A8E6A7F48998E7FC1E4B0AD8745FF54C018C2A6CC7A0DD7525FAFEA4917",
|
"B26FE6D3E3A1E766FAE79A8E6A7F48998E7FC1E4B0AD8745FF54C018C2A6CC7A0DD7525FAFEA4917",
|
||||||
"",
|
"",
|
||||||
0x12));
|
0x12);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003006600000000, 0x0014, KEY_APP,
|
||||||
new SELF_KEY(0x0003006600000000, 0x0014, KEY_APP,
|
|
||||||
"491B0D72BB21ED115950379F4564CE784A4BFAABB00E8CB71294B192B7B9F88E",
|
"491B0D72BB21ED115950379F4564CE784A4BFAABB00E8CB71294B192B7B9F88E",
|
||||||
"F98843588FED8B0E62D7DDCB6F0CECF4",
|
"F98843588FED8B0E62D7DDCB6F0CECF4",
|
||||||
"04275E8838EF95BD013B223C3DF674540932F21B534C7ED2944B9104D938FEB03B824DDB866AB26E",
|
"04275E8838EF95BD013B223C3DF674540932F21B534C7ED2944B9104D938FEB03B824DDB866AB26E",
|
||||||
"",
|
"",
|
||||||
0x27));
|
0x27);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003007400000000, 0x0016, KEY_APP,
|
||||||
new SELF_KEY(0x0003007400000000, 0x0016, KEY_APP,
|
|
||||||
"A106692224F1E91E1C4EBAD4A25FBFF66B4B13E88D878E8CD072F23CD1C5BF7C",
|
"A106692224F1E91E1C4EBAD4A25FBFF66B4B13E88D878E8CD072F23CD1C5BF7C",
|
||||||
"62773C70BD749269C0AFD1F12E73909E",
|
"62773C70BD749269C0AFD1F12E73909E",
|
||||||
"566635D3E1DCEC47243AAD1628AE6B2CEB33463FC155E4635846CE33899C5E353DDFA47FEF5694AF",
|
"566635D3E1DCEC47243AAD1628AE6B2CEB33463FC155E4635846CE33899C5E353DDFA47FEF5694AF",
|
||||||
"",
|
"",
|
||||||
0x30));
|
0x30);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003007400000000, 0x0017, KEY_APP,
|
||||||
new SELF_KEY(0x0003007400000000, 0x0017, KEY_APP,
|
|
||||||
"4E104DCE09BA878C75DA98D0B1636F0E5F058328D81419E2A3D22AB0256FDF46",
|
"4E104DCE09BA878C75DA98D0B1636F0E5F058328D81419E2A3D22AB0256FDF46",
|
||||||
"954A86C4629E116532304A740862EF85",
|
"954A86C4629E116532304A740862EF85",
|
||||||
"3B7B04C71CAE2B1199D57453C038BB1B541A05AD1B94167B0AB47A9B24CAECB9000CB21407009666",
|
"3B7B04C71CAE2B1199D57453C038BB1B541A05AD1B94167B0AB47A9B24CAECB9000CB21407009666",
|
||||||
"",
|
"",
|
||||||
0x08));
|
0x08);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0003007400000000, 0x0018, KEY_APP,
|
||||||
new SELF_KEY(0x0003007400000000, 0x0018, KEY_APP,
|
|
||||||
"1F876AB252DDBCB70E74DC4A20CD8ED51E330E62490E652F862877E8D8D0F997",
|
"1F876AB252DDBCB70E74DC4A20CD8ED51E330E62490E652F862877E8D8D0F997",
|
||||||
"BF8D6B1887FA88E6D85C2EDB2FBEC147",
|
"BF8D6B1887FA88E6D85C2EDB2FBEC147",
|
||||||
"64A04126D77BF6B4D686F6E8F87DD150A5B014BA922D2B694FFF4453E11239A6E0B58F1703C51494",
|
"64A04126D77BF6B4D686F6E8F87DD150A5B014BA922D2B694FFF4453E11239A6E0B58F1703C51494",
|
||||||
"",
|
"",
|
||||||
0x11));
|
0x11);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0004001100000000, 0x0019, KEY_APP,
|
||||||
new SELF_KEY(0x0004001100000000, 0x0019, KEY_APP,
|
|
||||||
"3236B9937174DF1DC12EC2DD8A318A0EA4D3ECDEA5DFB4AC1B8278447000C297",
|
"3236B9937174DF1DC12EC2DD8A318A0EA4D3ECDEA5DFB4AC1B8278447000C297",
|
||||||
"6153DEE781B8ADDC6A439498B816DC46",
|
"6153DEE781B8ADDC6A439498B816DC46",
|
||||||
"148DCA961E2738BAF84B2D1B6E2DA2ABD6A95F2C9571E54C6922F9ED9674F062B7F1BE5BD6FA5268",
|
"148DCA961E2738BAF84B2D1B6E2DA2ABD6A95F2C9571E54C6922F9ED9674F062B7F1BE5BD6FA5268",
|
||||||
"",
|
"",
|
||||||
0x31));
|
0x31);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0004001100000000, 0x001A, KEY_APP,
|
||||||
new SELF_KEY(0x0004001100000000, 0x001A, KEY_APP,
|
|
||||||
"5EFD1E9961462794E3B9EF2A4D0C1F46F642AAE053B5025504130590E66F19C9",
|
"5EFD1E9961462794E3B9EF2A4D0C1F46F642AAE053B5025504130590E66F19C9",
|
||||||
"1AC8FA3B3C90F8FDE639515F91B58327",
|
"1AC8FA3B3C90F8FDE639515F91B58327",
|
||||||
"BE4B1B513536960618BFEF12A713F6673881B02F9DC616191E823FC8337CCF99ADAA6172019C0C23",
|
"BE4B1B513536960618BFEF12A713F6673881B02F9DC616191E823FC8337CCF99ADAA6172019C0C23",
|
||||||
"",
|
"",
|
||||||
0x17));
|
0x17);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0004001100000000, 0x001B, KEY_APP,
|
||||||
new SELF_KEY(0x0004001100000000, 0x001B, KEY_APP,
|
|
||||||
"66637570D1DEC098467DB207BAEA786861964D0964D4DBAF89E76F46955D181B",
|
"66637570D1DEC098467DB207BAEA786861964D0964D4DBAF89E76F46955D181B",
|
||||||
"9F7B5713A5ED59F6B35CD8F8A165D4B8",
|
"9F7B5713A5ED59F6B35CD8F8A165D4B8",
|
||||||
"4AB6FB1F6F0C3D9219923C1AC683137AB05DF667833CC6A5E8F590E4E28FE2EB180C7D5861117CFB",
|
"4AB6FB1F6F0C3D9219923C1AC683137AB05DF667833CC6A5E8F590E4E28FE2EB180C7D5861117CFB",
|
||||||
"",
|
"",
|
||||||
0x12));
|
0x12);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0004004600000000, 0x001C, KEY_APP,
|
||||||
new SELF_KEY(0x0004004600000000, 0x001C, KEY_APP,
|
|
||||||
"CFF025375BA0079226BE01F4A31F346D79F62CFB643CA910E16CF60BD9092752",
|
"CFF025375BA0079226BE01F4A31F346D79F62CFB643CA910E16CF60BD9092752",
|
||||||
"FD40664E2EBBA01BF359B0DCDF543DA4",
|
"FD40664E2EBBA01BF359B0DCDF543DA4",
|
||||||
"36C1ACE6DD5CCC0006FDF3424750FAC515FC5CFA2C93EC53C6EC2BC421708D154E91F2E7EA54A893",
|
"36C1ACE6DD5CCC0006FDF3424750FAC515FC5CFA2C93EC53C6EC2BC421708D154E91F2E7EA54A893",
|
||||||
"",
|
"",
|
||||||
0x09));
|
0x09);
|
||||||
sk_APP_arr.Move(
|
sk_APP_arr.emplace_back(0x0004004600000000, 0x001D, KEY_APP,
|
||||||
new SELF_KEY(0x0004004600000000, 0x001D, KEY_APP,
|
|
||||||
"D202174EB65A62048F3674B59EF6FE72E1872962F3E1CD658DE8D7AF71DA1F3E",
|
"D202174EB65A62048F3674B59EF6FE72E1872962F3E1CD658DE8D7AF71DA1F3E",
|
||||||
"ACB9945914EBB7B9A31ECE320AE09F2D",
|
"ACB9945914EBB7B9A31ECE320AE09F2D",
|
||||||
"430322887503CF52928FAAA410FD623C7321281C8825D95F5B47EF078EFCFC44454C3AB4F00BB879",
|
"430322887503CF52928FAAA410FD623C7321281C8825D95F5B47EF078EFCFC44454C3AB4F00BB879",
|
||||||
"",
|
"",
|
||||||
0x1A));
|
0x1A);
|
||||||
}
|
}
|
||||||
|
|
||||||
void KeyVault::LoadSelfNPDRMKeys()
|
void KeyVault::LoadSelfNPDRMKeys()
|
||||||
{
|
{
|
||||||
sk_NPDRM_arr.Clear();
|
sk_NPDRM_arr.clear();
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0001000000000000, 0x0001, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0001000000000000, 0x0001, KEY_NPDRM,
|
|
||||||
"F9EDD0301F770FABBA8863D9897F0FEA6551B09431F61312654E28F43533EA6B",
|
"F9EDD0301F770FABBA8863D9897F0FEA6551B09431F61312654E28F43533EA6B",
|
||||||
"A551CCB4A42C37A734A2B4F9657D5540",
|
"A551CCB4A42C37A734A2B4F9657D5540",
|
||||||
"B05F9DA5F9121EE4031467E74C505C29A8E29D1022379EDFF0500B9AE480B5DAB4578A4C61C5D6BF",
|
"B05F9DA5F9121EE4031467E74C505C29A8E29D1022379EDFF0500B9AE480B5DAB4578A4C61C5D6BF",
|
||||||
"00040AB47509BED04BD96521AD1B365B86BF620A98",
|
"00040AB47509BED04BD96521AD1B365B86BF620A98",
|
||||||
0x11));
|
0x11);
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0001000000000000, 0x0002, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0001000000000000, 0x0002, KEY_NPDRM,
|
|
||||||
"8E737230C80E66AD0162EDDD32F1F774EE5E4E187449F19079437A508FCF9C86",
|
"8E737230C80E66AD0162EDDD32F1F774EE5E4E187449F19079437A508FCF9C86",
|
||||||
"7AAECC60AD12AED90C348D8C11D2BED5",
|
"7AAECC60AD12AED90C348D8C11D2BED5",
|
||||||
"05BF09CB6FD78050C78DE69CC316FF27C9F1ED66A45BFCE0A1E5A6749B19BD546BBB4602CF373440",
|
"05BF09CB6FD78050C78DE69CC316FF27C9F1ED66A45BFCE0A1E5A6749B19BD546BBB4602CF373440",
|
||||||
"",
|
"",
|
||||||
0x0A));
|
0x0A);
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0003003000000000, 0x0003, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0003003000000000, 0x0003, KEY_NPDRM,
|
|
||||||
"1B715B0C3E8DC4C1A5772EBA9C5D34F7CCFE5B82025D453F3167566497239664",
|
"1B715B0C3E8DC4C1A5772EBA9C5D34F7CCFE5B82025D453F3167566497239664",
|
||||||
"E31E206FBB8AEA27FAB0D9A2FFB6B62F",
|
"E31E206FBB8AEA27FAB0D9A2FFB6B62F",
|
||||||
"3F51E59FC74D6618D34431FA67987FA11ABBFACC7111811473CD9988FE91C43FC74605E7B8CB732D",
|
"3F51E59FC74D6618D34431FA67987FA11ABBFACC7111811473CD9988FE91C43FC74605E7B8CB732D",
|
||||||
"",
|
"",
|
||||||
0x08));
|
0x08);
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0003004200000000, 0x0004, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0003004200000000, 0x0004, KEY_NPDRM,
|
|
||||||
"BB4DBF66B744A33934172D9F8379A7A5EA74CB0F559BB95D0E7AECE91702B706",
|
"BB4DBF66B744A33934172D9F8379A7A5EA74CB0F559BB95D0E7AECE91702B706",
|
||||||
"ADF7B207A15AC601110E61DDFC210AF6",
|
"ADF7B207A15AC601110E61DDFC210AF6",
|
||||||
"9C327471BAFF1F877AE4FE29F4501AF5AD6A2C459F8622697F583EFCA2CA30ABB5CD45D1131CAB30",
|
"9C327471BAFF1F877AE4FE29F4501AF5AD6A2C459F8622697F583EFCA2CA30ABB5CD45D1131CAB30",
|
||||||
"00B61A91DF4AB6A9F142C326BA9592B5265DA88856",
|
"00B61A91DF4AB6A9F142C326BA9592B5265DA88856",
|
||||||
0x16));
|
0x16);
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0003004200000000, 0x0006, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0003004200000000, 0x0006, KEY_NPDRM,
|
|
||||||
"8B4C52849765D2B5FA3D5628AFB17644D52B9FFEE235B4C0DB72A62867EAA020",
|
"8B4C52849765D2B5FA3D5628AFB17644D52B9FFEE235B4C0DB72A62867EAA020",
|
||||||
"05719DF1B1D0306C03910ADDCE4AF887",
|
"05719DF1B1D0306C03910ADDCE4AF887",
|
||||||
"2A5D6C6908CA98FC4740D834C6400E6D6AD74CF0A712CF1E7DAE806E98605CC308F6A03658F2970E",
|
"2A5D6C6908CA98FC4740D834C6400E6D6AD74CF0A712CF1E7DAE806E98605CC308F6A03658F2970E",
|
||||||
"",
|
"",
|
||||||
0x29));
|
0x29);
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0003005000000000, 0x0007, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0003005000000000, 0x0007, KEY_NPDRM,
|
|
||||||
"3946DFAA141718C7BE339A0D6C26301C76B568AEBC5CD52652F2E2E0297437C3",
|
"3946DFAA141718C7BE339A0D6C26301C76B568AEBC5CD52652F2E2E0297437C3",
|
||||||
"E4897BE553AE025CDCBF2B15D1C9234E",
|
"E4897BE553AE025CDCBF2B15D1C9234E",
|
||||||
"A13AFE8B63F897DA2D3DC3987B39389DC10BAD99DFB703838C4A0BC4E8BB44659C726CFD0CE60D0E",
|
"A13AFE8B63F897DA2D3DC3987B39389DC10BAD99DFB703838C4A0BC4E8BB44659C726CFD0CE60D0E",
|
||||||
"009EF86907782A318D4CC3617EBACE2480E73A46F6",
|
"009EF86907782A318D4CC3617EBACE2480E73A46F6",
|
||||||
0x17));
|
0x17);
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0003005000000000, 0x0009, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0003005000000000, 0x0009, KEY_NPDRM,
|
|
||||||
"0786F4B0CA5937F515BDCE188F569B2EF3109A4DA0780A7AA07BD89C3350810A",
|
"0786F4B0CA5937F515BDCE188F569B2EF3109A4DA0780A7AA07BD89C3350810A",
|
||||||
"04AD3C2F122A3B35E804850CAD142C6D",
|
"04AD3C2F122A3B35E804850CAD142C6D",
|
||||||
"A1FE61035DBBEA5A94D120D03C000D3B2F084B9F4AFA99A2D4A588DF92B8F36327CE9E47889A45D0",
|
"A1FE61035DBBEA5A94D120D03C000D3B2F084B9F4AFA99A2D4A588DF92B8F36327CE9E47889A45D0",
|
||||||
"",
|
"",
|
||||||
0x2A));
|
0x2A);
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0003005500000000, 0x000A, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0003005500000000, 0x000A, KEY_NPDRM,
|
|
||||||
"03C21AD78FBB6A3D425E9AAB1298F9FD70E29FD4E6E3A3C151205DA50C413DE4",
|
"03C21AD78FBB6A3D425E9AAB1298F9FD70E29FD4E6E3A3C151205DA50C413DE4",
|
||||||
"0A99D4D4F8301A88052D714AD2FB565E",
|
"0A99D4D4F8301A88052D714AD2FB565E",
|
||||||
"3995C390C9F7FBBAB124A1C14E70F9741A5E6BDF17A605D88239652C8EA7D5FC9F24B30546C1E44B",
|
"3995C390C9F7FBBAB124A1C14E70F9741A5E6BDF17A605D88239652C8EA7D5FC9F24B30546C1E44B",
|
||||||
"009AC6B22A056BA9E0B6D1520F28A57A3135483F9F",
|
"009AC6B22A056BA9E0B6D1520F28A57A3135483F9F",
|
||||||
0x27));
|
0x27);
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0003005500000000, 0x000C, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0003005500000000, 0x000C, KEY_NPDRM,
|
|
||||||
"357EBBEA265FAEC271182D571C6CD2F62CFA04D325588F213DB6B2E0ED166D92",
|
"357EBBEA265FAEC271182D571C6CD2F62CFA04D325588F213DB6B2E0ED166D92",
|
||||||
"D26E6DD2B74CD78E866E742E5571B84F",
|
"D26E6DD2B74CD78E866E742E5571B84F",
|
||||||
"00DCF5391618604AB42C8CFF3DC304DF45341EBA4551293E9E2B68FFE2DF527FFA3BE8329E015E57",
|
"00DCF5391618604AB42C8CFF3DC304DF45341EBA4551293E9E2B68FFE2DF527FFA3BE8329E015E57",
|
||||||
"",
|
"",
|
||||||
0x3A));
|
0x3A);
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0003005600000000, 0x000D, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0003005600000000, 0x000D, KEY_NPDRM,
|
|
||||||
"337A51416105B56E40D7CAF1B954CDAF4E7645F28379904F35F27E81CA7B6957",
|
"337A51416105B56E40D7CAF1B954CDAF4E7645F28379904F35F27E81CA7B6957",
|
||||||
"8405C88E042280DBD794EC7E22B74002",
|
"8405C88E042280DBD794EC7E22B74002",
|
||||||
"9BFF1CC7118D2393DE50D5CF44909860683411A532767BFDAC78622DB9E5456753FE422CBAFA1DA1",
|
"9BFF1CC7118D2393DE50D5CF44909860683411A532767BFDAC78622DB9E5456753FE422CBAFA1DA1",
|
||||||
"",
|
"",
|
||||||
0x18));
|
0x18);
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0003005600000000, 0x000F, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0003005600000000, 0x000F, KEY_NPDRM,
|
|
||||||
"135C098CBE6A3E037EBE9F2BB9B30218DDE8D68217346F9AD33203352FBB3291",
|
"135C098CBE6A3E037EBE9F2BB9B30218DDE8D68217346F9AD33203352FBB3291",
|
||||||
"4070C898C2EAAD1634A288AA547A35A8",
|
"4070C898C2EAAD1634A288AA547A35A8",
|
||||||
"BBD7CCCB556C2EF0F908DC7810FAFC37F2E56B3DAA5F7FAF53A4944AA9B841F76AB091E16B231433",
|
"BBD7CCCB556C2EF0F908DC7810FAFC37F2E56B3DAA5F7FAF53A4944AA9B841F76AB091E16B231433",
|
||||||
"",
|
"",
|
||||||
0x3B));
|
0x3B);
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0003006100000000, 0x0010, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0003006100000000, 0x0010, KEY_NPDRM,
|
|
||||||
"4B3CD10F6A6AA7D99F9B3A660C35ADE08EF01C2C336B9E46D1BB5678B4261A61",
|
"4B3CD10F6A6AA7D99F9B3A660C35ADE08EF01C2C336B9E46D1BB5678B4261A61",
|
||||||
"C0F2AB86E6E0457552DB50D7219371C5",
|
"C0F2AB86E6E0457552DB50D7219371C5",
|
||||||
"64A5C60BC2AD18B8A237E4AA690647E12BF7A081523FAD4F29BE89ACAC72F7AB43C74EC9AFFDA213",
|
"64A5C60BC2AD18B8A237E4AA690647E12BF7A081523FAD4F29BE89ACAC72F7AB43C74EC9AFFDA213",
|
||||||
"",
|
"",
|
||||||
0x27));
|
0x27);
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0003006600000000, 0x0013, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0003006600000000, 0x0013, KEY_NPDRM,
|
|
||||||
"265C93CF48562EC5D18773BEB7689B8AD10C5EB6D21421455DEBC4FB128CBF46",
|
"265C93CF48562EC5D18773BEB7689B8AD10C5EB6D21421455DEBC4FB128CBF46",
|
||||||
"8DEA5FF959682A9B98B688CEA1EF4A1D",
|
"8DEA5FF959682A9B98B688CEA1EF4A1D",
|
||||||
"9D8DB5A880608DC69717991AFC3AD5C0215A5EE413328C2ABC8F35589E04432373DB2E2339EEF7C8",
|
"9D8DB5A880608DC69717991AFC3AD5C0215A5EE413328C2ABC8F35589E04432373DB2E2339EEF7C8",
|
||||||
"",
|
"",
|
||||||
0x18));
|
0x18);
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0003007400000000, 0x0016, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0003007400000000, 0x0016, KEY_NPDRM,
|
|
||||||
"7910340483E419E55F0D33E4EA5410EEEC3AF47814667ECA2AA9D75602B14D4B",
|
"7910340483E419E55F0D33E4EA5410EEEC3AF47814667ECA2AA9D75602B14D4B",
|
||||||
"4AD981431B98DFD39B6388EDAD742A8E",
|
"4AD981431B98DFD39B6388EDAD742A8E",
|
||||||
"62DFE488E410B1B6B2F559E4CB932BCB78845AB623CC59FDF65168400FD76FA82ED1DC60E091D1D1",
|
"62DFE488E410B1B6B2F559E4CB932BCB78845AB623CC59FDF65168400FD76FA82ED1DC60E091D1D1",
|
||||||
"",
|
"",
|
||||||
0x25));
|
0x25);
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0004001100000000, 0x0019, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0004001100000000, 0x0019, KEY_NPDRM,
|
|
||||||
"FBDA75963FE690CFF35B7AA7B408CF631744EDEF5F7931A04D58FD6A921FFDB3",
|
"FBDA75963FE690CFF35B7AA7B408CF631744EDEF5F7931A04D58FD6A921FFDB3",
|
||||||
"F72C1D80FFDA2E3BF085F4133E6D2805",
|
"F72C1D80FFDA2E3BF085F4133E6D2805",
|
||||||
"637EAD34E7B85C723C627E68ABDD0419914EBED4008311731DD87FDDA2DAF71F856A70E14DA17B42",
|
"637EAD34E7B85C723C627E68ABDD0419914EBED4008311731DD87FDDA2DAF71F856A70E14DA17B42",
|
||||||
"",
|
"",
|
||||||
0x24));
|
0x24);
|
||||||
sk_NPDRM_arr.Move(
|
sk_NPDRM_arr.emplace_back(0x0004004600000000, 0x001C, KEY_NPDRM,
|
||||||
new SELF_KEY(0x0004004600000000, 0x001C, KEY_NPDRM,
|
|
||||||
"8103EA9DB790578219C4CEDF0592B43064A7D98B601B6C7BC45108C4047AA80F",
|
"8103EA9DB790578219C4CEDF0592B43064A7D98B601B6C7BC45108C4047AA80F",
|
||||||
"246F4B8328BE6A2D394EDE20479247C5",
|
"246F4B8328BE6A2D394EDE20479247C5",
|
||||||
"503172C9551308A87621ECEE90362D14889BFED2CF32B0B3E32A4F9FE527A41464B735E1ADBC6762",
|
"503172C9551308A87621ECEE90362D14889BFED2CF32B0B3E32A4F9FE527A41464B735E1ADBC6762",
|
||||||
"",
|
"",
|
||||||
0x30));
|
0x30);
|
||||||
}
|
}
|
||||||
|
|
||||||
void KeyVault::LoadSelfUNK7Keys()
|
void KeyVault::LoadSelfUNK7Keys()
|
||||||
{
|
{
|
||||||
sk_UNK7_arr.Clear();
|
sk_UNK7_arr.clear();
|
||||||
sk_UNK7_arr.Move(
|
sk_UNK7_arr.emplace_back(0x0003003000000000, 0x0000, KEY_UNK7,
|
||||||
new SELF_KEY(0x0003003000000000, 0x0000, KEY_UNK7,
|
|
||||||
"D91166973979EA8694476B011AC62C7E9F37DA26DE1E5C2EE3D66E42B8517085",
|
"D91166973979EA8694476B011AC62C7E9F37DA26DE1E5C2EE3D66E42B8517085",
|
||||||
"DC01280A6E46BC674B81A7E8801EBE6E",
|
"DC01280A6E46BC674B81A7E8801EBE6E",
|
||||||
"A0FC44108236141BF3517A662B027AFC1AC513A05690496C754DEB7D43BDC41B80FD75C212624EE4",
|
"A0FC44108236141BF3517A662B027AFC1AC513A05690496C754DEB7D43BDC41B80FD75C212624EE4",
|
||||||
"",
|
"",
|
||||||
0x11));
|
0x11);
|
||||||
sk_UNK7_arr.Move(
|
sk_UNK7_arr.emplace_back(0x0003004200000000, 0x0000, KEY_UNK7,
|
||||||
new SELF_KEY(0x0003004200000000, 0x0000, KEY_UNK7,
|
|
||||||
"B73111B0B00117E48DE5E2EE5E534C0F0EFFA4890BBB8CAD01EE0F848F91583E",
|
"B73111B0B00117E48DE5E2EE5E534C0F0EFFA4890BBB8CAD01EE0F848F91583E",
|
||||||
"86F56F9E5DE513894874B8BA253334B1",
|
"86F56F9E5DE513894874B8BA253334B1",
|
||||||
"B0BA1A1AB9723BB4E87CED9637BE056066BC56E16572D43D0210A06411DBF8FEB8885CD912384AE5",
|
"B0BA1A1AB9723BB4E87CED9637BE056066BC56E16572D43D0210A06411DBF8FEB8885CD912384AE5",
|
||||||
"",
|
"",
|
||||||
0x12));
|
0x12);
|
||||||
sk_UNK7_arr.Move(
|
sk_UNK7_arr.emplace_back(0x0003005000000000, 0x0000, KEY_UNK7,
|
||||||
new SELF_KEY(0x0003005000000000, 0x0000, KEY_UNK7,
|
|
||||||
"8E944267C02E69A4FE474B7F5FCD7974A4F936FF4355AEC4F80EFA123858D8F6",
|
"8E944267C02E69A4FE474B7F5FCD7974A4F936FF4355AEC4F80EFA123858D8F6",
|
||||||
"908A75754E521EAC2F5A4889C6D7B72D",
|
"908A75754E521EAC2F5A4889C6D7B72D",
|
||||||
"91201DA7D79E8EE2563142ECBD646DA026C963AC09E760E5390FFE24DAE6864310ABE147F8204D0B",
|
"91201DA7D79E8EE2563142ECBD646DA026C963AC09E760E5390FFE24DAE6864310ABE147F8204D0B",
|
||||||
"",
|
"",
|
||||||
0x13));
|
0x13);
|
||||||
sk_UNK7_arr.Move(
|
sk_UNK7_arr.emplace_back(0x0003005500000000, 0x0000, KEY_UNK7,
|
||||||
new SELF_KEY(0x0003005500000000, 0x0000, KEY_UNK7,
|
|
||||||
"BB31DF9A6F62C0DF853075FAA65134D9CE2240306C1731D1F7DA9B5329BD699F",
|
"BB31DF9A6F62C0DF853075FAA65134D9CE2240306C1731D1F7DA9B5329BD699F",
|
||||||
"263057225873F83940A65C8C926AC3E4",
|
"263057225873F83940A65C8C926AC3E4",
|
||||||
"BC3A82A4F44C43A197070CD236FDC94FCC542D69A3E803E0AFF78D1F3DA19A79D2F61FAB5B94B437",
|
"BC3A82A4F44C43A197070CD236FDC94FCC542D69A3E803E0AFF78D1F3DA19A79D2F61FAB5B94B437",
|
||||||
"",
|
"",
|
||||||
0x23));
|
0x23);
|
||||||
sk_UNK7_arr.Move(
|
sk_UNK7_arr.emplace_back(0x0003005600000000, 0x0000, KEY_UNK7,
|
||||||
new SELF_KEY(0x0003005600000000, 0x0000, KEY_UNK7,
|
|
||||||
"71AA75C70A255580E4AE9BDAA0B08828C53EAA713CD0713797F143B284C1589B",
|
"71AA75C70A255580E4AE9BDAA0B08828C53EAA713CD0713797F143B284C1589B",
|
||||||
"9DED878CB6BA07121C0F50E7B172A8BF",
|
"9DED878CB6BA07121C0F50E7B172A8BF",
|
||||||
"387FCDAEAFF1B59CFAF79CE6215A065ACEAFFAF4048A4F217E1FF5CE67C66EC3F089DB235E52F9D3",
|
"387FCDAEAFF1B59CFAF79CE6215A065ACEAFFAF4048A4F217E1FF5CE67C66EC3F089DB235E52F9D3",
|
||||||
"",
|
"",
|
||||||
0x29));
|
0x29);
|
||||||
sk_UNK7_arr.Move(
|
sk_UNK7_arr.emplace_back(0x0003006100000000, 0x0000, KEY_UNK7,
|
||||||
new SELF_KEY(0x0003006100000000, 0x0000, KEY_UNK7,
|
|
||||||
"F5D1DBC182F5083CD4EA37C431C7DAC73882C07F232D2699B1DD9FDDF1BF4195",
|
"F5D1DBC182F5083CD4EA37C431C7DAC73882C07F232D2699B1DD9FDDF1BF4195",
|
||||||
"D3A7C3C91CBA014FCBCA6D5570DE13FF",
|
"D3A7C3C91CBA014FCBCA6D5570DE13FF",
|
||||||
"97CA8A9781F45E557E98F176EF794FCDA6B151EB3DFD1ABA12151E00AE59957C3B15628FC8875D28",
|
"97CA8A9781F45E557E98F176EF794FCDA6B151EB3DFD1ABA12151E00AE59957C3B15628FC8875D28",
|
||||||
"",
|
"",
|
||||||
0x23));
|
0x23);
|
||||||
sk_UNK7_arr.Move(
|
sk_UNK7_arr.emplace_back(0x0003006600000000, 0x0000, KEY_UNK7,
|
||||||
new SELF_KEY(0x0003006600000000, 0x0000, KEY_UNK7,
|
|
||||||
"BF10F09590C0152F7EF749FF4B990122A4E8E5491DA49A2D931E72EEB990F860",
|
"BF10F09590C0152F7EF749FF4B990122A4E8E5491DA49A2D931E72EEB990F860",
|
||||||
"22C19C5522F7A782AFC547C2640F5BDE",
|
"22C19C5522F7A782AFC547C2640F5BDE",
|
||||||
"3233BA2B284189FB1687DF653002257A0925D8EB0C64EBBE8CC7DE87F548D107DE1FD3D1D285DB4F",
|
"3233BA2B284189FB1687DF653002257A0925D8EB0C64EBBE8CC7DE87F548D107DE1FD3D1D285DB4F",
|
||||||
"",
|
"",
|
||||||
0x29));
|
0x29);
|
||||||
sk_UNK7_arr.Move(
|
sk_UNK7_arr.emplace_back(0x0003007400000000, 0x0000, KEY_UNK7,
|
||||||
new SELF_KEY(0x0003007400000000, 0x0000, KEY_UNK7,
|
|
||||||
"F11DBD2C97B32AD37E55F8E743BC821D3E67630A6784D9A058DDD26313482F0F",
|
"F11DBD2C97B32AD37E55F8E743BC821D3E67630A6784D9A058DDD26313482F0F",
|
||||||
"FC5FA12CA3D2D336C4B8B425D679DA55",
|
"FC5FA12CA3D2D336C4B8B425D679DA55",
|
||||||
"19E27EE90E33EDAB16B22E688B5F704E5C6EC1062070EBF43554CD03DFDAE16D684BB8B5574DBECA",
|
"19E27EE90E33EDAB16B22E688B5F704E5C6EC1062070EBF43554CD03DFDAE16D684BB8B5574DBECA",
|
||||||
"",
|
"",
|
||||||
0x15));
|
0x15);
|
||||||
sk_UNK7_arr.Move(
|
sk_UNK7_arr.emplace_back(0x0004001100000000, 0x0000, KEY_UNK7,
|
||||||
new SELF_KEY(0x0004001100000000, 0x0000, KEY_UNK7,
|
|
||||||
"751EE949CD3ADF50A469197494A1EC358409CCBE6E85217EBDE7A87D3FF1ABD8",
|
"751EE949CD3ADF50A469197494A1EC358409CCBE6E85217EBDE7A87D3FF1ABD8",
|
||||||
"23AE4ADA4D3F798DC5ED98000337FF77",
|
"23AE4ADA4D3F798DC5ED98000337FF77",
|
||||||
"1BABA87CD1AD705C462D4E7427B6DAF59A50383A348A15088F0EDFCF1ADF2B5C2B2D507B2A357D36",
|
"1BABA87CD1AD705C462D4E7427B6DAF59A50383A348A15088F0EDFCF1ADF2B5C2B2D507B2A357D36",
|
||||||
"",
|
"",
|
||||||
0x1A));
|
0x1A);
|
||||||
sk_UNK7_arr.Move(
|
sk_UNK7_arr.emplace_back(0x0004004600000000, 0x0000, KEY_UNK7,
|
||||||
new SELF_KEY(0x0004004600000000, 0x0000, KEY_UNK7,
|
|
||||||
"46BD0891224E0CE13E2162921D4BB76193AEEE4416A729FCDD111C5536BF87C9",
|
"46BD0891224E0CE13E2162921D4BB76193AEEE4416A729FCDD111C5536BF87C9",
|
||||||
"BF036387CDB613C0AC88A6D9D2CC5316",
|
"BF036387CDB613C0AC88A6D9D2CC5316",
|
||||||
"A14F6D5F9AD7EBB3B7A39A7C32F13E5DC3B0BA16BDC33D39FDDF88F4AEEA6CFEEB0C0796C917A952",
|
"A14F6D5F9AD7EBB3B7A39A7C32F13E5DC3B0BA16BDC33D39FDDF88F4AEEA6CFEEB0C0796C917A952",
|
||||||
"",
|
"",
|
||||||
0x0F));
|
0x0F);
|
||||||
}
|
}
|
||||||
|
|
||||||
SELF_KEY KeyVault::GetSelfLV0Key()
|
SELF_KEY KeyVault::GetSelfLV0Key()
|
||||||
|
|
@ -682,7 +593,7 @@ SELF_KEY KeyVault::GetSelfLV1Key(u64 version)
|
||||||
{
|
{
|
||||||
SELF_KEY key(0, 0, 0, "", "", "", "", 0);
|
SELF_KEY key(0, 0, 0, "", "", "", "", 0);
|
||||||
|
|
||||||
for(unsigned int i = 0; i < sk_LV1_arr.GetCount(); i++)
|
for(unsigned int i = 0; i < sk_LV1_arr.size(); i++)
|
||||||
{
|
{
|
||||||
if (sk_LV1_arr[i].version == version)
|
if (sk_LV1_arr[i].version == version)
|
||||||
{
|
{
|
||||||
|
|
@ -698,7 +609,7 @@ SELF_KEY KeyVault::GetSelfLV2Key(u64 version)
|
||||||
{
|
{
|
||||||
SELF_KEY key(0, 0, 0, "", "", "", "", 0);
|
SELF_KEY key(0, 0, 0, "", "", "", "", 0);
|
||||||
|
|
||||||
for(unsigned int i = 0; i < sk_LV2_arr.GetCount(); i++)
|
for(unsigned int i = 0; i < sk_LV2_arr.size(); i++)
|
||||||
{
|
{
|
||||||
if (sk_LV2_arr[i].version == version)
|
if (sk_LV2_arr[i].version == version)
|
||||||
{
|
{
|
||||||
|
|
@ -714,7 +625,7 @@ SELF_KEY KeyVault::GetSelfISOKey(u16 revision, u64 version)
|
||||||
{
|
{
|
||||||
SELF_KEY key(0, 0, 0, "", "", "", "", 0);
|
SELF_KEY key(0, 0, 0, "", "", "", "", 0);
|
||||||
|
|
||||||
for(unsigned int i = 0; i < sk_ISO_arr.GetCount(); i++)
|
for(unsigned int i = 0; i < sk_ISO_arr.size(); i++)
|
||||||
{
|
{
|
||||||
if ((sk_ISO_arr[i].version == version) &&
|
if ((sk_ISO_arr[i].version == version) &&
|
||||||
(sk_ISO_arr[i].revision == revision))
|
(sk_ISO_arr[i].revision == revision))
|
||||||
|
|
@ -731,7 +642,7 @@ SELF_KEY KeyVault::GetSelfAPPKey(u16 revision)
|
||||||
{
|
{
|
||||||
SELF_KEY key(0, 0, 0, "", "", "", "", 0);
|
SELF_KEY key(0, 0, 0, "", "", "", "", 0);
|
||||||
|
|
||||||
for(unsigned int i = 0; i < sk_APP_arr.GetCount(); i++)
|
for(unsigned int i = 0; i < sk_APP_arr.size(); i++)
|
||||||
{
|
{
|
||||||
if (sk_APP_arr[i].revision == revision)
|
if (sk_APP_arr[i].revision == revision)
|
||||||
{
|
{
|
||||||
|
|
@ -747,7 +658,7 @@ SELF_KEY KeyVault::GetSelfUNK7Key(u64 version)
|
||||||
{
|
{
|
||||||
SELF_KEY key(0, 0, 0, "", "", "", "", 0);
|
SELF_KEY key(0, 0, 0, "", "", "", "", 0);
|
||||||
|
|
||||||
for(unsigned int i = 0; i < sk_UNK7_arr.GetCount(); i++)
|
for(unsigned int i = 0; i < sk_UNK7_arr.size(); i++)
|
||||||
{
|
{
|
||||||
if (sk_UNK7_arr[i].version == version)
|
if (sk_UNK7_arr[i].version == version)
|
||||||
{
|
{
|
||||||
|
|
@ -763,7 +674,7 @@ SELF_KEY KeyVault::GetSelfNPDRMKey(u16 revision)
|
||||||
{
|
{
|
||||||
SELF_KEY key(0, 0, 0, "", "", "", "", 0);
|
SELF_KEY key(0, 0, 0, "", "", "", "", 0);
|
||||||
|
|
||||||
for(unsigned int i = 0; i < sk_NPDRM_arr.GetCount(); i++)
|
for(unsigned int i = 0; i < sk_NPDRM_arr.size(); i++)
|
||||||
{
|
{
|
||||||
if (sk_NPDRM_arr[i].revision == revision)
|
if (sk_NPDRM_arr[i].revision == revision)
|
||||||
{
|
{
|
||||||
|
|
@ -876,3 +787,4 @@ void rap_to_rif(unsigned char* rap, unsigned char* rif)
|
||||||
|
|
||||||
memcpy(rif, key, 0x10);
|
memcpy(rif, key, 0x10);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -117,14 +117,14 @@ static u8 EDAT_IV[0x10] = {
|
||||||
|
|
||||||
class KeyVault
|
class KeyVault
|
||||||
{
|
{
|
||||||
Array<SELF_KEY> sk_LV0_arr;
|
std::vector<SELF_KEY> sk_LV0_arr;
|
||||||
Array<SELF_KEY> sk_LV1_arr;
|
std::vector<SELF_KEY> sk_LV1_arr;
|
||||||
Array<SELF_KEY> sk_LV2_arr;
|
std::vector<SELF_KEY> sk_LV2_arr;
|
||||||
Array<SELF_KEY> sk_APP_arr;
|
std::vector<SELF_KEY> sk_APP_arr;
|
||||||
Array<SELF_KEY> sk_ISO_arr;
|
std::vector<SELF_KEY> sk_ISO_arr;
|
||||||
Array<SELF_KEY> sk_LDR_arr;
|
std::vector<SELF_KEY> sk_LDR_arr;
|
||||||
Array<SELF_KEY> sk_UNK7_arr;
|
std::vector<SELF_KEY> sk_UNK7_arr;
|
||||||
Array<SELF_KEY> sk_NPDRM_arr;
|
std::vector<SELF_KEY> sk_NPDRM_arr;
|
||||||
u8 klicensee_key[0x10];
|
u8 klicensee_key[0x10];
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ bool SELFDecrypter::LoadHeaders(bool isElf32)
|
||||||
// Read ELF program headers.
|
// Read ELF program headers.
|
||||||
if (isElf32)
|
if (isElf32)
|
||||||
{
|
{
|
||||||
phdr32_arr.Clear();
|
phdr32_arr.clear();
|
||||||
if(elf32_hdr.e_phoff == 0 && elf32_hdr.e_phnum)
|
if(elf32_hdr.e_phoff == 0 && elf32_hdr.e_phnum)
|
||||||
{
|
{
|
||||||
ConLog.Error("SELF: ELF program header offset is null!");
|
ConLog.Error("SELF: ELF program header offset is null!");
|
||||||
|
|
@ -45,14 +45,13 @@ bool SELFDecrypter::LoadHeaders(bool isElf32)
|
||||||
self_f.Seek(self_hdr.se_phdroff);
|
self_f.Seek(self_hdr.se_phdroff);
|
||||||
for(u32 i = 0; i < elf32_hdr.e_phnum; ++i)
|
for(u32 i = 0; i < elf32_hdr.e_phnum; ++i)
|
||||||
{
|
{
|
||||||
Elf32_Phdr* phdr = new Elf32_Phdr();
|
phdr32_arr.emplace_back();
|
||||||
phdr->Load(self_f);
|
phdr32_arr.back().Load(self_f);
|
||||||
phdr32_arr.Move(phdr);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
phdr64_arr.Clear();
|
phdr64_arr.clear();
|
||||||
if(elf64_hdr.e_phoff == 0 && elf64_hdr.e_phnum)
|
if(elf64_hdr.e_phoff == 0 && elf64_hdr.e_phnum)
|
||||||
{
|
{
|
||||||
ConLog.Error("SELF: ELF program header offset is null!");
|
ConLog.Error("SELF: ELF program header offset is null!");
|
||||||
|
|
@ -61,22 +60,20 @@ bool SELFDecrypter::LoadHeaders(bool isElf32)
|
||||||
self_f.Seek(self_hdr.se_phdroff);
|
self_f.Seek(self_hdr.se_phdroff);
|
||||||
for(u32 i = 0; i < elf64_hdr.e_phnum; ++i)
|
for(u32 i = 0; i < elf64_hdr.e_phnum; ++i)
|
||||||
{
|
{
|
||||||
Elf64_Phdr* phdr = new Elf64_Phdr();
|
phdr64_arr.emplace_back();
|
||||||
phdr->Load(self_f);
|
phdr64_arr.back().Load(self_f);
|
||||||
phdr64_arr.Move(phdr);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Read section info.
|
// Read section info.
|
||||||
secinfo_arr.Clear();
|
secinfo_arr.clear();
|
||||||
self_f.Seek(self_hdr.se_secinfoff);
|
self_f.Seek(self_hdr.se_secinfoff);
|
||||||
|
|
||||||
for(u32 i = 0; i < ((isElf32) ? elf32_hdr.e_phnum : elf64_hdr.e_phnum); ++i)
|
for(u32 i = 0; i < ((isElf32) ? elf32_hdr.e_phnum : elf64_hdr.e_phnum); ++i)
|
||||||
{
|
{
|
||||||
SectionInfo* sinfo = new SectionInfo();
|
secinfo_arr.emplace_back();
|
||||||
sinfo->Load(self_f);
|
secinfo_arr.back().Load(self_f);
|
||||||
secinfo_arr.Move(sinfo);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read SCE version info.
|
// Read SCE version info.
|
||||||
|
|
@ -84,22 +81,22 @@ bool SELFDecrypter::LoadHeaders(bool isElf32)
|
||||||
scev_info.Load(self_f);
|
scev_info.Load(self_f);
|
||||||
|
|
||||||
// Read control info.
|
// Read control info.
|
||||||
ctrlinfo_arr.Clear();
|
ctrlinfo_arr.clear();
|
||||||
self_f.Seek(self_hdr.se_controloff);
|
self_f.Seek(self_hdr.se_controloff);
|
||||||
|
|
||||||
u32 i = 0;
|
u32 i = 0;
|
||||||
while(i < self_hdr.se_controlsize)
|
while(i < self_hdr.se_controlsize)
|
||||||
{
|
{
|
||||||
ControlInfo* cinfo = new ControlInfo();
|
ctrlinfo_arr.emplace_back();
|
||||||
cinfo->Load(self_f);
|
ControlInfo &cinfo = ctrlinfo_arr.back();
|
||||||
i += cinfo->size;
|
cinfo.Load(self_f);
|
||||||
ctrlinfo_arr.Move(cinfo);
|
i += cinfo.size;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read ELF section headers.
|
// Read ELF section headers.
|
||||||
if (isElf32)
|
if (isElf32)
|
||||||
{
|
{
|
||||||
shdr32_arr.Clear();
|
shdr32_arr.clear();
|
||||||
if(elf32_hdr.e_shoff == 0 && elf32_hdr.e_shnum)
|
if(elf32_hdr.e_shoff == 0 && elf32_hdr.e_shnum)
|
||||||
{
|
{
|
||||||
ConLog.Warning("SELF: ELF section header offset is null!");
|
ConLog.Warning("SELF: ELF section header offset is null!");
|
||||||
|
|
@ -108,14 +105,13 @@ bool SELFDecrypter::LoadHeaders(bool isElf32)
|
||||||
self_f.Seek(self_hdr.se_shdroff);
|
self_f.Seek(self_hdr.se_shdroff);
|
||||||
for(u32 i = 0; i < elf32_hdr.e_shnum; ++i)
|
for(u32 i = 0; i < elf32_hdr.e_shnum; ++i)
|
||||||
{
|
{
|
||||||
Elf32_Shdr* shdr = new Elf32_Shdr();
|
shdr32_arr.emplace_back();
|
||||||
shdr->Load(self_f);
|
shdr32_arr.back().Load(self_f);
|
||||||
shdr32_arr.Move(shdr);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
shdr64_arr.Clear();
|
shdr64_arr.clear();
|
||||||
if(elf64_hdr.e_shoff == 0 && elf64_hdr.e_shnum)
|
if(elf64_hdr.e_shoff == 0 && elf64_hdr.e_shnum)
|
||||||
{
|
{
|
||||||
ConLog.Warning("SELF: ELF section header offset is null!");
|
ConLog.Warning("SELF: ELF section header offset is null!");
|
||||||
|
|
@ -124,9 +120,8 @@ bool SELFDecrypter::LoadHeaders(bool isElf32)
|
||||||
self_f.Seek(self_hdr.se_shdroff);
|
self_f.Seek(self_hdr.se_shdroff);
|
||||||
for(u32 i = 0; i < elf64_hdr.e_shnum; ++i)
|
for(u32 i = 0; i < elf64_hdr.e_shnum; ++i)
|
||||||
{
|
{
|
||||||
Elf64_Shdr* shdr = new Elf64_Shdr();
|
shdr64_arr.emplace_back();
|
||||||
shdr->Load(self_f);
|
shdr64_arr.back().Load(self_f);
|
||||||
shdr64_arr.Move(shdr);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -153,12 +148,12 @@ void SELFDecrypter::ShowHeaders(bool isElf32)
|
||||||
ConLog.Write("----------------------------------------------------");
|
ConLog.Write("----------------------------------------------------");
|
||||||
ConLog.Write("ELF program headers");
|
ConLog.Write("ELF program headers");
|
||||||
ConLog.Write("----------------------------------------------------");
|
ConLog.Write("----------------------------------------------------");
|
||||||
for(unsigned int i = 0; i < ((isElf32) ? phdr32_arr.GetCount() : phdr64_arr.GetCount()); i++)
|
for(unsigned int i = 0; i < ((isElf32) ? phdr32_arr.size() : phdr64_arr.size()); i++)
|
||||||
isElf32 ? phdr32_arr[i].Show() : phdr64_arr[i].Show();
|
isElf32 ? phdr32_arr[i].Show() : phdr64_arr[i].Show();
|
||||||
ConLog.Write("----------------------------------------------------");
|
ConLog.Write("----------------------------------------------------");
|
||||||
ConLog.Write("Section info");
|
ConLog.Write("Section info");
|
||||||
ConLog.Write("----------------------------------------------------");
|
ConLog.Write("----------------------------------------------------");
|
||||||
for(unsigned int i = 0; i < secinfo_arr.GetCount(); i++)
|
for(unsigned int i = 0; i < secinfo_arr.size(); i++)
|
||||||
secinfo_arr[i].Show();
|
secinfo_arr[i].Show();
|
||||||
ConLog.Write("----------------------------------------------------");
|
ConLog.Write("----------------------------------------------------");
|
||||||
ConLog.Write("SCE version info");
|
ConLog.Write("SCE version info");
|
||||||
|
|
@ -167,12 +162,12 @@ void SELFDecrypter::ShowHeaders(bool isElf32)
|
||||||
ConLog.Write("----------------------------------------------------");
|
ConLog.Write("----------------------------------------------------");
|
||||||
ConLog.Write("Control info");
|
ConLog.Write("Control info");
|
||||||
ConLog.Write("----------------------------------------------------");
|
ConLog.Write("----------------------------------------------------");
|
||||||
for(unsigned int i = 0; i < ctrlinfo_arr.GetCount(); i++)
|
for(unsigned int i = 0; i < ctrlinfo_arr.size(); i++)
|
||||||
ctrlinfo_arr[i].Show();
|
ctrlinfo_arr[i].Show();
|
||||||
ConLog.Write("----------------------------------------------------");
|
ConLog.Write("----------------------------------------------------");
|
||||||
ConLog.Write("ELF section headers");
|
ConLog.Write("ELF section headers");
|
||||||
ConLog.Write("----------------------------------------------------");
|
ConLog.Write("----------------------------------------------------");
|
||||||
for(unsigned int i = 0; i < ((isElf32) ? shdr32_arr.GetCount() : shdr64_arr.GetCount()); i++)
|
for(unsigned int i = 0; i < ((isElf32) ? shdr32_arr.size() : shdr64_arr.size()); i++)
|
||||||
isElf32 ? shdr32_arr[i].Show() : shdr64_arr[i].Show();
|
isElf32 ? shdr32_arr[i].Show() : shdr64_arr[i].Show();
|
||||||
ConLog.Write("----------------------------------------------------");
|
ConLog.Write("----------------------------------------------------");
|
||||||
}
|
}
|
||||||
|
|
@ -185,7 +180,7 @@ bool SELFDecrypter::DecryptNPDRM(u8 *metadata, u32 metadata_size)
|
||||||
u8 npdrm_iv[0x10];
|
u8 npdrm_iv[0x10];
|
||||||
|
|
||||||
// Parse the control info structures to find the NPDRM control info.
|
// Parse the control info structures to find the NPDRM control info.
|
||||||
for(unsigned int i = 0; i < ctrlinfo_arr.GetCount(); i++)
|
for(unsigned int i = 0; i < ctrlinfo_arr.size(); i++)
|
||||||
{
|
{
|
||||||
if (ctrlinfo_arr[i].type == 3)
|
if (ctrlinfo_arr[i].type == 3)
|
||||||
{
|
{
|
||||||
|
|
@ -307,12 +302,11 @@ bool SELFDecrypter::LoadMetadata()
|
||||||
meta_hdr.Load(metadata_headers);
|
meta_hdr.Load(metadata_headers);
|
||||||
|
|
||||||
// Load the metadata section headers.
|
// Load the metadata section headers.
|
||||||
meta_shdr.Clear();
|
meta_shdr.clear();
|
||||||
for (unsigned int i = 0; i < meta_hdr.section_count; i++)
|
for (unsigned int i = 0; i < meta_hdr.section_count; i++)
|
||||||
{
|
{
|
||||||
MetadataSectionHeader* m_shdr = new MetadataSectionHeader();
|
meta_shdr.emplace_back();
|
||||||
m_shdr->Load(metadata_headers + sizeof(meta_hdr) + sizeof(MetadataSectionHeader) * i);
|
meta_shdr.back().Load(metadata_headers + sizeof(meta_hdr) + sizeof(MetadataSectionHeader) * i);
|
||||||
meta_shdr.Move(m_shdr);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Copy the decrypted data keys.
|
// Copy the decrypted data keys.
|
||||||
|
|
|
||||||
|
|
@ -463,23 +463,23 @@ class SELFDecrypter
|
||||||
|
|
||||||
// ELF64 header and program header/section header arrays.
|
// ELF64 header and program header/section header arrays.
|
||||||
Elf64_Ehdr elf64_hdr;
|
Elf64_Ehdr elf64_hdr;
|
||||||
Array<Elf64_Shdr> shdr64_arr;
|
std::vector<Elf64_Shdr> shdr64_arr;
|
||||||
Array<Elf64_Phdr> phdr64_arr;
|
std::vector<Elf64_Phdr> phdr64_arr;
|
||||||
|
|
||||||
// ELF32 header and program header/section header arrays.
|
// ELF32 header and program header/section header arrays.
|
||||||
Elf32_Ehdr elf32_hdr;
|
Elf32_Ehdr elf32_hdr;
|
||||||
Array<Elf32_Shdr> shdr32_arr;
|
std::vector<Elf32_Shdr> shdr32_arr;
|
||||||
Array<Elf32_Phdr> phdr32_arr;
|
std::vector<Elf32_Phdr> phdr32_arr;
|
||||||
|
|
||||||
// Decryption info structs.
|
// Decryption info structs.
|
||||||
Array<SectionInfo> secinfo_arr;
|
std::vector<SectionInfo> secinfo_arr;
|
||||||
SCEVersionInfo scev_info;
|
SCEVersionInfo scev_info;
|
||||||
Array<ControlInfo> ctrlinfo_arr;
|
std::vector<ControlInfo> ctrlinfo_arr;
|
||||||
|
|
||||||
// Metadata structs.
|
// Metadata structs.
|
||||||
MetadataInfo meta_info;
|
MetadataInfo meta_info;
|
||||||
MetadataHeader meta_hdr;
|
MetadataHeader meta_hdr;
|
||||||
Array<MetadataSectionHeader> meta_shdr;
|
std::vector<MetadataSectionHeader> meta_shdr;
|
||||||
|
|
||||||
// Internal data buffers.
|
// Internal data buffers.
|
||||||
u8 *data_keys;
|
u8 *data_keys;
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ struct AudioConfig //custom structure
|
||||||
u32 m_port_in_use;
|
u32 m_port_in_use;
|
||||||
u64 counter;
|
u64 counter;
|
||||||
u64 start_time;
|
u64 start_time;
|
||||||
Array<u64> m_keys;
|
std::vector<u64> m_keys;
|
||||||
|
|
||||||
AudioConfig()
|
AudioConfig()
|
||||||
: m_is_audio_initialized(false)
|
: m_is_audio_initialized(false)
|
||||||
|
|
|
||||||
|
|
@ -7,15 +7,15 @@ class CPUDecoder
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual u8 DecodeMemory(const u64 address)=0;
|
virtual u8 DecodeMemory(const u64 address)=0;
|
||||||
|
|
||||||
|
virtual ~CPUDecoder() = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename TO>
|
template<typename TO>
|
||||||
class InstrCaller
|
class InstrCaller
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual ~InstrCaller<TO>()
|
virtual ~InstrCaller<TO>() = default;
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void operator ()(TO* op, u32 code) const = 0;
|
virtual void operator ()(TO* op, u32 code) const = 0;
|
||||||
|
|
||||||
|
|
@ -334,6 +334,17 @@ public:
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
virtual ~InstrBase()
|
||||||
|
{
|
||||||
|
if (m_args) {
|
||||||
|
// m_args contains pointers to statically allocated CodeFieldBase objects
|
||||||
|
// We shouldn't call delete on these, they aren't allocated with new
|
||||||
|
|
||||||
|
// The m_args array itself, however, should be deleted
|
||||||
|
delete[] m_args;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
__forceinline const std::string& GetName() const
|
__forceinline const std::string& GetName() const
|
||||||
{
|
{
|
||||||
return m_name;
|
return m_name;
|
||||||
|
|
@ -355,13 +366,13 @@ public:
|
||||||
decode(op, code);
|
decode(op, code);
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 operator()(const Array<u32>& args) const
|
u32 operator()(const std::vector<u32>& args) const
|
||||||
{
|
{
|
||||||
return encode(args);
|
return encode(args);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void decode(TO* op, u32 code) const=0;
|
virtual void decode(TO* op, u32 code) const=0;
|
||||||
virtual u32 encode(const Array<u32>& args) const=0;
|
virtual u32 encode(const std::vector<u32>& args) const=0;
|
||||||
};
|
};
|
||||||
|
|
||||||
template<int _count, typename TO>
|
template<int _count, typename TO>
|
||||||
|
|
@ -396,13 +407,55 @@ public:
|
||||||
|
|
||||||
virtual ~InstrList()
|
virtual ~InstrList()
|
||||||
{
|
{
|
||||||
for(int i=0; i<count; ++i)
|
bool deletedErrorFunc = false;
|
||||||
|
|
||||||
|
// Clean up m_instrs
|
||||||
|
for(int i = 0; i < count; ++i)
|
||||||
{
|
{
|
||||||
delete m_instrs[i];
|
InstrCaller<TO>* deleteMe = m_instrs[i];
|
||||||
|
|
||||||
|
if (deleteMe) { // deleteMe will be a nullptr if we've already deleted it through another reference
|
||||||
|
// Remove any instances of pointers to this instruction caller from our m_instrs list
|
||||||
|
m_instrs[i] = nullptr;
|
||||||
|
for (int j = i + 1; j < count; j++) {
|
||||||
|
if (m_instrs[j] == deleteMe) {
|
||||||
|
m_instrs[j] = nullptr;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If we're deleting the error handler here, remember it so we don't try to delete it again later
|
||||||
|
if (deleteMe == m_error_func) {
|
||||||
|
deletedErrorFunc = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete the instruction caller
|
||||||
|
delete deleteMe;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clean up m_instrs_info
|
||||||
|
for (int i = 0; i < count; ++i)
|
||||||
|
{
|
||||||
|
InstrBase<TO>* deleteMe = m_instrs_info[i];
|
||||||
|
|
||||||
|
if (deleteMe) {
|
||||||
|
m_instrs_info[i] = nullptr;
|
||||||
|
for (int j = i + 1; j < count; j++) {
|
||||||
|
if (m_instrs_info[j] == deleteMe) {
|
||||||
|
m_instrs[j] = nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
delete deleteMe;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we haven't already deleted our error handler, and we have one, then delete it now
|
||||||
|
if (!deletedErrorFunc && m_error_func)
|
||||||
|
{
|
||||||
delete m_error_func;
|
delete m_error_func;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void set_parent(InstrCaller<TO>* parent, int opcode)
|
void set_parent(InstrCaller<TO>* parent, int opcode)
|
||||||
{
|
{
|
||||||
|
|
@ -508,9 +561,9 @@ public:
|
||||||
m_list.decode(op, opcode, code);
|
m_list.decode(op, opcode, code);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual u32 encode(const Array<u32>& args) const
|
virtual u32 encode(const std::vector<u32>& args) const
|
||||||
{
|
{
|
||||||
assert(args.GetCount() == InstrBase<TO>::m_args_count);
|
assert(args.size() == InstrBase<TO>::m_args_count);
|
||||||
return m_list.encode(opcode);
|
return m_list.encode(opcode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -547,9 +600,9 @@ public:
|
||||||
m_list.decode(op, opcode, code);
|
m_list.decode(op, opcode, code);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual u32 encode(const Array<u32>& args) const
|
virtual u32 encode(const std::vector<u32>& args) const
|
||||||
{
|
{
|
||||||
assert(args.GetCount() == InstrBase<TO>::m_args_count);
|
assert(args.size() == InstrBase<TO>::m_args_count);
|
||||||
return m_list.encode(opcode) | (*InstrBase<TO>::m_args[0])[args[0]];
|
return m_list.encode(opcode) | (*InstrBase<TO>::m_args[0])[args[0]];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -588,9 +641,9 @@ public:
|
||||||
m_list.decode(op, opcode, code);
|
m_list.decode(op, opcode, code);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual u32 encode(const Array<u32>& args) const
|
virtual u32 encode(const std::vector<u32>& args) const
|
||||||
{
|
{
|
||||||
assert(args.GetCount() == InstrBase<TO>::m_args_count);
|
assert(args.size() == InstrBase<TO>::m_args_count);
|
||||||
return m_list.encode(opcode) | (*InstrBase<TO>::m_args[0])[args[0]] | (*InstrBase<TO>::m_args[1])[args[1]];
|
return m_list.encode(opcode) | (*InstrBase<TO>::m_args[0])[args[0]] | (*InstrBase<TO>::m_args[1])[args[1]];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -631,9 +684,9 @@ public:
|
||||||
m_list.decode(op, opcode, code);
|
m_list.decode(op, opcode, code);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual u32 encode(const Array<u32>& args) const
|
virtual u32 encode(const std::vector<u32>& args) const
|
||||||
{
|
{
|
||||||
assert(args.GetCount() == InstrBase<TO>::m_args_count);
|
assert(args.size() == InstrBase<TO>::m_args_count);
|
||||||
return m_list.encode(opcode) | (*InstrBase<TO>::m_args[0])[args[0]] | (*InstrBase<TO>::m_args[1])[args[1]] | (*InstrBase<TO>::m_args[2])[args[2]];
|
return m_list.encode(opcode) | (*InstrBase<TO>::m_args[0])[args[0]] | (*InstrBase<TO>::m_args[1])[args[1]] | (*InstrBase<TO>::m_args[2])[args[2]];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -676,9 +729,9 @@ public:
|
||||||
m_list.decode(op, opcode, code);
|
m_list.decode(op, opcode, code);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual u32 encode(const Array<u32>& args) const
|
virtual u32 encode(const std::vector<u32>& args) const
|
||||||
{
|
{
|
||||||
assert(args.GetCount() == InstrBase<TO>::m_args_count);
|
assert(args.size() == InstrBase<TO>::m_args_count);
|
||||||
return m_list.encode(opcode) |
|
return m_list.encode(opcode) |
|
||||||
(*InstrBase<TO>::m_args[0])[args[0]] |
|
(*InstrBase<TO>::m_args[0])[args[0]] |
|
||||||
(*InstrBase<TO>::m_args[1])[args[1]] |
|
(*InstrBase<TO>::m_args[1])[args[1]] |
|
||||||
|
|
@ -731,9 +784,9 @@ public:
|
||||||
m_list.decode(op, opcode, code);
|
m_list.decode(op, opcode, code);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual u32 encode(const Array<u32>& args) const
|
virtual u32 encode(const std::vector<u32>& args) const
|
||||||
{
|
{
|
||||||
assert(args.GetCount() == InstrBase<TO>::m_args_count);
|
assert(args.size() == InstrBase<TO>::m_args_count);
|
||||||
return m_list.encode(opcode) |
|
return m_list.encode(opcode) |
|
||||||
(*InstrBase<TO>::m_args[0])[args[0]] |
|
(*InstrBase<TO>::m_args[0])[args[0]] |
|
||||||
(*InstrBase<TO>::m_args[1])[args[1]] |
|
(*InstrBase<TO>::m_args[1])[args[1]] |
|
||||||
|
|
@ -790,9 +843,9 @@ public:
|
||||||
m_list.decode(op, opcode, code);
|
m_list.decode(op, opcode, code);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual u32 encode(const Array<u32>& args) const
|
virtual u32 encode(const std::vector<u32>& args) const
|
||||||
{
|
{
|
||||||
assert(args.GetCount() == InstrBase<TO>::m_args_count);
|
assert(args.size() == InstrBase<TO>::m_args_count);
|
||||||
return m_list.encode(opcode) |
|
return m_list.encode(opcode) |
|
||||||
(*InstrBase<TO>::m_args[0])[args[0]] |
|
(*InstrBase<TO>::m_args[0])[args[0]] |
|
||||||
(*InstrBase<TO>::m_args[1])[args[1]] |
|
(*InstrBase<TO>::m_args[1])[args[1]] |
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ CPUThread::CPUThread(CPUThreadType type)
|
||||||
|
|
||||||
CPUThread::~CPUThread()
|
CPUThread::~CPUThread()
|
||||||
{
|
{
|
||||||
|
safe_delete(m_dec);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CPUThread::Close()
|
void CPUThread::Close()
|
||||||
|
|
@ -298,11 +299,11 @@ void CPUThread::Task()
|
||||||
{
|
{
|
||||||
if (Ini.HLELogging.GetValue()) ConLog.Write("%s enter", CPUThread::GetFName().c_str());
|
if (Ini.HLELogging.GetValue()) ConLog.Write("%s enter", CPUThread::GetFName().c_str());
|
||||||
|
|
||||||
const Array<u64>& bp = Emu.GetBreakPoints();
|
const std::vector<u64>& bp = Emu.GetBreakPoints();
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
for(uint i=0; i<bp.GetCount(); ++i)
|
for(uint i=0; i<bp.size(); ++i)
|
||||||
{
|
{
|
||||||
if(bp[i] == m_offset + PC)
|
if(bp[i] == m_offset + PC)
|
||||||
{
|
{
|
||||||
|
|
@ -335,7 +336,7 @@ void CPUThread::Task()
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(uint i=0; i<bp.GetCount(); ++i)
|
for(uint i=0; i<bp.size(); ++i)
|
||||||
{
|
{
|
||||||
if(bp[i] == PC)
|
if(bp[i] == PC)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -196,13 +196,13 @@ public:
|
||||||
u64 branch_pc;
|
u64 branch_pc;
|
||||||
};
|
};
|
||||||
|
|
||||||
Stack<CallStackItem> m_call_stack;
|
std::vector<CallStackItem> m_call_stack;
|
||||||
|
|
||||||
std::string CallStackToString()
|
std::string CallStackToString()
|
||||||
{
|
{
|
||||||
std::string ret = "Call Stack:\n==========\n";
|
std::string ret = "Call Stack:\n==========\n";
|
||||||
|
|
||||||
for(uint i=0; i<m_call_stack.GetCount(); ++i)
|
for(uint i=0; i<m_call_stack.size(); ++i)
|
||||||
{
|
{
|
||||||
ret += fmt::Format("0x%llx -> 0x%llx\n", m_call_stack[i].pc, m_call_stack[i].branch_pc);
|
ret += fmt::Format("0x%llx -> 0x%llx\n", m_call_stack[i].pc, m_call_stack[i].branch_pc);
|
||||||
}
|
}
|
||||||
|
|
@ -212,21 +212,25 @@ public:
|
||||||
|
|
||||||
void CallStackBranch(u64 pc)
|
void CallStackBranch(u64 pc)
|
||||||
{
|
{
|
||||||
for(int i=m_call_stack.GetCount() - 1; i >= 0; --i)
|
//look if we're jumping back and if so pop the stack back to that position
|
||||||
|
auto res = std::find_if(m_call_stack.rbegin(), m_call_stack.rend(),
|
||||||
|
[&pc, this](CallStackItem &it)
|
||||||
{
|
{
|
||||||
if(CallStackGetNextPC(m_call_stack[i].pc) == pc)
|
return CallStackGetNextPC(it.pc) == pc;
|
||||||
|
});
|
||||||
|
if (res != m_call_stack.rend())
|
||||||
{
|
{
|
||||||
m_call_stack.RemoveAt(i, m_call_stack.GetCount() - i);
|
m_call_stack.erase((res + 1).base(), m_call_stack.end());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
//add a new entry otherwise
|
||||||
CallStackItem new_item;
|
CallStackItem new_item;
|
||||||
|
|
||||||
new_item.branch_pc = pc;
|
new_item.branch_pc = pc;
|
||||||
new_item.pc = PC;
|
new_item.pc = PC;
|
||||||
|
|
||||||
m_call_stack.Push(new_item);
|
m_call_stack.push_back(new_item);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual u64 CallStackGetNextPC(u64 pc)
|
virtual u64 CallStackGetNextPC(u64 pc)
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ CPUThreadManager::~CPUThreadManager()
|
||||||
void CPUThreadManager::Close()
|
void CPUThreadManager::Close()
|
||||||
{
|
{
|
||||||
m_raw_spu_num = 0;
|
m_raw_spu_num = 0;
|
||||||
while(m_threads.GetCount()) RemoveThread(m_threads[0].GetId());
|
while(m_threads.size()) RemoveThread(m_threads[0]->GetId());
|
||||||
}
|
}
|
||||||
|
|
||||||
CPUThread& CPUThreadManager::AddThread(CPUThreadType type)
|
CPUThread& CPUThreadManager::AddThread(CPUThreadType type)
|
||||||
|
|
@ -38,7 +38,7 @@ CPUThread& CPUThreadManager::AddThread(CPUThreadType type)
|
||||||
|
|
||||||
new_thread->SetId(Emu.GetIdManager().GetNewID(fmt::Format("%s Thread", new_thread->GetTypeString().c_str()), new_thread));
|
new_thread->SetId(Emu.GetIdManager().GetNewID(fmt::Format("%s Thread", new_thread->GetTypeString().c_str()), new_thread));
|
||||||
|
|
||||||
m_threads.Add(new_thread);
|
m_threads.push_back(new_thread);
|
||||||
#ifndef QT_UI
|
#ifndef QT_UI
|
||||||
wxGetApp().SendDbgCommand(DID_CREATE_THREAD, new_thread);
|
wxGetApp().SendDbgCommand(DID_CREATE_THREAD, new_thread);
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -50,26 +50,34 @@ void CPUThreadManager::RemoveThread(const u32 id)
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(m_mtx_thread);
|
std::lock_guard<std::mutex> lock(m_mtx_thread);
|
||||||
|
|
||||||
for(u32 i=0; i<m_threads.GetCount(); ++i)
|
CPUThread* thr = nullptr;
|
||||||
|
u32 thread_index = 0;
|
||||||
|
|
||||||
|
for (u32 i = 0; i < m_threads.size(); ++i)
|
||||||
{
|
{
|
||||||
if(m_threads[i].m_wait_thread_id == id)
|
if (m_threads[i]->m_wait_thread_id == id)
|
||||||
{
|
{
|
||||||
m_threads[i].Wait(false);
|
m_threads[i]->Wait(false);
|
||||||
m_threads[i].m_wait_thread_id = -1;
|
m_threads[i]->m_wait_thread_id = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(m_threads[i].GetId() != id) continue;
|
if (m_threads[i]->GetId() != id) continue;
|
||||||
|
|
||||||
CPUThread* thr = &m_threads[i];
|
thr = m_threads[i];
|
||||||
|
thread_index = i;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (thr)
|
||||||
|
{
|
||||||
#ifndef QT_UI
|
#ifndef QT_UI
|
||||||
wxGetApp().SendDbgCommand(DID_REMOVE_THREAD, thr);
|
wxGetApp().SendDbgCommand(DID_REMOVE_THREAD, thr);
|
||||||
#endif
|
#endif
|
||||||
thr->Close();
|
thr->Close();
|
||||||
|
|
||||||
m_threads.RemoveFAt(i);
|
m_threads.erase(m_threads.begin() + thread_index);
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Removing the ID should trigger the actual deletion of the thread
|
||||||
Emu.GetIdManager().RemoveID(id);
|
Emu.GetIdManager().RemoveID(id);
|
||||||
Emu.CheckStatus();
|
Emu.CheckStatus();
|
||||||
}
|
}
|
||||||
|
|
@ -80,10 +88,10 @@ s32 CPUThreadManager::GetThreadNumById(CPUThreadType type, u32 id)
|
||||||
|
|
||||||
s32 num = 0;
|
s32 num = 0;
|
||||||
|
|
||||||
for(u32 i=0; i<m_threads.GetCount(); ++i)
|
for(u32 i=0; i<m_threads.size(); ++i)
|
||||||
{
|
{
|
||||||
if(m_threads[i].GetId() == id) return num;
|
if(m_threads[i]->GetId() == id) return num;
|
||||||
if(m_threads[i].GetType() == type) num++;
|
if(m_threads[i]->GetType() == type) num++;
|
||||||
}
|
}
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
|
|
@ -104,8 +112,8 @@ void CPUThreadManager::Exec()
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(m_mtx_thread);
|
std::lock_guard<std::mutex> lock(m_mtx_thread);
|
||||||
|
|
||||||
for(u32 i=0; i<m_threads.GetCount(); ++i)
|
for(u32 i=0; i<m_threads.size(); ++i)
|
||||||
{
|
{
|
||||||
m_threads[i].Exec();
|
m_threads[i]->Exec();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,9 @@ enum CPUThreadType : unsigned char;
|
||||||
|
|
||||||
class CPUThreadManager
|
class CPUThreadManager
|
||||||
{
|
{
|
||||||
ArrayF<CPUThread> m_threads;
|
std::vector<CPUThread*> m_threads;
|
||||||
std::mutex m_mtx_thread;
|
std::mutex m_mtx_thread;
|
||||||
wxSemaphore m_sem_task;
|
wxSemaphore m_sem_task;
|
||||||
Stack<u32> m_delete_threads;
|
|
||||||
u32 m_raw_spu_num;
|
u32 m_raw_spu_num;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
@ -19,7 +18,7 @@ public:
|
||||||
CPUThread& AddThread(CPUThreadType type);
|
CPUThread& AddThread(CPUThreadType type);
|
||||||
void RemoveThread(const u32 id);
|
void RemoveThread(const u32 id);
|
||||||
|
|
||||||
ArrayF<CPUThread>& GetThreads() { return m_threads; }
|
std::vector<CPUThread*>& GetThreads() { return m_threads; }
|
||||||
s32 GetThreadNumById(CPUThreadType type, u32 id);
|
s32 GetThreadNumById(CPUThreadType type, u32 id);
|
||||||
CPUThread* GetThread(u32 id);
|
CPUThread* GetThread(u32 id);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,8 @@ public:
|
||||||
virtual void Decode(const u32 code)=0;
|
virtual void Decode(const u32 code)=0;
|
||||||
|
|
||||||
virtual u8 DecodeMemory(const u64 address);
|
virtual u8 DecodeMemory(const u64 address);
|
||||||
|
|
||||||
|
virtual ~PPCDecoder() = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ class PPCThread : public CPUThread
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
u64 m_args[4];
|
u64 m_args[4];
|
||||||
Array<u64> m_argv_addr;
|
std::vector<u64> m_argv_addr;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual void InitRegs()=0;
|
virtual void InitRegs()=0;
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ PPCThreadManager::~PPCThreadManager()
|
||||||
|
|
||||||
void PPCThreadManager::Close()
|
void PPCThreadManager::Close()
|
||||||
{
|
{
|
||||||
while(m_threads.GetCount()) RemoveThread(m_threads[0].GetId());
|
while(m_threads.size()) RemoveThread(m_threads[0]->GetId());
|
||||||
}
|
}
|
||||||
|
|
||||||
PPCThread& PPCThreadManager::AddThread(PPCThreadType type)
|
PPCThread& PPCThreadManager::AddThread(PPCThreadType type)
|
||||||
|
|
@ -36,7 +36,7 @@ PPCThread& PPCThreadManager::AddThread(PPCThreadType type)
|
||||||
|
|
||||||
new_thread->SetId(Emu.GetIdManager().GetNewID(fmt::Format("%s Thread", name), new_thread));
|
new_thread->SetId(Emu.GetIdManager().GetNewID(fmt::Format("%s Thread", name), new_thread));
|
||||||
|
|
||||||
m_threads.Add(new_thread);
|
m_threads.push_back(new_thread);
|
||||||
wxGetApp().SendDbgCommand(DID_CREATE_THREAD, new_thread);
|
wxGetApp().SendDbgCommand(DID_CREATE_THREAD, new_thread);
|
||||||
|
|
||||||
return *new_thread;
|
return *new_thread;
|
||||||
|
|
@ -46,17 +46,17 @@ void PPCThreadManager::RemoveThread(const u32 id)
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(m_mtx_thread);
|
std::lock_guard<std::mutex> lock(m_mtx_thread);
|
||||||
|
|
||||||
for(u32 i=0; i<m_threads.GetCount(); ++i)
|
for(u32 i=0; i<m_threads.size(); ++i)
|
||||||
{
|
{
|
||||||
if(m_threads[i].m_wait_thread_id == id)
|
if(m_threads[i]->m_wait_thread_id == id)
|
||||||
{
|
{
|
||||||
m_threads[i].Wait(false);
|
m_threads[i]->Wait(false);
|
||||||
m_threads[i].m_wait_thread_id = -1;
|
m_threads[i]->m_wait_thread_id = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(m_threads[i].GetId() != id) continue;
|
if(m_threads[i]->GetId() != id) continue;
|
||||||
|
|
||||||
PPCThread* thr = &m_threads[i];
|
PPCThread* thr = m_threads[i];
|
||||||
wxGetApp().SendDbgCommand(DID_REMOVE_THREAD, thr);
|
wxGetApp().SendDbgCommand(DID_REMOVE_THREAD, thr);
|
||||||
if(thr->IsAlive())
|
if(thr->IsAlive())
|
||||||
{
|
{
|
||||||
|
|
@ -69,7 +69,7 @@ void PPCThreadManager::RemoveThread(const u32 id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
m_threads.RemoveFAt(i);
|
m_threads.erase(m_threads.begin() + i);
|
||||||
i--;
|
i--;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -81,10 +81,10 @@ s32 PPCThreadManager::GetThreadNumById(PPCThreadType type, u32 id)
|
||||||
{
|
{
|
||||||
s32 num = 0;
|
s32 num = 0;
|
||||||
|
|
||||||
for(u32 i=0; i<m_threads.GetCount(); ++i)
|
for(u32 i=0; i<m_threads.size(); ++i)
|
||||||
{
|
{
|
||||||
if(m_threads[i].GetId() == id) return num;
|
if(m_threads[i]->GetId() == id) return num;
|
||||||
if(m_threads[i].GetType() == type) num++;
|
if(m_threads[i]->GetType() == type) num++;
|
||||||
}
|
}
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
|
|
@ -92,9 +92,9 @@ s32 PPCThreadManager::GetThreadNumById(PPCThreadType type, u32 id)
|
||||||
|
|
||||||
PPCThread* PPCThreadManager::GetThread(u32 id)
|
PPCThread* PPCThreadManager::GetThread(u32 id)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_threads.GetCount(); ++i)
|
for(u32 i=0; i<m_threads.size(); ++i)
|
||||||
{
|
{
|
||||||
if(m_threads[i].GetId() == id) return &m_threads[i];
|
if(m_threads[i]->GetId() == id) return m_threads[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
@ -102,9 +102,9 @@ PPCThread* PPCThreadManager::GetThread(u32 id)
|
||||||
|
|
||||||
void PPCThreadManager::Exec()
|
void PPCThreadManager::Exec()
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_threads.GetCount(); ++i)
|
for(u32 i=0; i<m_threads.size(); ++i)
|
||||||
{
|
{
|
||||||
m_threads[i].Exec();
|
m_threads[i]->Exec();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -13,10 +13,9 @@ class PPCThreadManager
|
||||||
//IdManager m_threads_id;
|
//IdManager m_threads_id;
|
||||||
//ArrayF<PPUThread> m_ppu_threads;
|
//ArrayF<PPUThread> m_ppu_threads;
|
||||||
//ArrayF<SPUThread> m_spu_threads;
|
//ArrayF<SPUThread> m_spu_threads;
|
||||||
ArrayF<PPCThread> m_threads;
|
std::vector<PPCThread *> m_threads;
|
||||||
std::mutex m_mtx_thread;
|
std::mutex m_mtx_thread;
|
||||||
wxSemaphore m_sem_task;
|
wxSemaphore m_sem_task;
|
||||||
Stack<u32> m_delete_threads;
|
|
||||||
u32 m_raw_spu_num;
|
u32 m_raw_spu_num;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
@ -28,7 +27,7 @@ public:
|
||||||
PPCThread& AddThread(PPCThreadType type);
|
PPCThread& AddThread(PPCThreadType type);
|
||||||
void RemoveThread(const u32 id);
|
void RemoveThread(const u32 id);
|
||||||
|
|
||||||
ArrayF<PPCThread>& GetThreads() { return m_threads; }
|
std::vector<PPCThread *>& GetThreads() { return m_threads; }
|
||||||
s32 GetThreadNumById(PPCThreadType type, u32 id);
|
s32 GetThreadNumById(PPCThreadType type, u32 id);
|
||||||
PPCThread* GetThread(u32 id);
|
PPCThread* GetThread(u32 id);
|
||||||
//IdManager& GetIDs() {return m_threads_id;}
|
//IdManager& GetIDs() {return m_threads_id;}
|
||||||
|
|
|
||||||
|
|
@ -9,11 +9,11 @@ class PPUDecoder : public PPCDecoder
|
||||||
PPUOpcodes* m_op;
|
PPUOpcodes* m_op;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
PPUDecoder(PPUOpcodes& op) : m_op(&op)
|
PPUDecoder(PPUOpcodes* op) : m_op(op)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
~PPUDecoder()
|
virtual ~PPUDecoder()
|
||||||
{
|
{
|
||||||
delete m_op;
|
delete m_op;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -203,7 +203,9 @@ namespace PPU_instr
|
||||||
|
|
||||||
static CodeField<9, 10> STRM;
|
static CodeField<9, 10> STRM;
|
||||||
|
|
||||||
static auto main_list = new_list(OPCD, instr_bind(&PPUOpcodes::UNK, GetCode, OPCD, OPCD));
|
//static auto main_list = new_list(OPCD, instr_bind(&PPUOpcodes::UNK, GetCode, OPCD, OPCD));
|
||||||
|
static InstrList<1 << CodeField<0, 5>::size, ::PPUOpcodes> main_list_obj(OPCD, instr_bind(&PPUOpcodes::UNK, GetCode, OPCD, OPCD));
|
||||||
|
static auto main_list = &main_list_obj;
|
||||||
static auto g04_list = new_list(main_list, PPU_opcodes::G_04, GD_04);
|
static auto g04_list = new_list(main_list, PPU_opcodes::G_04, GD_04);
|
||||||
static auto g04_0_list = new_list(g04_list, GD_04_0, instr_bind(&PPUOpcodes::UNK, GetCode, OPCD, GD_04_0));
|
static auto g04_0_list = new_list(g04_list, GD_04_0, instr_bind(&PPUOpcodes::UNK, GetCode, OPCD, GD_04_0));
|
||||||
static auto g13_list = new_list(main_list, PPU_opcodes::G_13, GD_13, instr_bind(&PPUOpcodes::UNK, GetCode, OPCD, GD_13));
|
static auto g13_list = new_list(main_list, PPU_opcodes::G_13, GD_13, instr_bind(&PPUOpcodes::UNK, GetCode, OPCD, GD_13));
|
||||||
|
|
|
||||||
|
|
@ -2099,7 +2099,7 @@ private:
|
||||||
if (Ini.HLELogging.GetValue())
|
if (Ini.HLELogging.GetValue())
|
||||||
{
|
{
|
||||||
ConLog.Write("'%s' done with code[0x%llx]! #pc: 0x%llx",
|
ConLog.Write("'%s' done with code[0x%llx]! #pc: 0x%llx",
|
||||||
g_static_funcs_list[CPU.GPR[11]].name, CPU.GPR[3], CPU.PC);
|
g_static_funcs_list[CPU.GPR[11]]->name, CPU.GPR[3], CPU.PC);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 0x22: UNK("HyperCall LV1"); break;
|
case 0x22: UNK("HyperCall LV1"); break;
|
||||||
|
|
|
||||||
|
|
@ -1455,9 +1455,9 @@ void CompilePPUProgram::Compile()
|
||||||
u32 code;
|
u32 code;
|
||||||
|
|
||||||
{
|
{
|
||||||
Array<u32> args;
|
std::vector<u32> args;
|
||||||
args.SetCount(m_args.size());
|
args.resize(m_args.size());
|
||||||
for(uint i=0; i<args.GetCount(); ++i)
|
for(uint i=0; i<args.size(); ++i)
|
||||||
{
|
{
|
||||||
args[i] = m_args[i].value;
|
args[i] = m_args[i].value;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ void PPUThread::AddArgv(const std::string& arg)
|
||||||
{
|
{
|
||||||
m_stack_point -= arg.length() + 1;
|
m_stack_point -= arg.length() + 1;
|
||||||
m_stack_point = Memory.AlignAddr(m_stack_point, 0x10) - 0x10;
|
m_stack_point = Memory.AlignAddr(m_stack_point, 0x10) - 0x10;
|
||||||
m_argv_addr.AddCpy(m_stack_point);
|
m_argv_addr.push_back(m_stack_point);
|
||||||
Memory.WriteString(m_stack_point, arg);
|
Memory.WriteString(m_stack_point, arg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -98,9 +98,9 @@ void PPUThread::InitRegs()
|
||||||
GPR[i] = (i+1) * 0x10000;
|
GPR[i] = (i+1) * 0x10000;
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
if(m_argv_addr.GetCount())
|
if(m_argv_addr.size())
|
||||||
{
|
{
|
||||||
u64 argc = m_argv_addr.GetCount();
|
u64 argc = m_argv_addr.size();
|
||||||
m_stack_point -= 0xc + 4 * argc;
|
m_stack_point -= 0xc + 4 * argc;
|
||||||
u64 argv = m_stack_point;
|
u64 argv = m_stack_point;
|
||||||
|
|
||||||
|
|
@ -150,7 +150,8 @@ void PPUThread::DoRun()
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
case 2:
|
case 2:
|
||||||
m_dec = new PPUDecoder(*new PPUInterpreter(*this));
|
auto ppui = new PPUInterpreter(*this);
|
||||||
|
m_dec = new PPUDecoder(ppui);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -648,14 +648,14 @@ public:
|
||||||
{
|
{
|
||||||
switch(n)
|
switch(n)
|
||||||
{
|
{
|
||||||
case 0: value ? CR.cr0 |= bit : CR.cr0 &= ~bit; break;
|
case 0: CR.cr0 = (value ? CR.cr0 | bit : CR.cr0 & ~bit); break;
|
||||||
case 1: value ? CR.cr1 |= bit : CR.cr1 &= ~bit; break;
|
case 1: CR.cr1 = (value ? CR.cr1 | bit : CR.cr1 & ~bit); break;
|
||||||
case 2: value ? CR.cr2 |= bit : CR.cr2 &= ~bit; break;
|
case 2: CR.cr2 = (value ? CR.cr2 | bit : CR.cr2 & ~bit); break;
|
||||||
case 3: value ? CR.cr3 |= bit : CR.cr3 &= ~bit; break;
|
case 3: CR.cr3 = (value ? CR.cr3 | bit : CR.cr3 & ~bit); break;
|
||||||
case 4: value ? CR.cr4 |= bit : CR.cr4 &= ~bit; break;
|
case 4: CR.cr4 = (value ? CR.cr4 | bit : CR.cr4 & ~bit); break;
|
||||||
case 5: value ? CR.cr5 |= bit : CR.cr5 &= ~bit; break;
|
case 5: CR.cr5 = (value ? CR.cr5 | bit : CR.cr5 & ~bit); break;
|
||||||
case 6: value ? CR.cr6 |= bit : CR.cr6 &= ~bit; break;
|
case 6: CR.cr6 = (value ? CR.cr6 | bit : CR.cr6 & ~bit); break;
|
||||||
case 7: value ? CR.cr7 |= bit : CR.cr7 &= ~bit; break;
|
case 7: CR.cr7 = (value ? CR.cr7 | bit : CR.cr7 & ~bit); break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -253,11 +253,11 @@ void RawSPUThread::Task()
|
||||||
{
|
{
|
||||||
if (Ini.HLELogging.GetValue()) ConLog.Write("%s enter", PPCThread::GetFName().c_str());
|
if (Ini.HLELogging.GetValue()) ConLog.Write("%s enter", PPCThread::GetFName().c_str());
|
||||||
|
|
||||||
const Array<u64>& bp = Emu.GetBreakPoints();
|
const std::vector<u64>& bp = Emu.GetBreakPoints();
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
for(uint i=0; i<bp.GetCount(); ++i)
|
for(uint i=0; i<bp.size(); ++i)
|
||||||
{
|
{
|
||||||
if(bp[i] == m_offset + PC)
|
if(bp[i] == m_offset + PC)
|
||||||
{
|
{
|
||||||
|
|
@ -315,7 +315,7 @@ void RawSPUThread::Task()
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(uint i=0; i<bp.GetCount(); ++i)
|
for(uint i=0; i<bp.size(); ++i)
|
||||||
{
|
{
|
||||||
if(bp[i] == PC)
|
if(bp[i] == PC)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,9 @@ namespace SPU_instr
|
||||||
static CodeField<18, 31> L_18_31;
|
static CodeField<18, 31> L_18_31;
|
||||||
static CodeField<11> L_11;
|
static CodeField<11> L_11;
|
||||||
|
|
||||||
static auto rrr_list = new_list<SPUOpcodes>(RRR);
|
// static auto rrr_list = new_list<SPUOpcodes>(RRR);
|
||||||
|
static InstrList<1 << CodeField<0, 3>::size, SPUOpcodes> rrr_list_obj(RRR, nullptr);
|
||||||
|
static auto rrr_list = &rrr_list_obj;
|
||||||
static auto ri18_list = new_list(rrr_list, RI18);
|
static auto ri18_list = new_list(rrr_list, RI18);
|
||||||
static auto ri10_list = new_list(ri18_list, RI10);
|
static auto ri10_list = new_list(ri18_list, RI10);
|
||||||
static auto ri16_list = new_list(ri10_list, RI16);
|
static auto ri16_list = new_list(ri10_list, RI16);
|
||||||
|
|
|
||||||
|
|
@ -553,7 +553,7 @@ public:
|
||||||
{
|
{
|
||||||
// SPU Thread Group MMIO (LS and SNR)
|
// SPU Thread Group MMIO (LS and SNR)
|
||||||
u32 num = (ea & SYS_SPU_THREAD_BASE_MASK) / SYS_SPU_THREAD_OFFSET; // thread number in group
|
u32 num = (ea & SYS_SPU_THREAD_BASE_MASK) / SYS_SPU_THREAD_OFFSET; // thread number in group
|
||||||
if (num >= group->list.GetCount() || !group->list[num])
|
if (num >= group->list.size() || !group->list[num])
|
||||||
{
|
{
|
||||||
ConLog.Error("DMAC::ProcessCmd(): SPU Thread Group MMIO Access (ea=0x%llx): invalid thread", ea);
|
ConLog.Error("DMAC::ProcessCmd(): SPU Thread Group MMIO Access (ea=0x%llx): invalid thread", ea);
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -1288,7 +1288,7 @@ public:
|
||||||
reg_value0 = std::stoull(value.substr(16, 31), 0, 16);
|
reg_value0 = std::stoull(value.substr(16, 31), 0, 16);
|
||||||
reg_value1 = std::stoull(value.substr(0, 15), 0, 16);
|
reg_value1 = std::stoull(value.substr(0, 15), 0, 16);
|
||||||
}
|
}
|
||||||
catch (std::invalid_argument& e)
|
catch (std::invalid_argument& /*e*/)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,11 @@ DbgConsole::~DbgConsole()
|
||||||
{
|
{
|
||||||
ThreadBase::Stop();
|
ThreadBase::Stop();
|
||||||
m_dbg_buffer.Flush();
|
m_dbg_buffer.Flush();
|
||||||
|
|
||||||
|
safe_delete(m_console);
|
||||||
|
safe_delete(m_color_white);
|
||||||
|
safe_delete(m_color_red);
|
||||||
|
safe_delete(m_output);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DbgConsole::Write(int ch, const std::string& text)
|
void DbgConsole::Write(int ch, const std::string& text)
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ struct _DbgBuffer : public MTPacketBuffer<DbgPacket>
|
||||||
{
|
{
|
||||||
const u32 stext = data.m_text.length();
|
const u32 stext = data.m_text.length();
|
||||||
|
|
||||||
m_buffer.Reserve(sizeof(int) + sizeof(u32) + stext);
|
m_buffer.resize(m_buffer.size() + sizeof(int) + sizeof(u32) + stext);
|
||||||
|
|
||||||
u32 c_put = m_put;
|
u32 c_put = m_put;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,14 +14,19 @@ int sort_devices(const void* _a, const void* _b)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
VFS::~VFS()
|
||||||
|
{
|
||||||
|
UnMountAll();
|
||||||
|
}
|
||||||
|
|
||||||
void VFS::Mount(const std::string& ps3_path, const std::string& local_path, vfsDevice* device)
|
void VFS::Mount(const std::string& ps3_path, const std::string& local_path, vfsDevice* device)
|
||||||
{
|
{
|
||||||
UnMount(ps3_path);
|
UnMount(ps3_path);
|
||||||
|
|
||||||
device->SetPath(ps3_path, local_path);
|
device->SetPath(ps3_path, local_path);
|
||||||
m_devices.Add(device);
|
m_devices.push_back(device);
|
||||||
|
|
||||||
if(m_devices.GetCount() > 1)
|
if(m_devices.size() > 1)
|
||||||
{
|
{
|
||||||
//std::qsort(m_devices.GetPtr(), m_devices.GetCount(), sizeof(vfsDevice*), sort_devices);
|
//std::qsort(m_devices.GetPtr(), m_devices.GetCount(), sizeof(vfsDevice*), sort_devices);
|
||||||
}
|
}
|
||||||
|
|
@ -29,12 +34,12 @@ void VFS::Mount(const std::string& ps3_path, const std::string& local_path, vfsD
|
||||||
|
|
||||||
void VFS::UnMount(const std::string& ps3_path)
|
void VFS::UnMount(const std::string& ps3_path)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_devices.GetCount(); ++i)
|
for(u32 i=0; i<m_devices.size(); ++i)
|
||||||
{
|
{
|
||||||
if(!m_devices[i].GetPs3Path().compare(ps3_path))
|
if(!m_devices[i]->GetPs3Path().compare(ps3_path))
|
||||||
{
|
{
|
||||||
delete &m_devices[i];
|
delete m_devices[i];
|
||||||
m_devices.RemoveFAt(i);
|
m_devices.erase(m_devices.begin() +i);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -43,11 +48,12 @@ void VFS::UnMount(const std::string& ps3_path)
|
||||||
|
|
||||||
void VFS::UnMountAll()
|
void VFS::UnMountAll()
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_devices.GetCount(); ++i)
|
for(u32 i=0; i<m_devices.size(); ++i)
|
||||||
{
|
{
|
||||||
delete &m_devices[i];
|
delete m_devices[i];
|
||||||
m_devices.RemoveFAt(i);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_devices.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
vfsFileBase* VFS::OpenFile(const std::string& ps3_path, vfsOpenMode mode) const
|
vfsFileBase* VFS::OpenFile(const std::string& ps3_path, vfsOpenMode mode) const
|
||||||
|
|
@ -214,9 +220,9 @@ vfsDevice* VFS::GetDevice(const std::string& ps3_path, std::string& path) const
|
||||||
u32 max_eq;
|
u32 max_eq;
|
||||||
s32 max_i=-1;
|
s32 max_i=-1;
|
||||||
|
|
||||||
for(u32 i=0; i<m_devices.GetCount(); ++i)
|
for(u32 i=0; i<m_devices.size(); ++i)
|
||||||
{
|
{
|
||||||
const u32 eq = m_devices[i].CmpPs3Path(ps3_path);
|
const u32 eq = m_devices[i]->CmpPs3Path(ps3_path);
|
||||||
|
|
||||||
if(max_i < 0 || eq > max_eq)
|
if(max_i < 0 || eq > max_eq)
|
||||||
{
|
{
|
||||||
|
|
@ -226,8 +232,8 @@ vfsDevice* VFS::GetDevice(const std::string& ps3_path, std::string& path) const
|
||||||
}
|
}
|
||||||
|
|
||||||
if(max_i < 0) return nullptr;
|
if(max_i < 0) return nullptr;
|
||||||
path = vfsDevice::GetWinPath(m_devices[max_i].GetLocalPath(), ps3_path.substr(max_eq, ps3_path.length() - max_eq));
|
path = vfsDevice::GetWinPath(m_devices[max_i]->GetLocalPath(), ps3_path.substr(max_eq, ps3_path.length() - max_eq));
|
||||||
return &m_devices[max_i];
|
return m_devices[max_i];
|
||||||
}
|
}
|
||||||
|
|
||||||
vfsDevice* VFS::GetDeviceLocal(const std::string& local_path, std::string& path) const
|
vfsDevice* VFS::GetDeviceLocal(const std::string& local_path, std::string& path) const
|
||||||
|
|
@ -239,9 +245,9 @@ vfsDevice* VFS::GetDeviceLocal(const std::string& local_path, std::string& path)
|
||||||
file_path.Normalize();
|
file_path.Normalize();
|
||||||
std::string mormalized_path = fmt::ToUTF8(file_path.GetFullPath());
|
std::string mormalized_path = fmt::ToUTF8(file_path.GetFullPath());
|
||||||
|
|
||||||
for(u32 i=0; i<m_devices.GetCount(); ++i)
|
for(u32 i=0; i<m_devices.size(); ++i)
|
||||||
{
|
{
|
||||||
const u32 eq = m_devices[i].CmpLocalPath(mormalized_path);
|
const u32 eq = m_devices[i]->CmpLocalPath(mormalized_path);
|
||||||
|
|
||||||
if(max_i < 0 || eq > max_eq)
|
if(max_i < 0 || eq > max_eq)
|
||||||
{
|
{
|
||||||
|
|
@ -252,8 +258,8 @@ vfsDevice* VFS::GetDeviceLocal(const std::string& local_path, std::string& path)
|
||||||
|
|
||||||
if(max_i < 0) return nullptr;
|
if(max_i < 0) return nullptr;
|
||||||
|
|
||||||
path = vfsDevice::GetPs3Path(m_devices[max_i].GetPs3Path(), local_path.substr(max_eq, local_path.length() - max_eq));
|
path = vfsDevice::GetPs3Path(m_devices[max_i]->GetPs3Path(), local_path.substr(max_eq, local_path.length() - max_eq));
|
||||||
return &m_devices[max_i];
|
return m_devices[max_i];
|
||||||
}
|
}
|
||||||
|
|
||||||
void VFS::Init(const std::string& path)
|
void VFS::Init(const std::string& path)
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,14 @@ struct VFSManagerEntry
|
||||||
|
|
||||||
struct VFS
|
struct VFS
|
||||||
{
|
{
|
||||||
ArrayF<vfsDevice> m_devices;
|
~VFS();
|
||||||
|
|
||||||
|
//TODO: find out where these are supposed to be deleted or just make it shared_ptr
|
||||||
|
//and also make GetDevice and GetDeviceLocal return shared_ptr then.
|
||||||
|
// A vfsDevice will be deleted when they're unmounted or the VFS struct is destroyed.
|
||||||
|
// This will cause problems if other code stores the pointer returned by GetDevice/GetDeviceLocal
|
||||||
|
// and tries to use it after the device is unmounted.
|
||||||
|
std::vector<vfsDevice *> m_devices;
|
||||||
void Mount(const std::string& ps3_path, const std::string& local_path, vfsDevice* device);
|
void Mount(const std::string& ps3_path, const std::string& local_path, vfsDevice* device);
|
||||||
void UnMount(const std::string& ps3_path);
|
void UnMount(const std::string& ps3_path);
|
||||||
void UnMountAll();
|
void UnMountAll();
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ bool vfsDir::IsExists(const std::string& path) const
|
||||||
return m_stream->IsExists(path); // Crash (Access violation reading location 0x0000000000000000)
|
return m_stream->IsExists(path); // Crash (Access violation reading location 0x0000000000000000)
|
||||||
}
|
}
|
||||||
|
|
||||||
const Array<DirEntryInfo>& vfsDir::GetEntries() const
|
const std::vector<DirEntryInfo>& vfsDir::GetEntries() const
|
||||||
{
|
{
|
||||||
return m_stream->GetEntries();
|
return m_stream->GetEntries();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ public:
|
||||||
virtual bool Open(const std::string& path) override;
|
virtual bool Open(const std::string& path) override;
|
||||||
virtual bool IsOpened() const override;
|
virtual bool IsOpened() const override;
|
||||||
virtual bool IsExists(const std::string& path) const override;
|
virtual bool IsExists(const std::string& path) const override;
|
||||||
virtual const Array<DirEntryInfo>& GetEntries() const override;
|
virtual const std::vector<DirEntryInfo>& GetEntries() const override;
|
||||||
virtual void Close() override;
|
virtual void Close() override;
|
||||||
virtual std::string GetPath() const override;
|
virtual std::string GetPath() const override;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ bool vfsDirBase::IsExists(const std::string& path) const
|
||||||
return wxDirExists(fmt::FromUTF8(path));
|
return wxDirExists(fmt::FromUTF8(path));
|
||||||
}
|
}
|
||||||
|
|
||||||
const Array<DirEntryInfo>& vfsDirBase::GetEntries() const
|
const std::vector<DirEntryInfo>& vfsDirBase::GetEntries() const
|
||||||
{
|
{
|
||||||
return m_entries;
|
return m_entries;
|
||||||
}
|
}
|
||||||
|
|
@ -42,7 +42,7 @@ const Array<DirEntryInfo>& vfsDirBase::GetEntries() const
|
||||||
void vfsDirBase::Close()
|
void vfsDirBase::Close()
|
||||||
{
|
{
|
||||||
m_cwd = "";
|
m_cwd = "";
|
||||||
m_entries.Clear();
|
m_entries.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string vfsDirBase::GetPath() const
|
std::string vfsDirBase::GetPath() const
|
||||||
|
|
@ -52,7 +52,7 @@ std::string vfsDirBase::GetPath() const
|
||||||
|
|
||||||
const DirEntryInfo* vfsDirBase::Read()
|
const DirEntryInfo* vfsDirBase::Read()
|
||||||
{
|
{
|
||||||
if (m_pos >= m_entries.GetCount())
|
if (m_pos >= m_entries.size())
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
||||||
return &m_entries[m_pos++];
|
return &m_entries[m_pos++];
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ class vfsDirBase
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
std::string m_cwd;
|
std::string m_cwd;
|
||||||
Array<DirEntryInfo> m_entries;
|
std::vector<DirEntryInfo> m_entries;
|
||||||
uint m_pos;
|
uint m_pos;
|
||||||
vfsDevice* m_device;
|
vfsDevice* m_device;
|
||||||
|
|
||||||
|
|
@ -42,7 +42,7 @@ public:
|
||||||
virtual bool Open(const std::string& path);
|
virtual bool Open(const std::string& path);
|
||||||
virtual bool IsOpened() const;
|
virtual bool IsOpened() const;
|
||||||
virtual bool IsExists(const std::string& path) const;
|
virtual bool IsExists(const std::string& path) const;
|
||||||
virtual const Array<DirEntryInfo>& GetEntries() const;
|
virtual const std::vector<DirEntryInfo>& GetEntries() const;
|
||||||
virtual void Close();
|
virtual void Close();
|
||||||
virtual std::string GetPath() const;
|
virtual std::string GetPath() const;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,8 @@ bool vfsLocalDir::Open(const std::string& path)
|
||||||
{
|
{
|
||||||
wxString dir_path = fmt::FromUTF8(path) + name;
|
wxString dir_path = fmt::FromUTF8(path) + name;
|
||||||
|
|
||||||
DirEntryInfo& info = m_entries[m_entries.Move(new DirEntryInfo())];
|
m_entries.emplace_back();
|
||||||
|
DirEntryInfo& info = m_entries.back();
|
||||||
info.name = fmt::ToUTF8(name);
|
info.name = fmt::ToUTF8(name);
|
||||||
|
|
||||||
info.flags |= dir.Exists(dir_path) ? DirEntry_TypeDir : DirEntry_TypeFile;
|
info.flags |= dir.Exists(dir_path) ? DirEntry_TypeDir : DirEntry_TypeFile;
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ void GLBufferObject::Create(GLuint type, u32 count)
|
||||||
{
|
{
|
||||||
if(IsCreated()) return;
|
if(IsCreated()) return;
|
||||||
|
|
||||||
m_id.InsertRoomEnd(count);
|
m_id.resize(count);
|
||||||
glGenBuffers(count, &m_id[0]);
|
glGenBuffers(count, &m_id[0]);
|
||||||
m_type = type;
|
m_type = type;
|
||||||
}
|
}
|
||||||
|
|
@ -29,14 +29,14 @@ void GLBufferObject::Delete()
|
||||||
{
|
{
|
||||||
if(!IsCreated()) return;
|
if(!IsCreated()) return;
|
||||||
|
|
||||||
glDeleteBuffers(m_id.GetCount(), &m_id[0]);
|
glDeleteBuffers(m_id.size(), &m_id[0]);
|
||||||
m_id.Clear();
|
m_id.clear();
|
||||||
m_type = 0;
|
m_type = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLBufferObject::Bind(u32 type, u32 num)
|
void GLBufferObject::Bind(u32 type, u32 num)
|
||||||
{
|
{
|
||||||
assert(num < m_id.GetCount());
|
assert(num < m_id.size());
|
||||||
glBindBuffer(type, m_id[num]);
|
glBindBuffer(type, m_id[num]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -75,7 +75,7 @@ void GLBufferObject::SetAttribPointer(int location, int size, int type, int poin
|
||||||
|
|
||||||
bool GLBufferObject::IsCreated() const
|
bool GLBufferObject::IsCreated() const
|
||||||
{
|
{
|
||||||
return m_id.GetCount() != 0;
|
return m_id.size() != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
GLvbo::GLvbo()
|
GLvbo::GLvbo()
|
||||||
|
|
@ -135,20 +135,20 @@ GLrbo::~GLrbo()
|
||||||
|
|
||||||
void GLrbo::Create(u32 count)
|
void GLrbo::Create(u32 count)
|
||||||
{
|
{
|
||||||
if(m_id.GetCount() == count)
|
if(m_id.size() == count)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Delete();
|
Delete();
|
||||||
|
|
||||||
m_id.SetCount(count);
|
m_id.resize(count);
|
||||||
glGenRenderbuffers(count, m_id.GetPtr());
|
glGenRenderbuffers(count, m_id.data());
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLrbo::Bind(u32 num) const
|
void GLrbo::Bind(u32 num) const
|
||||||
{
|
{
|
||||||
assert(num < m_id.GetCount());
|
assert(num < m_id.size());
|
||||||
|
|
||||||
glBindRenderbuffer(GL_RENDERBUFFER, m_id[num]);
|
glBindRenderbuffer(GL_RENDERBUFFER, m_id[num]);
|
||||||
}
|
}
|
||||||
|
|
@ -170,18 +170,18 @@ void GLrbo::Delete()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
glDeleteRenderbuffers(m_id.GetCount(), m_id.GetPtr());
|
glDeleteRenderbuffers(m_id.size(), m_id.data());
|
||||||
m_id.Clear();
|
m_id.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GLrbo::IsCreated() const
|
bool GLrbo::IsCreated() const
|
||||||
{
|
{
|
||||||
return m_id.GetCount();
|
return m_id.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 GLrbo::GetId(u32 num) const
|
u32 GLrbo::GetId(u32 num) const
|
||||||
{
|
{
|
||||||
assert(num < m_id.GetCount());
|
assert(num < m_id.size());
|
||||||
return m_id[num];
|
return m_id[num];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
struct GLBufferObject
|
struct GLBufferObject
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
Array<GLuint> m_id;
|
std::vector<GLuint> m_id;
|
||||||
GLuint m_type;
|
GLuint m_type;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
@ -51,7 +51,7 @@ public:
|
||||||
class GLrbo
|
class GLrbo
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
Array<GLuint> m_id;
|
std::vector<GLuint> m_id;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
GLrbo();
|
GLrbo();
|
||||||
|
|
|
||||||
|
|
@ -229,20 +229,11 @@ std::string GLFragmentDecompilerThread::BuildCode()
|
||||||
|
|
||||||
std::string p;
|
std::string p;
|
||||||
|
|
||||||
for(u32 i=0; i<m_parr.params.GetCount(); ++i)
|
for(u32 i=0; i<m_parr.params.size(); ++i)
|
||||||
{
|
{
|
||||||
p += m_parr.params[i].Format();
|
p += m_parr.params[i].Format();
|
||||||
}
|
}
|
||||||
|
|
||||||
//return "#version 330\n\
|
|
||||||
\n\
|
|
||||||
out vec3 color;\n\
|
|
||||||
in vec4 tc1;\n\
|
|
||||||
\n\
|
|
||||||
void main()\n\
|
|
||||||
{\n\
|
|
||||||
color = tc1.rgb;\n\
|
|
||||||
}";
|
|
||||||
return std::string("#version 330\n"
|
return std::string("#version 330\n"
|
||||||
"\n"
|
"\n"
|
||||||
+ p + "\n"
|
+ p + "\n"
|
||||||
|
|
@ -348,12 +339,12 @@ void GLFragmentDecompilerThread::Task()
|
||||||
|
|
||||||
m_shader = BuildCode();
|
m_shader = BuildCode();
|
||||||
main.clear();
|
main.clear();
|
||||||
m_parr.params.Clear();
|
m_parr.params.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
GLShaderProgram::GLShaderProgram()
|
GLShaderProgram::GLShaderProgram()
|
||||||
: m_decompiler_thread(nullptr)
|
: m_decompiler_thread(nullptr)
|
||||||
, id(0)
|
, m_id(0)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -374,11 +365,22 @@ GLShaderProgram::~GLShaderProgram()
|
||||||
Delete();
|
Delete();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GLShaderProgram::Wait()
|
||||||
|
{
|
||||||
|
if(m_decompiler_thread && m_decompiler_thread->IsAlive())
|
||||||
|
{
|
||||||
|
m_decompiler_thread->Join();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void GLShaderProgram::Decompile(RSXShaderProgram& prog)
|
void GLShaderProgram::Decompile(RSXShaderProgram& prog)
|
||||||
{
|
{
|
||||||
#if 0
|
GLFragmentDecompilerThread decompiler(m_shader, m_parr, prog.addr, prog.size, prog.ctrl);
|
||||||
FragmentDecompilerThread(shader, parr, addr).Entry();
|
decompiler.Task();
|
||||||
#else
|
}
|
||||||
|
|
||||||
|
void GLShaderProgram::DecompileAsync(RSXShaderProgram& prog)
|
||||||
|
{
|
||||||
if(m_decompiler_thread)
|
if(m_decompiler_thread)
|
||||||
{
|
{
|
||||||
Wait();
|
Wait();
|
||||||
|
|
@ -391,59 +393,59 @@ void GLShaderProgram::Decompile(RSXShaderProgram& prog)
|
||||||
m_decompiler_thread = nullptr;
|
m_decompiler_thread = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_decompiler_thread = new GLFragmentDecompilerThread(shader, parr, prog.addr, prog.size, prog.ctrl);
|
m_decompiler_thread = new GLFragmentDecompilerThread(m_shader, m_parr, prog.addr, prog.size, prog.ctrl);
|
||||||
m_decompiler_thread->Start();
|
m_decompiler_thread->Start();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLShaderProgram::Compile()
|
void GLShaderProgram::Compile()
|
||||||
{
|
{
|
||||||
if(id) glDeleteShader(id);
|
if (m_id) glDeleteShader(m_id);
|
||||||
|
|
||||||
id = glCreateShader(GL_FRAGMENT_SHADER);
|
m_id = glCreateShader(GL_FRAGMENT_SHADER);
|
||||||
|
|
||||||
const char* str = shader.c_str();
|
const char* str = m_shader.c_str();
|
||||||
const int strlen = shader.length();
|
const int strlen = m_shader.length();
|
||||||
|
|
||||||
glShaderSource(id, 1, &str, &strlen);
|
glShaderSource(m_id, 1, &str, &strlen);
|
||||||
glCompileShader(id);
|
glCompileShader(m_id);
|
||||||
|
|
||||||
GLint r = GL_FALSE;
|
GLint compileStatus = GL_FALSE;
|
||||||
glGetShaderiv(id, GL_COMPILE_STATUS, &r);
|
glGetShaderiv(m_id, GL_COMPILE_STATUS, &compileStatus); // Determine the result of the glCompileShader call
|
||||||
if(r != GL_TRUE)
|
if (compileStatus != GL_TRUE) // If the shader failed to compile...
|
||||||
{
|
{
|
||||||
glGetShaderiv(id, GL_INFO_LOG_LENGTH, &r);
|
GLint infoLength;
|
||||||
|
glGetShaderiv(m_id, GL_INFO_LOG_LENGTH, &infoLength); // Retrieve the length in bytes (including trailing NULL) of the shader info log
|
||||||
|
|
||||||
if(r)
|
if (infoLength > 0)
|
||||||
{
|
{
|
||||||
char* buf = new char[r+1];
|
|
||||||
GLsizei len;
|
GLsizei len;
|
||||||
memset(buf, 0, r+1);
|
char* buf = new char[infoLength]; // Buffer to store infoLog
|
||||||
glGetShaderInfoLog(id, r, &len, buf);
|
|
||||||
ConLog.Error("Failed to compile shader: %s", buf);
|
glGetShaderInfoLog(m_id, infoLength, &len, buf); // Retrieve the shader info log into our buffer
|
||||||
|
ConLog.Error("Failed to compile shader: %s", buf); // Write log to the console
|
||||||
|
|
||||||
delete[] buf;
|
delete[] buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
ConLog.Write(shader.c_str());
|
ConLog.Write(m_shader.c_str()); // Log the text of the shader that failed to compile
|
||||||
Emu.Pause();
|
Emu.Pause(); // Pause the emulator, we can't really continue from here
|
||||||
}
|
}
|
||||||
//else ConLog.Write("Shader compiled successfully!");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLShaderProgram::Delete()
|
void GLShaderProgram::Delete()
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<parr.params.GetCount(); ++i)
|
for (u32 i = 0; i<m_parr.params.size(); ++i)
|
||||||
{
|
{
|
||||||
parr.params[i].items.Clear();
|
m_parr.params[i].items.clear();
|
||||||
parr.params[i].type.clear();
|
m_parr.params[i].type.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
parr.params.Clear();
|
m_parr.params.clear();
|
||||||
shader.clear();
|
m_shader.clear();
|
||||||
|
|
||||||
if(id)
|
if (m_id)
|
||||||
{
|
{
|
||||||
glDeleteShader(id);
|
glDeleteShader(m_id);
|
||||||
id = 0;
|
m_id = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -138,28 +138,65 @@ struct GLFragmentDecompilerThread : public ThreadBase
|
||||||
u32 GetData(const u32 d) const { return d << 16 | d >> 16; }
|
u32 GetData(const u32 d) const { return d << 16 | d >> 16; }
|
||||||
};
|
};
|
||||||
|
|
||||||
struct GLShaderProgram
|
/** Storage for an Fragment Program in the process of of recompilation.
|
||||||
|
* This class calls OpenGL functions and should only be used from the RSX/Graphics thread.
|
||||||
|
*/
|
||||||
|
class GLShaderProgram
|
||||||
{
|
{
|
||||||
|
public:
|
||||||
GLShaderProgram();
|
GLShaderProgram();
|
||||||
~GLShaderProgram();
|
~GLShaderProgram();
|
||||||
|
|
||||||
GLFragmentDecompilerThread* m_decompiler_thread;
|
/**
|
||||||
|
* Decompile a fragment shader located in the PS3's Memory. This function operates synchronously.
|
||||||
GLParamArray parr;
|
* @param prog RSXShaderProgram specifying the location and size of the shader in memory
|
||||||
|
*/
|
||||||
std::string shader;
|
|
||||||
|
|
||||||
u32 id;
|
|
||||||
|
|
||||||
void Wait()
|
|
||||||
{
|
|
||||||
if(m_decompiler_thread && m_decompiler_thread->IsAlive())
|
|
||||||
{
|
|
||||||
m_decompiler_thread->Join();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
void Decompile(RSXShaderProgram& prog);
|
void Decompile(RSXShaderProgram& prog);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Asynchronously decompile a fragment shader located in the PS3's Memory.
|
||||||
|
* When this function is called you must call Wait before GetShaderText() will return valid data.
|
||||||
|
* @param prog RSXShaderProgram specifying the location and size of the shader in memory
|
||||||
|
*/
|
||||||
|
void DecompileAsync(RSXShaderProgram& prog);
|
||||||
|
|
||||||
|
/** Wait for the decompiler task to complete decompilation. */
|
||||||
|
void Wait();
|
||||||
|
|
||||||
|
/** Compile the decompiled fragment shader into a format we can use with OpenGL. */
|
||||||
void Compile();
|
void Compile();
|
||||||
|
|
||||||
|
/** Get the source text for this shader */
|
||||||
|
inline const std::string& GetShaderText() const { return m_shader; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the source text for this shader
|
||||||
|
* @param shaderText supplied shader text
|
||||||
|
*/
|
||||||
|
inline void SetShaderText(const std::string& shaderText) { m_shader = shaderText; }
|
||||||
|
|
||||||
|
/** Get the OpenGL id this shader is bound to */
|
||||||
|
inline u32 GetId() const { return m_id; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the OpenGL id this shader is bound to
|
||||||
|
* @param id supplied id
|
||||||
|
*/
|
||||||
|
inline void SetId(const u32 id) { m_id = id; }
|
||||||
|
|
||||||
|
private:
|
||||||
|
/** Threaded fragment shader decompiler responsible for decompiling this program */
|
||||||
|
GLFragmentDecompilerThread* m_decompiler_thread;
|
||||||
|
|
||||||
|
/** Shader parameter storage */
|
||||||
|
GLParamArray m_parr;
|
||||||
|
|
||||||
|
/** Text of our decompiler shader */
|
||||||
|
std::string m_shader;
|
||||||
|
|
||||||
|
/** OpenGL id this shader is bound to */
|
||||||
|
u32 m_id;
|
||||||
|
|
||||||
|
/** Deletes the shader and any stored information */
|
||||||
void Delete();
|
void Delete();
|
||||||
};
|
};
|
||||||
|
|
@ -136,11 +136,11 @@ void GLGSRender::EnableVertexData(bool indexed_draw)
|
||||||
if(!m_vertex_data[i].IsEnabled() || !m_vertex_data[i].addr) continue;
|
if(!m_vertex_data[i].IsEnabled() || !m_vertex_data[i].addr) continue;
|
||||||
|
|
||||||
const size_t item_size = m_vertex_data[i].GetTypeSize() * m_vertex_data[i].size;
|
const size_t item_size = m_vertex_data[i].GetTypeSize() * m_vertex_data[i].size;
|
||||||
const size_t data_size = m_vertex_data[i].data.GetCount() - data_offset * item_size;
|
const size_t data_size = m_vertex_data[i].data.size() - data_offset * item_size;
|
||||||
const u32 pos = m_vdata.GetCount();
|
const u32 pos = m_vdata.size();
|
||||||
|
|
||||||
cur_offset += data_size;
|
cur_offset += data_size;
|
||||||
m_vdata.InsertRoomEnd(data_size);
|
m_vdata.resize(m_vdata.size() + data_size);
|
||||||
memcpy(&m_vdata[pos], &m_vertex_data[i].data[data_offset * item_size], data_size);
|
memcpy(&m_vdata[pos], &m_vertex_data[i].data[data_offset * item_size], data_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -150,12 +150,12 @@ void GLGSRender::EnableVertexData(bool indexed_draw)
|
||||||
|
|
||||||
m_vbo.Create(indexed_draw ? 2 : 1);
|
m_vbo.Create(indexed_draw ? 2 : 1);
|
||||||
m_vbo.Bind(0);
|
m_vbo.Bind(0);
|
||||||
m_vbo.SetData(&m_vdata[0], m_vdata.GetCount());
|
m_vbo.SetData(&m_vdata[0], m_vdata.size());
|
||||||
|
|
||||||
if(indexed_draw)
|
if(indexed_draw)
|
||||||
{
|
{
|
||||||
m_vbo.Bind(GL_ELEMENT_ARRAY_BUFFER, 1);
|
m_vbo.Bind(GL_ELEMENT_ARRAY_BUFFER, 1);
|
||||||
m_vbo.SetData(GL_ELEMENT_ARRAY_BUFFER, &m_indexed_array.m_data[0], m_indexed_array.m_data.GetCount());
|
m_vbo.SetData(GL_ELEMENT_ARRAY_BUFFER, &m_indexed_array.m_data[0], m_indexed_array.m_data.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
checkForGlError("initializing vbo");
|
checkForGlError("initializing vbo");
|
||||||
|
|
@ -173,7 +173,7 @@ void GLGSRender::EnableVertexData(bool indexed_draw)
|
||||||
switch(m_vertex_data[i].type)
|
switch(m_vertex_data[i].type)
|
||||||
{
|
{
|
||||||
case 1:
|
case 1:
|
||||||
for(u32 j = 0; j<m_vertex_data[i].data.GetCount(); j+=2)
|
for(u32 j = 0; j<m_vertex_data[i].data.size(); j+=2)
|
||||||
{
|
{
|
||||||
dump.Write(wxString::Format("%d\n", *(u16*)&m_vertex_data[i].data[j]));
|
dump.Write(wxString::Format("%d\n", *(u16*)&m_vertex_data[i].data[j]));
|
||||||
if(!(((j+2) / 2) % m_vertex_data[i].size)) dump.Write("\n");
|
if(!(((j+2) / 2) % m_vertex_data[i].size)) dump.Write("\n");
|
||||||
|
|
@ -181,7 +181,7 @@ void GLGSRender::EnableVertexData(bool indexed_draw)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
for(u32 j = 0; j<m_vertex_data[i].data.GetCount(); j+=4)
|
for(u32 j = 0; j<m_vertex_data[i].data.size(); j+=4)
|
||||||
{
|
{
|
||||||
dump.Write(wxString::Format("%.01f\n", *(float*)&m_vertex_data[i].data[j]));
|
dump.Write(wxString::Format("%.01f\n", *(float*)&m_vertex_data[i].data[j]));
|
||||||
if(!(((j+4) / 4) % m_vertex_data[i].size)) dump.Write("\n");
|
if(!(((j+4) / 4) % m_vertex_data[i].size)) dump.Write("\n");
|
||||||
|
|
@ -189,7 +189,7 @@ void GLGSRender::EnableVertexData(bool indexed_draw)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
for(u32 j = 0; j<m_vertex_data[i].data.GetCount(); j+=2)
|
for(u32 j = 0; j<m_vertex_data[i].data.size(); j+=2)
|
||||||
{
|
{
|
||||||
dump.Write(wxString::Format("%.01f\n", *(float*)&m_vertex_data[i].data[j]));
|
dump.Write(wxString::Format("%.01f\n", *(float*)&m_vertex_data[i].data[j]));
|
||||||
if(!(((j+2) / 2) % m_vertex_data[i].size)) dump.Write("\n");
|
if(!(((j+2) / 2) % m_vertex_data[i].size)) dump.Write("\n");
|
||||||
|
|
@ -197,7 +197,7 @@ void GLGSRender::EnableVertexData(bool indexed_draw)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 4:
|
case 4:
|
||||||
for(u32 j = 0; j<m_vertex_data[i].data.GetCount(); ++j)
|
for(u32 j = 0; j<m_vertex_data[i].data.size(); ++j)
|
||||||
{
|
{
|
||||||
dump.Write(wxString::Format("%d\n", m_vertex_data[i].data[j]));
|
dump.Write(wxString::Format("%d\n", m_vertex_data[i].data[j]));
|
||||||
if(!((j+1) % m_vertex_data[i].size)) dump.Write("\n");
|
if(!((j+1) % m_vertex_data[i].size)) dump.Write("\n");
|
||||||
|
|
@ -205,7 +205,7 @@ void GLGSRender::EnableVertexData(bool indexed_draw)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 5:
|
case 5:
|
||||||
for(u32 j = 0; j<m_vertex_data[i].data.GetCount(); j+=2)
|
for(u32 j = 0; j<m_vertex_data[i].data.size(); j+=2)
|
||||||
{
|
{
|
||||||
dump.Write(wxString::Format("%d\n", *(u16*)&m_vertex_data[i].data[j]));
|
dump.Write(wxString::Format("%d\n", *(u16*)&m_vertex_data[i].data[j]));
|
||||||
if(!(((j+2) / 2) % m_vertex_data[i].size)) dump.Write("\n");
|
if(!(((j+2) / 2) % m_vertex_data[i].size)) dump.Write("\n");
|
||||||
|
|
@ -213,7 +213,7 @@ void GLGSRender::EnableVertexData(bool indexed_draw)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 7:
|
case 7:
|
||||||
for(u32 j = 0; j<m_vertex_data[i].data.GetCount(); ++j)
|
for(u32 j = 0; j<m_vertex_data[i].data.size(); ++j)
|
||||||
{
|
{
|
||||||
dump.Write(wxString::Format("%d\n", m_vertex_data[i].data[j]));
|
dump.Write(wxString::Format("%d\n", m_vertex_data[i].data[j]));
|
||||||
if(!((j+1) % m_vertex_data[i].size)) dump.Write("\n");
|
if(!((j+1) % m_vertex_data[i].size)) dump.Write("\n");
|
||||||
|
|
@ -299,7 +299,7 @@ void GLGSRender::EnableVertexData(bool indexed_draw)
|
||||||
|
|
||||||
void GLGSRender::DisableVertexData()
|
void GLGSRender::DisableVertexData()
|
||||||
{
|
{
|
||||||
m_vdata.Clear();
|
m_vdata.clear();
|
||||||
for(u32 i=0; i<m_vertex_count; ++i)
|
for(u32 i=0; i<m_vertex_count; ++i)
|
||||||
{
|
{
|
||||||
if(!m_vertex_data[i].IsEnabled() || !m_vertex_data[i].addr) continue;
|
if(!m_vertex_data[i].IsEnabled() || !m_vertex_data[i].addr) continue;
|
||||||
|
|
@ -317,7 +317,7 @@ void GLGSRender::InitVertexData()
|
||||||
0.0f, 0.0f, 0.0f, 1.0f};
|
0.0f, 0.0f, 0.0f, 1.0f};
|
||||||
int l;
|
int l;
|
||||||
|
|
||||||
for(u32 i=0; i<m_transform_constants.GetCount(); ++i)
|
for(u32 i=0; i<m_transform_constants.size(); ++i)
|
||||||
{
|
{
|
||||||
const RSXTransformConstant& c = m_transform_constants[i];
|
const RSXTransformConstant& c = m_transform_constants[i];
|
||||||
const std::string name = fmt::Format("vc%u", c.id);
|
const std::string name = fmt::Format("vc%u", c.id);
|
||||||
|
|
@ -354,7 +354,7 @@ void GLGSRender::InitFragmentData()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(u32 i=0; i<m_fragment_constants.GetCount(); ++i)
|
for(u32 i=0; i<m_fragment_constants.size(); ++i)
|
||||||
{
|
{
|
||||||
const RSXTransformConstant& c = m_fragment_constants[i];
|
const RSXTransformConstant& c = m_fragment_constants[i];
|
||||||
|
|
||||||
|
|
@ -397,12 +397,11 @@ bool GLGSRender::LoadProgram()
|
||||||
{
|
{
|
||||||
ConLog.Warning("FP not found in buffer!");
|
ConLog.Warning("FP not found in buffer!");
|
||||||
m_shader_prog.Decompile(*m_cur_shader_prog);
|
m_shader_prog.Decompile(*m_cur_shader_prog);
|
||||||
m_shader_prog.Wait();
|
|
||||||
m_shader_prog.Compile();
|
m_shader_prog.Compile();
|
||||||
checkForGlError("m_shader_prog.Compile");
|
checkForGlError("m_shader_prog.Compile");
|
||||||
|
|
||||||
wxFile f(wxGetCwd() + "/FragmentProgram.txt", wxFile::write);
|
wxFile f(wxGetCwd() + "/FragmentProgram.txt", wxFile::write);
|
||||||
f.Write(m_shader_prog.shader);
|
f.Write(m_shader_prog.GetShaderText());
|
||||||
}
|
}
|
||||||
|
|
||||||
if(m_vp_buf_num == -1)
|
if(m_vp_buf_num == -1)
|
||||||
|
|
@ -433,7 +432,7 @@ bool GLGSRender::LoadProgram()
|
||||||
{
|
{
|
||||||
// TODO: This isn't working perfectly. Is there any better/shorter way to update the program
|
// TODO: This isn't working perfectly. Is there any better/shorter way to update the program
|
||||||
m_vertex_prog.shader = program.vp_shader;
|
m_vertex_prog.shader = program.vp_shader;
|
||||||
m_shader_prog.shader = program.fp_shader;
|
m_shader_prog.SetShaderText(program.fp_shader);
|
||||||
m_vertex_prog.Wait();
|
m_vertex_prog.Wait();
|
||||||
m_vertex_prog.Compile();
|
m_vertex_prog.Compile();
|
||||||
checkForGlError("m_vertex_prog.Compile");
|
checkForGlError("m_vertex_prog.Compile");
|
||||||
|
|
@ -441,13 +440,13 @@ bool GLGSRender::LoadProgram()
|
||||||
m_shader_prog.Compile();
|
m_shader_prog.Compile();
|
||||||
checkForGlError("m_shader_prog.Compile");
|
checkForGlError("m_shader_prog.Compile");
|
||||||
glAttachShader(m_program.id, m_vertex_prog.id);
|
glAttachShader(m_program.id, m_vertex_prog.id);
|
||||||
glAttachShader(m_program.id, m_shader_prog.id);
|
glAttachShader(m_program.id, m_shader_prog.GetId());
|
||||||
glLinkProgram(m_program.id);
|
glLinkProgram(m_program.id);
|
||||||
checkForGlError("glLinkProgram");
|
checkForGlError("glLinkProgram");
|
||||||
glDetachShader(m_program.id, m_vertex_prog.id);
|
glDetachShader(m_program.id, m_vertex_prog.id);
|
||||||
glDetachShader(m_program.id, m_shader_prog.id);
|
glDetachShader(m_program.id, m_shader_prog.GetId());
|
||||||
program.vp_id = m_vertex_prog.id;
|
program.vp_id = m_vertex_prog.id;
|
||||||
program.fp_id = m_shader_prog.id;
|
program.fp_id = m_shader_prog.GetId();
|
||||||
program.modified = false;
|
program.modified = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -456,7 +455,7 @@ bool GLGSRender::LoadProgram()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_program.Create(m_vertex_prog.id, m_shader_prog.id);
|
m_program.Create(m_vertex_prog.id, m_shader_prog.GetId());
|
||||||
checkForGlError("m_program.Create");
|
checkForGlError("m_program.Create");
|
||||||
m_prog_buffer.Add(m_program, m_shader_prog, *m_cur_shader_prog, m_vertex_prog, *m_cur_vertex_prog);
|
m_prog_buffer.Add(m_program, m_shader_prog, *m_cur_shader_prog, m_vertex_prog, *m_cur_vertex_prog);
|
||||||
checkForGlError("m_prog_buffer.Add");
|
checkForGlError("m_prog_buffer.Add");
|
||||||
|
|
@ -468,9 +467,9 @@ bool GLGSRender::LoadProgram()
|
||||||
RSXDebuggerProgram program;
|
RSXDebuggerProgram program;
|
||||||
program.id = m_program.id;
|
program.id = m_program.id;
|
||||||
program.vp_id = m_vertex_prog.id;
|
program.vp_id = m_vertex_prog.id;
|
||||||
program.fp_id = m_shader_prog.id;
|
program.fp_id = m_shader_prog.GetId();
|
||||||
program.vp_shader = m_vertex_prog.shader;
|
program.vp_shader = m_vertex_prog.shader;
|
||||||
program.fp_shader = m_shader_prog.shader;
|
program.fp_shader = m_shader_prog.GetShaderText();
|
||||||
m_debug_programs.push_back(program);
|
m_debug_programs.push_back(program);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1134,12 +1133,12 @@ void GLGSRender::Flip()
|
||||||
else if(m_fbo.IsCreated())
|
else if(m_fbo.IsCreated())
|
||||||
{
|
{
|
||||||
format = GL_RGBA;
|
format = GL_RGBA;
|
||||||
static Array<u8> pixels;
|
static std::vector<u8> pixels;
|
||||||
pixels.SetCount(RSXThread::m_width * RSXThread::m_height * 4);
|
pixels.resize(RSXThread::m_width * RSXThread::m_height * 4);
|
||||||
m_fbo.Bind(GL_READ_FRAMEBUFFER);
|
m_fbo.Bind(GL_READ_FRAMEBUFFER);
|
||||||
glReadPixels(0, 0, RSXThread::m_width, RSXThread::m_height, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, pixels.GetPtr());
|
glReadPixels(0, 0, RSXThread::m_width, RSXThread::m_height, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, pixels.data());
|
||||||
|
|
||||||
src_buffer = pixels.GetPtr();
|
src_buffer = pixels.data();
|
||||||
width = RSXThread::m_width;
|
width = RSXThread::m_width;
|
||||||
height = RSXThread::m_height;
|
height = RSXThread::m_height;
|
||||||
}
|
}
|
||||||
|
|
@ -1199,7 +1198,7 @@ void GLGSRender::Flip()
|
||||||
if(m_fbo.IsCreated())
|
if(m_fbo.IsCreated())
|
||||||
m_fbo.Bind();
|
m_fbo.Bind();
|
||||||
|
|
||||||
for(uint i=0; i<m_post_draw_objs.GetCount(); ++i)
|
for(uint i=0; i<m_post_draw_objs.size(); ++i)
|
||||||
{
|
{
|
||||||
m_post_draw_objs[i].Draw();
|
m_post_draw_objs[i].Draw();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,6 @@ public:
|
||||||
int format = tex.GetFormat() & ~(0x20 | 0x40);
|
int format = tex.GetFormat() & ~(0x20 | 0x40);
|
||||||
bool is_swizzled = !(tex.GetFormat() & CELL_GCM_TEXTURE_LN);
|
bool is_swizzled = !(tex.GetFormat() & CELL_GCM_TEXTURE_LN);
|
||||||
|
|
||||||
glPixelStorei(GL_PACK_ALIGNMENT, tex.m_pitch);
|
|
||||||
char* pixels = (char*)Memory.GetMemFromAddr(GetAddress(tex.GetOffset(), tex.GetLocation()));
|
char* pixels = (char*)Memory.GetMemFromAddr(GetAddress(tex.GetOffset(), tex.GetLocation()));
|
||||||
char* unswizzledPixels;
|
char* unswizzledPixels;
|
||||||
|
|
||||||
|
|
@ -255,7 +254,9 @@ public:
|
||||||
{
|
{
|
||||||
if(!m_id || !tex.GetOffset() || !tex.GetWidth() || !tex.GetHeight()) return;
|
if(!m_id || !tex.GetOffset() || !tex.GetWidth() || !tex.GetHeight()) return;
|
||||||
|
|
||||||
u32* alldata = new u32[tex.GetWidth() * tex.GetHeight()];
|
const u32 texPixelCount = tex.GetWidth() * tex.GetHeight();
|
||||||
|
|
||||||
|
u32* alldata = new u32[texPixelCount];
|
||||||
|
|
||||||
Bind();
|
Bind();
|
||||||
|
|
||||||
|
|
@ -276,15 +277,15 @@ public:
|
||||||
|
|
||||||
{
|
{
|
||||||
wxFile f(name + ".raw", wxFile::write);
|
wxFile f(name + ".raw", wxFile::write);
|
||||||
f.Write(alldata, tex.GetWidth() * tex.GetHeight() * 4);
|
f.Write(alldata, texPixelCount * 4);
|
||||||
}
|
}
|
||||||
u8* data = new u8[tex.GetWidth() * tex.GetHeight() * 3];
|
u8* data = new u8[texPixelCount * 3];
|
||||||
u8* alpha = new u8[tex.GetWidth() * tex.GetHeight()];
|
u8* alpha = new u8[texPixelCount];
|
||||||
|
|
||||||
u8* src = (u8*)alldata;
|
u8* src = (u8*)alldata;
|
||||||
u8* dst_d = data;
|
u8* dst_d = data;
|
||||||
u8* dst_a = alpha;
|
u8* dst_a = alpha;
|
||||||
for(u32 i=0; i<tex.GetWidth()*tex.GetHeight();i++)
|
for (u32 i = 0; i < texPixelCount; i++)
|
||||||
{
|
{
|
||||||
*dst_d++ = *src++;
|
*dst_d++ = *src++;
|
||||||
*dst_d++ = *src++;
|
*dst_d++ = *src++;
|
||||||
|
|
@ -384,7 +385,7 @@ public:
|
||||||
InitializeShaders();
|
InitializeShaders();
|
||||||
m_fp.Compile();
|
m_fp.Compile();
|
||||||
m_vp.Compile();
|
m_vp.Compile();
|
||||||
m_program.Create(m_vp.id, m_fp.id);
|
m_program.Create(m_vp.id, m_fp.GetId());
|
||||||
m_program.Use();
|
m_program.Use();
|
||||||
InitializeLocations();
|
InitializeLocations();
|
||||||
}
|
}
|
||||||
|
|
@ -499,7 +500,7 @@ public:
|
||||||
" gl_Position = in_pos;\n"
|
" gl_Position = in_pos;\n"
|
||||||
"}\n";
|
"}\n";
|
||||||
|
|
||||||
m_fp.shader =
|
m_fp.SetShaderText(
|
||||||
"#version 330\n"
|
"#version 330\n"
|
||||||
"\n"
|
"\n"
|
||||||
"in vec2 tc;\n"
|
"in vec2 tc;\n"
|
||||||
|
|
@ -509,7 +510,7 @@ public:
|
||||||
"void main()\n"
|
"void main()\n"
|
||||||
"{\n"
|
"{\n"
|
||||||
" res = texture(tex0, tc);\n"
|
" res = texture(tex0, tc);\n"
|
||||||
"}\n";
|
"}\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetTexture(void* pixels, int width, int height)
|
void SetTexture(void* pixels, int width, int height)
|
||||||
|
|
@ -540,8 +541,8 @@ class GLGSRender
|
||||||
, public GSRender
|
, public GSRender
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
Array<u8> m_vdata;
|
std::vector<u8> m_vdata;
|
||||||
ArrayF<PostDrawObj> m_post_draw_objs;
|
std::vector<PostDrawObj> m_post_draw_objs;
|
||||||
|
|
||||||
GLProgram m_program;
|
GLProgram m_program;
|
||||||
int m_fp_buf_num;
|
int m_fp_buf_num;
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ GLProgram::GLProgram() : id(0)
|
||||||
|
|
||||||
int GLProgram::GetLocation(const std::string& name)
|
int GLProgram::GetLocation(const std::string& name)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_locations.GetCount(); ++i)
|
for(u32 i=0; i<m_locations.size(); ++i)
|
||||||
{
|
{
|
||||||
if(!m_locations[i].name.compare(name))
|
if(!m_locations[i].name.compare(name))
|
||||||
{
|
{
|
||||||
|
|
@ -16,7 +16,8 @@ int GLProgram::GetLocation(const std::string& name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 pos = m_locations.Move(new Location());
|
m_locations.emplace_back();
|
||||||
|
u32 pos = m_locations.size()-1;
|
||||||
m_locations[pos].name = name;
|
m_locations[pos].name = name;
|
||||||
|
|
||||||
m_locations[pos].loc = glGetUniformLocation(id, name.c_str());
|
m_locations[pos].loc = glGetUniformLocation(id, name.c_str());
|
||||||
|
|
@ -84,7 +85,7 @@ void GLProgram::Create(const u32 vp, const u32 fp)
|
||||||
void GLProgram::UnUse()
|
void GLProgram::UnUse()
|
||||||
{
|
{
|
||||||
id = 0;
|
id = 0;
|
||||||
m_locations.Clear();
|
m_locations.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLProgram::Use()
|
void GLProgram::Use()
|
||||||
|
|
@ -105,5 +106,5 @@ void GLProgram::Delete()
|
||||||
if(!IsCreated()) return;
|
if(!IsCreated()) return;
|
||||||
glDeleteProgram(id);
|
glDeleteProgram(id);
|
||||||
id = 0;
|
id = 0;
|
||||||
m_locations.Clear();
|
m_locations.clear();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ private:
|
||||||
std::string name;
|
std::string name;
|
||||||
};
|
};
|
||||||
|
|
||||||
Array<Location> m_locations;
|
std::vector<Location> m_locations;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
u32 id;
|
u32 id;
|
||||||
|
|
|
||||||
|
|
@ -3,12 +3,12 @@
|
||||||
|
|
||||||
int GLProgramBuffer::SearchFp(const RSXShaderProgram& rsx_fp, GLShaderProgram& gl_fp)
|
int GLProgramBuffer::SearchFp(const RSXShaderProgram& rsx_fp, GLShaderProgram& gl_fp)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_buf.GetCount(); ++i)
|
for(u32 i=0; i<m_buf.size(); ++i)
|
||||||
{
|
{
|
||||||
if(memcmp(&m_buf[i].fp_data[0], &Memory[rsx_fp.addr], m_buf[i].fp_data.GetCount()) != 0) continue;
|
if(memcmp(&m_buf[i].fp_data[0], &Memory[rsx_fp.addr], m_buf[i].fp_data.size()) != 0) continue;
|
||||||
|
|
||||||
gl_fp.id = m_buf[i].fp_id;
|
gl_fp.SetId(m_buf[i].fp_id);
|
||||||
gl_fp.shader = m_buf[i].fp_shader;
|
gl_fp.SetShaderText(m_buf[i].fp_shader);
|
||||||
|
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
@ -18,10 +18,10 @@ int GLProgramBuffer::SearchFp(const RSXShaderProgram& rsx_fp, GLShaderProgram& g
|
||||||
|
|
||||||
int GLProgramBuffer::SearchVp(const RSXVertexProgram& rsx_vp, GLVertexProgram& gl_vp)
|
int GLProgramBuffer::SearchVp(const RSXVertexProgram& rsx_vp, GLVertexProgram& gl_vp)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_buf.GetCount(); ++i)
|
for(u32 i=0; i<m_buf.size(); ++i)
|
||||||
{
|
{
|
||||||
if(m_buf[i].vp_data.GetCount() != rsx_vp.data.GetCount()) continue;
|
if(m_buf[i].vp_data.size() != rsx_vp.data.size()) continue;
|
||||||
if(memcmp(m_buf[i].vp_data.GetPtr(), rsx_vp.data.GetPtr(), rsx_vp.data.GetCount() * 4) != 0) continue;
|
if(memcmp(m_buf[i].vp_data.data(), rsx_vp.data.data(), rsx_vp.data.size() * 4) != 0) continue;
|
||||||
|
|
||||||
gl_vp.id = m_buf[i].vp_id;
|
gl_vp.id = m_buf[i].vp_id;
|
||||||
gl_vp.shader = m_buf[i].vp_shader.c_str();
|
gl_vp.shader = m_buf[i].vp_shader.c_str();
|
||||||
|
|
@ -34,14 +34,14 @@ int GLProgramBuffer::SearchVp(const RSXVertexProgram& rsx_vp, GLVertexProgram& g
|
||||||
|
|
||||||
bool GLProgramBuffer::CmpVP(const u32 a, const u32 b) const
|
bool GLProgramBuffer::CmpVP(const u32 a, const u32 b) const
|
||||||
{
|
{
|
||||||
if(m_buf[a].vp_data.GetCount() != m_buf[b].vp_data.GetCount()) return false;
|
if(m_buf[a].vp_data.size() != m_buf[b].vp_data.size()) return false;
|
||||||
return memcmp(m_buf[a].vp_data.GetPtr(), m_buf[b].vp_data.GetPtr(), m_buf[a].vp_data.GetCount() * 4) == 0;
|
return memcmp(m_buf[a].vp_data.data(), m_buf[b].vp_data.data(), m_buf[a].vp_data.size() * 4) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GLProgramBuffer::CmpFP(const u32 a, const u32 b) const
|
bool GLProgramBuffer::CmpFP(const u32 a, const u32 b) const
|
||||||
{
|
{
|
||||||
if(m_buf[a].fp_data.GetCount() != m_buf[b].fp_data.GetCount()) return false;
|
if(m_buf[a].fp_data.size() != m_buf[b].fp_data.size()) return false;
|
||||||
return memcmp(m_buf[a].fp_data.GetPtr(), m_buf[b].fp_data.GetPtr(), m_buf[a].fp_data.GetCount()) == 0;
|
return memcmp(m_buf[a].fp_data.data(), m_buf[b].fp_data.data(), m_buf[a].fp_data.size()) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 GLProgramBuffer::GetProg(u32 fp, u32 vp) const
|
u32 GLProgramBuffer::GetProg(u32 fp, u32 vp) const
|
||||||
|
|
@ -60,7 +60,7 @@ u32 GLProgramBuffer::GetProg(u32 fp, u32 vp) const
|
||||||
return m_buf[fp].prog_id;
|
return m_buf[fp].prog_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(u32 i=0; i<m_buf.GetCount(); ++i)
|
for(u32 i=0; i<m_buf.size(); ++i)
|
||||||
{
|
{
|
||||||
if(i == fp || i == vp) continue;
|
if(i == fp || i == vp) continue;
|
||||||
|
|
||||||
|
|
@ -84,46 +84,46 @@ u32 GLProgramBuffer::GetProg(u32 fp, u32 vp) const
|
||||||
|
|
||||||
void GLProgramBuffer::Add(GLProgram& prog, GLShaderProgram& gl_fp, RSXShaderProgram& rsx_fp, GLVertexProgram& gl_vp, RSXVertexProgram& rsx_vp)
|
void GLProgramBuffer::Add(GLProgram& prog, GLShaderProgram& gl_fp, RSXShaderProgram& rsx_fp, GLVertexProgram& gl_vp, RSXVertexProgram& rsx_vp)
|
||||||
{
|
{
|
||||||
GLBufferInfo& new_buf = *new GLBufferInfo();
|
GLBufferInfo new_buf;
|
||||||
|
|
||||||
ConLog.Write("Add program (%d):", m_buf.GetCount());
|
ConLog.Write("Add program (%d):", m_buf.size());
|
||||||
ConLog.Write("*** prog id = %d", prog.id);
|
ConLog.Write("*** prog id = %d", prog.id);
|
||||||
ConLog.Write("*** vp id = %d", gl_vp.id);
|
ConLog.Write("*** vp id = %d", gl_vp.id);
|
||||||
ConLog.Write("*** fp id = %d", gl_fp.id);
|
ConLog.Write("*** fp id = %d", gl_fp.GetId());
|
||||||
ConLog.Write("*** vp data size = %d", rsx_vp.data.GetCount() * 4);
|
ConLog.Write("*** vp data size = %d", rsx_vp.data.size() * 4);
|
||||||
ConLog.Write("*** fp data size = %d", rsx_fp.size);
|
ConLog.Write("*** fp data size = %d", rsx_fp.size);
|
||||||
|
|
||||||
ConLog.Write("*** vp shader = \n%s", gl_vp.shader.c_str());
|
ConLog.Write("*** vp shader = \n%s", gl_vp.shader.c_str());
|
||||||
ConLog.Write("*** fp shader = \n%s", gl_fp.shader.c_str());
|
ConLog.Write("*** fp shader = \n%s", gl_fp.GetShaderText().c_str());
|
||||||
|
|
||||||
|
|
||||||
new_buf.prog_id = prog.id;
|
new_buf.prog_id = prog.id;
|
||||||
new_buf.vp_id = gl_vp.id;
|
new_buf.vp_id = gl_vp.id;
|
||||||
new_buf.fp_id = gl_fp.id;
|
new_buf.fp_id = gl_fp.GetId();
|
||||||
|
|
||||||
new_buf.fp_data.AddCpy(&Memory[rsx_fp.addr], rsx_fp.size);
|
new_buf.fp_data.insert(new_buf.fp_data.end(),&Memory[rsx_fp.addr], &Memory[rsx_fp.addr] + rsx_fp.size);
|
||||||
new_buf.vp_data.CopyFrom(rsx_vp.data);
|
new_buf.vp_data = rsx_vp.data;
|
||||||
|
|
||||||
new_buf.vp_shader = gl_vp.shader;
|
new_buf.vp_shader = gl_vp.shader;
|
||||||
new_buf.fp_shader = gl_fp.shader;
|
new_buf.fp_shader = gl_fp.GetShaderText();
|
||||||
|
|
||||||
m_buf.Move(&new_buf);
|
m_buf.push_back(new_buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLProgramBuffer::Clear()
|
void GLProgramBuffer::Clear()
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_buf.GetCount(); ++i)
|
for(u32 i=0; i<m_buf.size(); ++i)
|
||||||
{
|
{
|
||||||
glDeleteProgram(m_buf[i].prog_id);
|
glDeleteProgram(m_buf[i].prog_id);
|
||||||
glDeleteShader(m_buf[i].fp_id);
|
glDeleteShader(m_buf[i].fp_id);
|
||||||
glDeleteShader(m_buf[i].vp_id);
|
glDeleteShader(m_buf[i].vp_id);
|
||||||
|
|
||||||
m_buf[i].fp_data.Clear();
|
m_buf[i].fp_data.clear();
|
||||||
m_buf[i].vp_data.Clear();
|
m_buf[i].vp_data.clear();
|
||||||
|
|
||||||
m_buf[i].vp_shader.clear();
|
m_buf[i].vp_shader.clear();
|
||||||
m_buf[i].fp_shader.clear();
|
m_buf[i].fp_shader.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
m_buf.Clear();
|
m_buf.clear();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,15 +6,15 @@ struct GLBufferInfo
|
||||||
u32 prog_id;
|
u32 prog_id;
|
||||||
u32 fp_id;
|
u32 fp_id;
|
||||||
u32 vp_id;
|
u32 vp_id;
|
||||||
Array<u8> fp_data;
|
std::vector<u8> fp_data;
|
||||||
Array<u32> vp_data;
|
std::vector<u32> vp_data;
|
||||||
std::string fp_shader;
|
std::string fp_shader;
|
||||||
std::string vp_shader;
|
std::string vp_shader;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct GLProgramBuffer
|
struct GLProgramBuffer
|
||||||
{
|
{
|
||||||
Array<GLBufferInfo> m_buf;
|
std::vector<GLBufferInfo> m_buf;
|
||||||
|
|
||||||
int SearchFp(const RSXShaderProgram& rsx_fp, GLShaderProgram& gl_fp);
|
int SearchFp(const RSXShaderProgram& rsx_fp, GLShaderProgram& gl_fp);
|
||||||
int SearchVp(const RSXVertexProgram& rsx_vp, GLVertexProgram& gl_vp);
|
int SearchVp(const RSXVertexProgram& rsx_vp, GLVertexProgram& gl_vp);
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ struct GLParamType
|
||||||
{
|
{
|
||||||
const GLParamFlag flag;
|
const GLParamFlag flag;
|
||||||
std::string type;
|
std::string type;
|
||||||
Array<GLParamItem> items;
|
std::vector<GLParamItem> items;
|
||||||
|
|
||||||
GLParamType(const GLParamFlag _flag, const std::string& _type)
|
GLParamType(const GLParamFlag _flag, const std::string& _type)
|
||||||
: flag(_flag)
|
: flag(_flag)
|
||||||
|
|
@ -41,7 +41,7 @@ struct GLParamType
|
||||||
|
|
||||||
bool SearchName(const std::string& name)
|
bool SearchName(const std::string& name)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<items.GetCount(); ++i)
|
for(u32 i=0; i<items.size(); ++i)
|
||||||
{
|
{
|
||||||
if(items[i].name.compare(name) == 0) return true;
|
if(items[i].name.compare(name) == 0) return true;
|
||||||
}
|
}
|
||||||
|
|
@ -53,7 +53,7 @@ struct GLParamType
|
||||||
{
|
{
|
||||||
std::string ret = "";
|
std::string ret = "";
|
||||||
|
|
||||||
for(u32 n=0; n<items.GetCount(); ++n)
|
for(u32 n=0; n<items.size(); ++n)
|
||||||
{
|
{
|
||||||
ret += items[n].location + type + " " + items[n].name;
|
ret += items[n].location + type + " " + items[n].name;
|
||||||
if(!items[n].value.empty())
|
if(!items[n].value.empty())
|
||||||
|
|
@ -69,11 +69,11 @@ struct GLParamType
|
||||||
|
|
||||||
struct GLParamArray
|
struct GLParamArray
|
||||||
{
|
{
|
||||||
Array<GLParamType> params;
|
std::vector<GLParamType> params;
|
||||||
|
|
||||||
GLParamType* SearchParam(const std::string& type)
|
GLParamType* SearchParam(const std::string& type)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<params.GetCount(); ++i)
|
for(u32 i=0; i<params.size(); ++i)
|
||||||
{
|
{
|
||||||
if (params[i].type.compare(type) == 0)
|
if (params[i].type.compare(type) == 0)
|
||||||
return ¶ms[i];
|
return ¶ms[i];
|
||||||
|
|
@ -109,13 +109,13 @@ struct GLParamArray
|
||||||
|
|
||||||
if(t)
|
if(t)
|
||||||
{
|
{
|
||||||
if(!t->SearchName(name)) t->items.Move(new GLParamItem(name, -1, value));
|
if(!t->SearchName(name)) t->items.emplace_back(name, -1, value);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const u32 num = params.GetCount();
|
const u32 num = params.size();
|
||||||
params.Move(new GLParamType(flag, type));
|
params.emplace_back(flag, type);
|
||||||
params[num].items.Move(new GLParamItem(name, -1, value));
|
params[num].items.emplace_back(name, -1, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
return name;
|
return name;
|
||||||
|
|
@ -128,13 +128,13 @@ struct GLParamArray
|
||||||
|
|
||||||
if(t)
|
if(t)
|
||||||
{
|
{
|
||||||
if(!t->SearchName(name)) t->items.Move(new GLParamItem(name, location));
|
if(!t->SearchName(name)) t->items.emplace_back(name, location);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const u32 num = params.GetCount();
|
const u32 num = params.size();
|
||||||
params.Move(new GLParamType(flag, type));
|
params.emplace_back(flag, type);
|
||||||
params[num].items.Move(new GLParamItem(name, location));
|
params[num].items.emplace_back(name, location);
|
||||||
}
|
}
|
||||||
|
|
||||||
return name;
|
return name;
|
||||||
|
|
|
||||||
|
|
@ -248,15 +248,16 @@ std::string GLVertexDecompilerThread::GetFunc()
|
||||||
u32 offset = (d2.iaddrh << 3) | d3.iaddrl;
|
u32 offset = (d2.iaddrh << 3) | d3.iaddrl;
|
||||||
std::string name = fmt::Format("func%u", offset);
|
std::string name = fmt::Format("func%u", offset);
|
||||||
|
|
||||||
for(uint i=0; i<m_funcs.GetCount(); ++i)
|
for(uint i=0; i<m_funcs.size(); ++i)
|
||||||
{
|
{
|
||||||
if(m_funcs[i].name.compare(name) == 0)
|
if(m_funcs[i].name.compare(name) == 0)
|
||||||
return name + "()";
|
return name + "()";
|
||||||
}
|
}
|
||||||
|
|
||||||
uint idx = m_funcs.Add(new FuncInfo());
|
m_funcs.emplace_back();
|
||||||
m_funcs[idx].offset = offset;
|
FuncInfo &idx = m_funcs.back();
|
||||||
m_funcs[idx].name = name;
|
idx.offset = offset;
|
||||||
|
idx.name = name;
|
||||||
|
|
||||||
return name + "()";
|
return name + "()";
|
||||||
}
|
}
|
||||||
|
|
@ -280,7 +281,7 @@ std::string GLVertexDecompilerThread::BuildFuncBody(const FuncInfo& func)
|
||||||
if(i != func.offset)
|
if(i != func.offset)
|
||||||
{
|
{
|
||||||
uint call_func = -1;
|
uint call_func = -1;
|
||||||
for(uint j=0; j<m_funcs.GetCount(); ++j)
|
for(uint j=0; j<m_funcs.size(); ++j)
|
||||||
{
|
{
|
||||||
if(m_funcs[j].offset == i)
|
if(m_funcs[j].offset == i)
|
||||||
{
|
{
|
||||||
|
|
@ -306,14 +307,14 @@ std::string GLVertexDecompilerThread::BuildCode()
|
||||||
{
|
{
|
||||||
std::string p;
|
std::string p;
|
||||||
|
|
||||||
for(u32 i=0; i<m_parr.params.GetCount(); ++i)
|
for(u32 i=0; i<m_parr.params.size(); ++i)
|
||||||
{
|
{
|
||||||
p += m_parr.params[i].Format();
|
p += m_parr.params[i].Format();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string fp;
|
std::string fp;
|
||||||
|
|
||||||
for(int i=m_funcs.GetCount() - 1; i>0; --i)
|
for(int i=m_funcs.size() - 1; i>0; --i)
|
||||||
{
|
{
|
||||||
fp += fmt::Format("void %s();\n", m_funcs[i].name.c_str());
|
fp += fmt::Format("void %s();\n", m_funcs[i].name.c_str());
|
||||||
}
|
}
|
||||||
|
|
@ -323,7 +324,7 @@ std::string GLVertexDecompilerThread::BuildCode()
|
||||||
f += fmt::Format("void %s()\n{\n\tgl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);\n\t%s();\n\tgl_Position = gl_Position * scaleOffsetMat;\n}\n",
|
f += fmt::Format("void %s()\n{\n\tgl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);\n\t%s();\n\tgl_Position = gl_Position * scaleOffsetMat;\n}\n",
|
||||||
m_funcs[0].name.c_str(), m_funcs[1].name.c_str());
|
m_funcs[0].name.c_str(), m_funcs[1].name.c_str());
|
||||||
|
|
||||||
for(uint i=1; i<m_funcs.GetCount(); ++i)
|
for(uint i=1; i<m_funcs.size(); ++i)
|
||||||
{
|
{
|
||||||
f += fmt::Format("\nvoid %s()\n{\n%s}\n", m_funcs[i].name.c_str(), BuildFuncBody(m_funcs[i]).c_str());
|
f += fmt::Format("\nvoid %s()\n{\n%s}\n", m_funcs[i].name.c_str(), BuildFuncBody(m_funcs[i]).c_str());
|
||||||
}
|
}
|
||||||
|
|
@ -341,7 +342,7 @@ std::string GLVertexDecompilerThread::BuildCode()
|
||||||
|
|
||||||
void GLVertexDecompilerThread::Task()
|
void GLVertexDecompilerThread::Task()
|
||||||
{
|
{
|
||||||
m_parr.params.Clear();
|
m_parr.params.clear();
|
||||||
|
|
||||||
for(u32 i=0, intsCount=0;;intsCount++)
|
for(u32 i=0, intsCount=0;;intsCount++)
|
||||||
{
|
{
|
||||||
|
|
@ -426,7 +427,7 @@ void GLVertexDecompilerThread::Task()
|
||||||
|
|
||||||
if(d3.end)
|
if(d3.end)
|
||||||
{
|
{
|
||||||
if(i < m_data.GetCount())
|
if(i < m_data.size())
|
||||||
ConLog.Error("Program end before buffer end.");
|
ConLog.Error("Program end before buffer end.");
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
@ -436,7 +437,10 @@ void GLVertexDecompilerThread::Task()
|
||||||
m_shader = BuildCode();
|
m_shader = BuildCode();
|
||||||
|
|
||||||
m_body.clear();
|
m_body.clear();
|
||||||
m_funcs.RemoveAt(2, m_funcs.GetCount() - 2);
|
if (m_funcs.size() > 2)
|
||||||
|
{
|
||||||
|
m_funcs.erase(m_funcs.begin()+2, m_funcs.end());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
GLVertexProgram::GLVertexProgram()
|
GLVertexProgram::GLVertexProgram()
|
||||||
|
|
@ -521,7 +525,7 @@ void GLVertexProgram::Compile()
|
||||||
|
|
||||||
void GLVertexProgram::Delete()
|
void GLVertexProgram::Delete()
|
||||||
{
|
{
|
||||||
parr.params.Clear();
|
parr.params.clear();
|
||||||
shader.clear();
|
shader.clear();
|
||||||
|
|
||||||
if(id)
|
if(id)
|
||||||
|
|
|
||||||
|
|
@ -135,23 +135,23 @@ struct GLVertexDecompilerThread : public ThreadBase
|
||||||
|
|
||||||
std::vector<std::string> m_body;
|
std::vector<std::string> m_body;
|
||||||
|
|
||||||
ArrayF<FuncInfo> m_funcs;
|
std::vector<FuncInfo> m_funcs;
|
||||||
|
|
||||||
//wxString main;
|
//wxString main;
|
||||||
std::string& m_shader;
|
std::string& m_shader;
|
||||||
Array<u32>& m_data;
|
std::vector<u32>& m_data;
|
||||||
GLParamArray& m_parr;
|
GLParamArray& m_parr;
|
||||||
|
|
||||||
GLVertexDecompilerThread(Array<u32>& data, std::string& shader, GLParamArray& parr)
|
GLVertexDecompilerThread(std::vector<u32>& data, std::string& shader, GLParamArray& parr)
|
||||||
: ThreadBase("Vertex Shader Decompiler Thread")
|
: ThreadBase("Vertex Shader Decompiler Thread")
|
||||||
, m_data(data)
|
, m_data(data)
|
||||||
, m_shader(shader)
|
, m_shader(shader)
|
||||||
, m_parr(parr)
|
, m_parr(parr)
|
||||||
{
|
{
|
||||||
m_funcs.Add(new FuncInfo());
|
m_funcs.emplace_back();
|
||||||
m_funcs[0].offset = 0;
|
m_funcs[0].offset = 0;
|
||||||
m_funcs[0].name = "main";
|
m_funcs[0].name = "main";
|
||||||
m_funcs.Add(new FuncInfo());
|
m_funcs.emplace_back();
|
||||||
m_funcs[1].offset = 0;
|
m_funcs[1].offset = 0;
|
||||||
m_funcs[1].name = "func0";
|
m_funcs[1].name = "func0";
|
||||||
//m_cur_func->body = "\tgl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);\n";
|
//m_cur_func->body = "\tgl_Position = vec4(0.0f, 0.0f, 0.0f, 1.0f);\n";
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ void RSXVertexData::Reset()
|
||||||
size = 0;
|
size = 0;
|
||||||
type = 0;
|
type = 0;
|
||||||
addr = 0;
|
addr = 0;
|
||||||
data.ClearF();
|
data.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void RSXVertexData::Load(u32 start, u32 count)
|
void RSXVertexData::Load(u32 start, u32 count)
|
||||||
|
|
@ -45,7 +45,7 @@ void RSXVertexData::Load(u32 start, u32 count)
|
||||||
|
|
||||||
const u32 tsize = GetTypeSize();
|
const u32 tsize = GetTypeSize();
|
||||||
|
|
||||||
data.SetCount((start + count) * tsize * size);
|
data.resize((start + count) * tsize * size);
|
||||||
|
|
||||||
for(u32 i=start; i<start + count; ++i)
|
for(u32 i=start; i<start + count; ++i)
|
||||||
{
|
{
|
||||||
|
|
@ -181,6 +181,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3
|
||||||
|
|
||||||
u32 index = 0;
|
u32 index = 0;
|
||||||
|
|
||||||
|
m_used_gcm_commands.insert(cmd);
|
||||||
|
|
||||||
//static u32 draw_array_count = 0;
|
//static u32 draw_array_count = 0;
|
||||||
|
|
||||||
switch(cmd)
|
switch(cmd)
|
||||||
|
|
@ -236,10 +238,10 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3
|
||||||
m_vertex_data[index].Reset();
|
m_vertex_data[index].Reset();
|
||||||
m_vertex_data[index].size = 4;
|
m_vertex_data[index].size = 4;
|
||||||
m_vertex_data[index].type = 4;
|
m_vertex_data[index].type = 4;
|
||||||
m_vertex_data[index].data.AddCpy(v0);
|
m_vertex_data[index].data.push_back(v0);
|
||||||
m_vertex_data[index].data.AddCpy(v1);
|
m_vertex_data[index].data.push_back(v1);
|
||||||
m_vertex_data[index].data.AddCpy(v2);
|
m_vertex_data[index].data.push_back(v2);
|
||||||
m_vertex_data[index].data.AddCpy(v3);
|
m_vertex_data[index].data.push_back(v3);
|
||||||
//ConLog.Warning("index = %d, v0 = 0x%x, v1 = 0x%x, v2 = 0x%x, v3 = 0x%x", index, v0, v1, v2, v3);
|
//ConLog.Warning("index = %d, v0 = 0x%x, v1 = 0x%x, v2 = 0x%x, v3 = 0x%x", index, v0, v1, v2, v3);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
@ -255,7 +257,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3
|
||||||
m_vertex_data[index].Reset();
|
m_vertex_data[index].Reset();
|
||||||
m_vertex_data[index].type = 2;
|
m_vertex_data[index].type = 2;
|
||||||
m_vertex_data[index].size = 2;
|
m_vertex_data[index].size = 2;
|
||||||
m_vertex_data[index].data.SetCount(sizeof(float) * 2);
|
m_vertex_data[index].data.resize(sizeof(float) * 2);
|
||||||
(float&)m_vertex_data[index].data[sizeof(float)*0] = v0;
|
(float&)m_vertex_data[index].data[sizeof(float)*0] = v0;
|
||||||
(float&)m_vertex_data[index].data[sizeof(float)*1] = v1;
|
(float&)m_vertex_data[index].data[sizeof(float)*1] = v1;
|
||||||
|
|
||||||
|
|
@ -278,7 +280,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3
|
||||||
m_vertex_data[index].Reset();
|
m_vertex_data[index].Reset();
|
||||||
m_vertex_data[index].type = 2;
|
m_vertex_data[index].type = 2;
|
||||||
m_vertex_data[index].size = 4;
|
m_vertex_data[index].size = 4;
|
||||||
m_vertex_data[index].data.SetCount(sizeof(float) * 4);
|
m_vertex_data[index].data.resize(sizeof(float) * 4);
|
||||||
(float&)m_vertex_data[index].data[sizeof(float)*0] = v0;
|
(float&)m_vertex_data[index].data[sizeof(float)*0] = v0;
|
||||||
(float&)m_vertex_data[index].data[sizeof(float)*1] = v1;
|
(float&)m_vertex_data[index].data[sizeof(float)*1] = v1;
|
||||||
(float&)m_vertex_data[index].data[sizeof(float)*2] = v2;
|
(float&)m_vertex_data[index].data[sizeof(float)*2] = v2;
|
||||||
|
|
@ -299,7 +301,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3
|
||||||
u32 a0 = ARGS(0);
|
u32 a0 = ARGS(0);
|
||||||
u32 pitch = a0 & 0xFFFFF;
|
u32 pitch = a0 & 0xFFFFF;
|
||||||
u16 depth = a0 >> 20;
|
u16 depth = a0 >> 20;
|
||||||
tex.SetControl3(pitch, depth);
|
tex.SetControl3(depth, pitch);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
@ -325,6 +327,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3
|
||||||
case_16(NV4097_SET_TEXTURE_BORDER_COLOR,0x20):
|
case_16(NV4097_SET_TEXTURE_BORDER_COLOR,0x20):
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case NV4097_SET_SURFACE_FORMAT:
|
case NV4097_SET_SURFACE_FORMAT:
|
||||||
{
|
{
|
||||||
|
|
@ -528,7 +531,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3
|
||||||
const u32 addr = GetAddress(ARGS(0) & 0x7fffffff, ARGS(0) >> 31);
|
const u32 addr = GetAddress(ARGS(0) & 0x7fffffff, ARGS(0) >> 31);
|
||||||
CMD_LOG("num=%d, addr=0x%x", index, addr);
|
CMD_LOG("num=%d, addr=0x%x", index, addr);
|
||||||
m_vertex_data[index].addr = addr;
|
m_vertex_data[index].addr = addr;
|
||||||
m_vertex_data[index].data.ClearF();
|
m_vertex_data[index].data.clear();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
@ -592,8 +595,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
{
|
{
|
||||||
int pos = m_indexed_array.m_data.GetCount();
|
int pos = m_indexed_array.m_data.size();
|
||||||
m_indexed_array.m_data.InsertRoomEnd(4);
|
m_indexed_array.m_data.resize(m_indexed_array.m_data.size() + 4);
|
||||||
index = Memory.Read32(m_indexed_array.m_addr + i * 4);
|
index = Memory.Read32(m_indexed_array.m_addr + i * 4);
|
||||||
*(u32*)&m_indexed_array.m_data[pos] = index;
|
*(u32*)&m_indexed_array.m_data[pos] = index;
|
||||||
//ConLog.Warning("index 4: %d", *(u32*)&m_indexed_array.m_data[pos]);
|
//ConLog.Warning("index 4: %d", *(u32*)&m_indexed_array.m_data[pos]);
|
||||||
|
|
@ -602,8 +605,8 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
{
|
{
|
||||||
int pos = m_indexed_array.m_data.GetCount();
|
int pos = m_indexed_array.m_data.size();
|
||||||
m_indexed_array.m_data.InsertRoomEnd(2);
|
m_indexed_array.m_data.resize(m_indexed_array.m_data.size() + 2);
|
||||||
index = Memory.Read16(m_indexed_array.m_addr + i * 2);
|
index = Memory.Read16(m_indexed_array.m_addr + i * 2);
|
||||||
//ConLog.Warning("index 2: %d", index);
|
//ConLog.Warning("index 2: %d", index);
|
||||||
*(u16*)&m_indexed_array.m_data[pos] = index;
|
*(u16*)&m_indexed_array.m_data[pos] = index;
|
||||||
|
|
@ -684,7 +687,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3
|
||||||
//ConLog.Warning("NV4097_SET_TRANSFORM_PROGRAM_LOAD: prog = %d", ARGS(0));
|
//ConLog.Warning("NV4097_SET_TRANSFORM_PROGRAM_LOAD: prog = %d", ARGS(0));
|
||||||
|
|
||||||
m_cur_vertex_prog = &m_vertex_progs[ARGS(0)];
|
m_cur_vertex_prog = &m_vertex_progs[ARGS(0)];
|
||||||
m_cur_vertex_prog->data.Clear();
|
m_cur_vertex_prog->data.clear();
|
||||||
|
|
||||||
if(count == 2)
|
if(count == 2)
|
||||||
{
|
{
|
||||||
|
|
@ -705,7 +708,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
for(u32 i=0; i<count; ++i) m_cur_vertex_prog->data.AddCpy(ARGS(i));
|
for(u32 i=0; i<count; ++i) m_cur_vertex_prog->data.push_back(ARGS(i));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
@ -745,7 +748,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3
|
||||||
RSXTransformConstant c(id, (float&)x, (float&)y, (float&)z, (float&)w);
|
RSXTransformConstant c(id, (float&)x, (float&)y, (float&)z, (float&)w);
|
||||||
|
|
||||||
CMD_LOG("SET_TRANSFORM_CONSTANT_LOAD[%d : %d] = (%f, %f, %f, %f)", i, id, c.x, c.y, c.z, c.w);
|
CMD_LOG("SET_TRANSFORM_CONSTANT_LOAD[%d : %d] = (%f, %f, %f, %f)", i, id, c.x, c.y, c.z, c.w);
|
||||||
m_transform_constants.AddCpy(c);
|
m_transform_constants.push_back(c);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
@ -1252,7 +1255,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3
|
||||||
}
|
}
|
||||||
|
|
||||||
//ConLog.Warning("NV308A_COLOR: [%d]: %f, %f, %f, %f", c.id, c.x, c.y, c.z, c.w);
|
//ConLog.Warning("NV308A_COLOR: [%d]: %f, %f, %f, %f", c.id, c.x, c.y, c.z, c.w);
|
||||||
m_fragment_constants.AddCpy(c);
|
m_fragment_constants.push_back(c);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
@ -1489,7 +1492,7 @@ void RSXThread::Begin(u32 draw_mode)
|
||||||
m_draw_array_count = 0;
|
m_draw_array_count = 0;
|
||||||
m_draw_array_first = ~0;
|
m_draw_array_first = ~0;
|
||||||
|
|
||||||
if(Emu.GetCallbackManager().m_exit_callback.m_callbacks.GetCount())
|
if(Emu.GetCallbackManager().m_exit_callback.m_callbacks.size())
|
||||||
{
|
{
|
||||||
//Emu.GetCallbackManager().m_exit_callback.Handle(0x0121, 0);
|
//Emu.GetCallbackManager().m_exit_callback.Handle(0x0121, 0);
|
||||||
}
|
}
|
||||||
|
|
@ -1499,14 +1502,14 @@ void RSXThread::End()
|
||||||
{
|
{
|
||||||
ExecCMD();
|
ExecCMD();
|
||||||
|
|
||||||
if(Emu.GetCallbackManager().m_exit_callback.m_callbacks.GetCount())
|
if(Emu.GetCallbackManager().m_exit_callback.m_callbacks.size())
|
||||||
{
|
{
|
||||||
//Emu.GetCallbackManager().m_exit_callback.Handle(0x0122, 0);
|
//Emu.GetCallbackManager().m_exit_callback.Handle(0x0122, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
m_indexed_array.Reset();
|
m_indexed_array.Reset();
|
||||||
m_fragment_constants.Clear();
|
m_fragment_constants.clear();
|
||||||
m_transform_constants.Clear();
|
m_transform_constants.clear();
|
||||||
m_cur_shader_prog_num = 0;
|
m_cur_shader_prog_num = 0;
|
||||||
//m_cur_shader_prog = nullptr;
|
//m_cur_shader_prog = nullptr;
|
||||||
|
|
||||||
|
|
@ -1562,7 +1565,7 @@ void RSXThread::Task()
|
||||||
}
|
}
|
||||||
if(cmd & CELL_GCM_METHOD_FLAG_CALL)
|
if(cmd & CELL_GCM_METHOD_FLAG_CALL)
|
||||||
{
|
{
|
||||||
m_call_stack.Push(get + 4);
|
m_call_stack.push(get + 4);
|
||||||
u32 offs = cmd & ~CELL_GCM_METHOD_FLAG_CALL;
|
u32 offs = cmd & ~CELL_GCM_METHOD_FLAG_CALL;
|
||||||
u32 addr = Memory.RSXIOMem.GetStartAddr() + offs;
|
u32 addr = Memory.RSXIOMem.GetStartAddr() + offs;
|
||||||
//ConLog.Warning("rsx call(0x%x) #0x%x - 0x%x - 0x%x", offs, addr, cmd, get);
|
//ConLog.Warning("rsx call(0x%x) #0x%x - 0x%x - 0x%x", offs, addr, cmd, get);
|
||||||
|
|
@ -1572,7 +1575,8 @@ void RSXThread::Task()
|
||||||
if(cmd == CELL_GCM_METHOD_FLAG_RETURN)
|
if(cmd == CELL_GCM_METHOD_FLAG_RETURN)
|
||||||
{
|
{
|
||||||
//ConLog.Warning("rsx return!");
|
//ConLog.Warning("rsx return!");
|
||||||
u32 get = m_call_stack.Pop();
|
u32 get = m_call_stack.top();
|
||||||
|
m_call_stack.pop();
|
||||||
//ConLog.Warning("rsx return(0x%x)", get);
|
//ConLog.Warning("rsx return(0x%x)", get);
|
||||||
m_ctrl->get = get;
|
m_ctrl->get = get;
|
||||||
continue;
|
continue;
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,9 @@
|
||||||
#include "RSXFragmentProgram.h"
|
#include "RSXFragmentProgram.h"
|
||||||
#include "Emu/SysCalls/Callback.h"
|
#include "Emu/SysCalls/Callback.h"
|
||||||
|
|
||||||
|
#include <stack>
|
||||||
|
#include <set> // For tracking a list of used gcm commands
|
||||||
|
|
||||||
enum Method
|
enum Method
|
||||||
{
|
{
|
||||||
CELL_GCM_METHOD_FLAG_NON_INCREMENT = 0x40000000,
|
CELL_GCM_METHOD_FLAG_NON_INCREMENT = 0x40000000,
|
||||||
|
|
@ -25,7 +28,7 @@ struct RSXVertexData
|
||||||
u32 addr;
|
u32 addr;
|
||||||
u32 constant_count;
|
u32 constant_count;
|
||||||
|
|
||||||
Array<u8> data;
|
std::vector<u8> data;
|
||||||
|
|
||||||
RSXVertexData();
|
RSXVertexData();
|
||||||
|
|
||||||
|
|
@ -38,7 +41,7 @@ struct RSXVertexData
|
||||||
|
|
||||||
struct RSXIndexArrayData
|
struct RSXIndexArrayData
|
||||||
{
|
{
|
||||||
Array<u8> m_data;
|
std::vector<u8> m_data;
|
||||||
int m_type;
|
int m_type;
|
||||||
u32 m_first;
|
u32 m_first;
|
||||||
u32 m_count;
|
u32 m_count;
|
||||||
|
|
@ -59,7 +62,7 @@ struct RSXIndexArrayData
|
||||||
m_addr = 0;
|
m_addr = 0;
|
||||||
index_min = ~0;
|
index_min = ~0;
|
||||||
index_max = 0;
|
index_max = 0;
|
||||||
m_data.Clear();
|
m_data.clear();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -95,7 +98,7 @@ public:
|
||||||
static const uint m_tiles_count = 15;
|
static const uint m_tiles_count = 15;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Stack<u32> m_call_stack;
|
std::stack<u32> m_call_stack;
|
||||||
CellGcmControl* m_ctrl;
|
CellGcmControl* m_ctrl;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
@ -103,8 +106,8 @@ public:
|
||||||
RSXTexture m_textures[m_textures_count];
|
RSXTexture m_textures[m_textures_count];
|
||||||
RSXVertexData m_vertex_data[m_vertex_count];
|
RSXVertexData m_vertex_data[m_vertex_count];
|
||||||
RSXIndexArrayData m_indexed_array;
|
RSXIndexArrayData m_indexed_array;
|
||||||
Array<RSXTransformConstant> m_fragment_constants;
|
std::vector<RSXTransformConstant> m_fragment_constants;
|
||||||
Array<RSXTransformConstant> m_transform_constants;
|
std::vector<RSXTransformConstant> m_transform_constants;
|
||||||
|
|
||||||
u32 m_cur_shader_prog_num;
|
u32 m_cur_shader_prog_num;
|
||||||
RSXShaderProgram m_shader_progs[m_fragment_count];
|
RSXShaderProgram m_shader_progs[m_fragment_count];
|
||||||
|
|
@ -382,6 +385,8 @@ public:
|
||||||
u8 m_begin_end;
|
u8 m_begin_end;
|
||||||
bool m_read_buffer;
|
bool m_read_buffer;
|
||||||
|
|
||||||
|
std::set<u32> m_used_gcm_commands;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
RSXThread()
|
RSXThread()
|
||||||
: ThreadBase("RSXThread")
|
: ThreadBase("RSXThread")
|
||||||
|
|
@ -536,6 +541,8 @@ public:
|
||||||
m_cur_shader_prog = nullptr;
|
m_cur_shader_prog = nullptr;
|
||||||
m_cur_shader_prog_num = 0;
|
m_cur_shader_prog_num = 0;
|
||||||
|
|
||||||
|
m_used_gcm_commands.clear();
|
||||||
|
|
||||||
OnInit();
|
OnInit();
|
||||||
ThreadBase::Start();
|
ThreadBase::Start();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,5 +2,5 @@
|
||||||
|
|
||||||
struct RSXVertexProgram
|
struct RSXVertexProgram
|
||||||
{
|
{
|
||||||
Array<u32> data;
|
std::vector<u32> data;
|
||||||
};
|
};
|
||||||
|
|
@ -202,9 +202,9 @@ protected:
|
||||||
std::vector<Pad> m_pads;
|
std::vector<Pad> m_pads;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual ~PadHandlerBase() = default;
|
|
||||||
virtual void Init(const u32 max_connect)=0;
|
virtual void Init(const u32 max_connect)=0;
|
||||||
virtual void Close()=0;
|
virtual void Close()=0;
|
||||||
|
virtual ~PadHandlerBase() = default;
|
||||||
|
|
||||||
void Key(const u32 code, bool pressed)
|
void Key(const u32 code, bool pressed)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,8 @@
|
||||||
//DynamicMemoryBlockBase
|
//DynamicMemoryBlockBase
|
||||||
template<typename PT>
|
template<typename PT>
|
||||||
DynamicMemoryBlockBase<PT>::DynamicMemoryBlockBase()
|
DynamicMemoryBlockBase<PT>::DynamicMemoryBlockBase()
|
||||||
: PT()
|
: PT()
|
||||||
, m_max_size(0)
|
, m_max_size(0)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -14,7 +14,7 @@ const u32 DynamicMemoryBlockBase<PT>::GetUsedSize() const
|
||||||
|
|
||||||
u32 size = 0;
|
u32 size = 0;
|
||||||
|
|
||||||
for(u32 i=0; i<m_allocated.GetCount(); ++i)
|
for (u32 i = 0; i<m_allocated.size(); ++i)
|
||||||
{
|
{
|
||||||
size += m_allocated[i].size;
|
size += m_allocated[i].size;
|
||||||
}
|
}
|
||||||
|
|
@ -53,10 +53,10 @@ MemoryBlock* DynamicMemoryBlockBase<PT>::SetRange(const u64 start, const u32 siz
|
||||||
MemoryBlock::SetRange(start, 0);
|
MemoryBlock::SetRange(start, 0);
|
||||||
|
|
||||||
const u32 page_count = m_max_size >> 12;
|
const u32 page_count = m_max_size >> 12;
|
||||||
m_pages.SetCount(page_count);
|
m_pages.resize(page_count);
|
||||||
m_locked.SetCount(page_count);
|
m_locked.resize(page_count);
|
||||||
memset(m_pages.GetPtr(), 0, sizeof(u8*) * page_count);
|
memset(m_pages.data(), 0, sizeof(u8*) * page_count);
|
||||||
memset(m_locked.GetPtr(), 0, sizeof(u8*) * page_count);
|
memset(m_locked.data(), 0, sizeof(u8*) * page_count);
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
@ -66,11 +66,11 @@ void DynamicMemoryBlockBase<PT>::Delete()
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(m_lock);
|
std::lock_guard<std::mutex> lock(m_lock);
|
||||||
|
|
||||||
m_allocated.Clear();
|
m_allocated.clear();
|
||||||
m_max_size = 0;
|
m_max_size = 0;
|
||||||
|
|
||||||
m_pages.Clear();
|
m_pages.clear();
|
||||||
m_locked.Clear();
|
m_locked.clear();
|
||||||
|
|
||||||
MemoryBlock::Delete();
|
MemoryBlock::Delete();
|
||||||
}
|
}
|
||||||
|
|
@ -82,22 +82,22 @@ bool DynamicMemoryBlockBase<PT>::AllocFixed(u64 addr, u32 size)
|
||||||
|
|
||||||
addr &= ~4095; // align start address
|
addr &= ~4095; // align start address
|
||||||
|
|
||||||
if(!IsInMyRange(addr, size))
|
if (!IsInMyRange(addr, size))
|
||||||
{
|
{
|
||||||
assert(0);
|
assert(0);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(IsMyAddress(addr) || IsMyAddress(addr + size - 1))
|
if (IsMyAddress(addr) || IsMyAddress(addr + size - 1))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::lock_guard<std::mutex> lock(m_lock);
|
std::lock_guard<std::mutex> lock(m_lock);
|
||||||
|
|
||||||
for(u32 i=0; i<m_allocated.GetCount(); ++i)
|
for (u32 i = 0; i<m_allocated.size(); ++i)
|
||||||
{
|
{
|
||||||
if(addr >= m_allocated[i].addr && addr < m_allocated[i].addr + m_allocated[i].size) return false;
|
if (addr >= m_allocated[i].addr && addr < m_allocated[i].addr + m_allocated[i].size) return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
AppendMem(addr, size);
|
AppendMem(addr, size);
|
||||||
|
|
@ -108,7 +108,9 @@ bool DynamicMemoryBlockBase<PT>::AllocFixed(u64 addr, u32 size)
|
||||||
template<typename PT>
|
template<typename PT>
|
||||||
void DynamicMemoryBlockBase<PT>::AppendMem(u64 addr, u32 size) /* private */
|
void DynamicMemoryBlockBase<PT>::AppendMem(u64 addr, u32 size) /* private */
|
||||||
{
|
{
|
||||||
u8* pointer = (u8*)m_allocated[m_allocated.Move(new MemBlockInfo(addr, size))].mem;
|
//u8* pointer = (u8*)m_allocated[m_allocated.Move(new MemBlockInfo(addr, size))].mem;
|
||||||
|
m_allocated.emplace_back(addr, size);
|
||||||
|
u8* pointer = (u8*) m_allocated.back().mem;
|
||||||
|
|
||||||
const u32 first = MemoryBlock::FixAddr(addr) >> 12;
|
const u32 first = MemoryBlock::FixAddr(addr) >> 12;
|
||||||
|
|
||||||
|
|
@ -141,13 +143,13 @@ u64 DynamicMemoryBlockBase<PT>::AllocAlign(u32 size, u32 align)
|
||||||
|
|
||||||
std::lock_guard<std::mutex> lock(m_lock);
|
std::lock_guard<std::mutex> lock(m_lock);
|
||||||
|
|
||||||
for(u64 addr = MemoryBlock::GetStartAddr(); addr <= MemoryBlock::GetEndAddr() - exsize;)
|
for (u64 addr = MemoryBlock::GetStartAddr(); addr <= MemoryBlock::GetEndAddr() - exsize;)
|
||||||
{
|
{
|
||||||
bool is_good_addr = true;
|
bool is_good_addr = true;
|
||||||
|
|
||||||
for(u32 i=0; i<m_allocated.GetCount(); ++i)
|
for (u32 i = 0; i<m_allocated.size(); ++i)
|
||||||
{
|
{
|
||||||
if((addr >= m_allocated[i].addr && addr < m_allocated[i].addr + m_allocated[i].size) ||
|
if ((addr >= m_allocated[i].addr && addr < m_allocated[i].addr + m_allocated[i].size) ||
|
||||||
(m_allocated[i].addr >= addr && m_allocated[i].addr < addr + exsize))
|
(m_allocated[i].addr >= addr && m_allocated[i].addr < addr + exsize))
|
||||||
{
|
{
|
||||||
is_good_addr = false;
|
is_good_addr = false;
|
||||||
|
|
@ -156,7 +158,7 @@ u64 DynamicMemoryBlockBase<PT>::AllocAlign(u32 size, u32 align)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!is_good_addr) continue;
|
if (!is_good_addr) continue;
|
||||||
|
|
||||||
if (align)
|
if (align)
|
||||||
{
|
{
|
||||||
|
|
@ -182,7 +184,7 @@ bool DynamicMemoryBlockBase<PT>::Free(u64 addr)
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(m_lock);
|
std::lock_guard<std::mutex> lock(m_lock);
|
||||||
|
|
||||||
for (u32 num = 0; num < m_allocated.GetCount(); num++)
|
for (u32 num = 0; num < m_allocated.size(); num++)
|
||||||
{
|
{
|
||||||
if (addr == m_allocated[num].addr)
|
if (addr == m_allocated[num].addr)
|
||||||
{
|
{
|
||||||
|
|
@ -205,13 +207,13 @@ bool DynamicMemoryBlockBase<PT>::Free(u64 addr)
|
||||||
m_locked[i] = nullptr;
|
m_locked[i] = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_allocated.RemoveAt(num);
|
m_allocated.erase(m_allocated.begin() + num);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ConLog.Error("DynamicMemoryBlock::Free(addr=0x%llx): failed", addr);
|
ConLog.Error("DynamicMemoryBlock::Free(addr=0x%llx): failed", addr);
|
||||||
for (u32 i = 0; i < m_allocated.GetCount(); i++)
|
for (u32 i = 0; i < m_allocated.size(); i++)
|
||||||
{
|
{
|
||||||
ConLog.Write("*** Memory Block: addr = 0x%llx, size = 0x%x", m_allocated[i].addr, m_allocated[i].size);
|
ConLog.Write("*** Memory Block: addr = 0x%llx, size = 0x%x", m_allocated[i].addr, m_allocated[i].size);
|
||||||
}
|
}
|
||||||
|
|
@ -223,7 +225,7 @@ u8* DynamicMemoryBlockBase<PT>::GetMem(u64 addr) const // lock-free, addr is fix
|
||||||
{
|
{
|
||||||
const u32 index = addr >> 12;
|
const u32 index = addr >> 12;
|
||||||
|
|
||||||
if (index < m_pages.GetCount())
|
if (index < m_pages.size())
|
||||||
{
|
{
|
||||||
if (u8* res = m_pages[index])
|
if (u8* res = m_pages[index])
|
||||||
{
|
{
|
||||||
|
|
@ -243,7 +245,7 @@ bool DynamicMemoryBlockBase<PT>::IsLocked(u64 addr) // lock-free
|
||||||
{
|
{
|
||||||
const u32 index = MemoryBlock::FixAddr(addr) >> 12;
|
const u32 index = MemoryBlock::FixAddr(addr) >> 12;
|
||||||
|
|
||||||
if (index < m_locked.GetCount())
|
if (index < m_locked.size())
|
||||||
{
|
{
|
||||||
if (m_locked[index]) return true;
|
if (m_locked[index]) return true;
|
||||||
}
|
}
|
||||||
|
|
@ -259,13 +261,13 @@ bool DynamicMemoryBlockBase<PT>::Lock(u64 addr, u32 size)
|
||||||
|
|
||||||
addr &= ~4095; // align start address
|
addr &= ~4095; // align start address
|
||||||
|
|
||||||
if(!IsInMyRange(addr, size))
|
if (!IsInMyRange(addr, size))
|
||||||
{
|
{
|
||||||
assert(0);
|
assert(0);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(IsMyAddress(addr) || IsMyAddress(addr + size - 1))
|
if (IsMyAddress(addr) || IsMyAddress(addr + size - 1))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
@ -296,13 +298,13 @@ bool DynamicMemoryBlockBase<PT>::Unlock(u64 addr, u32 size)
|
||||||
|
|
||||||
addr &= ~4095; // align start address
|
addr &= ~4095; // align start address
|
||||||
|
|
||||||
if(!IsInMyRange(addr, size))
|
if (!IsInMyRange(addr, size))
|
||||||
{
|
{
|
||||||
assert(0);
|
assert(0);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(IsMyAddress(addr) || IsMyAddress(addr + size - 1))
|
if (IsMyAddress(addr) || IsMyAddress(addr + size - 1))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -559,7 +559,7 @@ bool VirtualMemoryBlock::IsInMyRange(const u64 addr, const u32 size)
|
||||||
|
|
||||||
bool VirtualMemoryBlock::IsMyAddress(const u64 addr)
|
bool VirtualMemoryBlock::IsMyAddress(const u64 addr)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_mapped_memory.GetCount(); ++i)
|
for(u32 i=0; i<m_mapped_memory.size(); ++i)
|
||||||
{
|
{
|
||||||
if(addr >= m_mapped_memory[i].addr && addr < m_mapped_memory[i].addr + m_mapped_memory[i].size)
|
if(addr >= m_mapped_memory[i].addr && addr < m_mapped_memory[i].addr + m_mapped_memory[i].size)
|
||||||
{
|
{
|
||||||
|
|
@ -577,7 +577,7 @@ u64 VirtualMemoryBlock::Map(u64 realaddr, u32 size, u64 addr)
|
||||||
if(!IsInMyRange(addr, size) && (IsMyAddress(addr) || IsMyAddress(addr + size - 1)))
|
if(!IsInMyRange(addr, size) && (IsMyAddress(addr) || IsMyAddress(addr + size - 1)))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
m_mapped_memory.Move(new VirtualMemInfo(addr, realaddr, size));
|
m_mapped_memory.emplace_back(addr, realaddr, size);
|
||||||
return addr;
|
return addr;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -587,7 +587,7 @@ u64 VirtualMemoryBlock::Map(u64 realaddr, u32 size, u64 addr)
|
||||||
bool is_good_addr = true;
|
bool is_good_addr = true;
|
||||||
|
|
||||||
// check if address is already mapped
|
// check if address is already mapped
|
||||||
for(u32 i=0; i<m_mapped_memory.GetCount(); ++i)
|
for(u32 i=0; i<m_mapped_memory.size(); ++i)
|
||||||
{
|
{
|
||||||
if((addr >= m_mapped_memory[i].addr && addr < m_mapped_memory[i].addr + m_mapped_memory[i].size) ||
|
if((addr >= m_mapped_memory[i].addr && addr < m_mapped_memory[i].addr + m_mapped_memory[i].size) ||
|
||||||
(m_mapped_memory[i].addr >= addr && m_mapped_memory[i].addr < addr + size))
|
(m_mapped_memory[i].addr >= addr && m_mapped_memory[i].addr < addr + size))
|
||||||
|
|
@ -600,7 +600,7 @@ u64 VirtualMemoryBlock::Map(u64 realaddr, u32 size, u64 addr)
|
||||||
|
|
||||||
if(!is_good_addr) continue;
|
if(!is_good_addr) continue;
|
||||||
|
|
||||||
m_mapped_memory.Move(new VirtualMemInfo(addr, realaddr, size));
|
m_mapped_memory.emplace_back(addr, realaddr, size);
|
||||||
|
|
||||||
return addr;
|
return addr;
|
||||||
}
|
}
|
||||||
|
|
@ -611,12 +611,12 @@ u64 VirtualMemoryBlock::Map(u64 realaddr, u32 size, u64 addr)
|
||||||
|
|
||||||
u32 VirtualMemoryBlock::UnmapRealAddress(u64 realaddr)
|
u32 VirtualMemoryBlock::UnmapRealAddress(u64 realaddr)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_mapped_memory.GetCount(); ++i)
|
for(u32 i=0; i<m_mapped_memory.size(); ++i)
|
||||||
{
|
{
|
||||||
if(m_mapped_memory[i].realAddress == realaddr && IsInMyRange(m_mapped_memory[i].addr, m_mapped_memory[i].size))
|
if(m_mapped_memory[i].realAddress == realaddr && IsInMyRange(m_mapped_memory[i].addr, m_mapped_memory[i].size))
|
||||||
{
|
{
|
||||||
u32 size = m_mapped_memory[i].size;
|
u32 size = m_mapped_memory[i].size;
|
||||||
m_mapped_memory.RemoveAt(i);
|
m_mapped_memory.erase(m_mapped_memory.begin() + i);
|
||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -626,12 +626,12 @@ u32 VirtualMemoryBlock::UnmapRealAddress(u64 realaddr)
|
||||||
|
|
||||||
u32 VirtualMemoryBlock::UnmapAddress(u64 addr)
|
u32 VirtualMemoryBlock::UnmapAddress(u64 addr)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_mapped_memory.GetCount(); ++i)
|
for(u32 i=0; i<m_mapped_memory.size(); ++i)
|
||||||
{
|
{
|
||||||
if(m_mapped_memory[i].addr == addr && IsInMyRange(m_mapped_memory[i].addr, m_mapped_memory[i].size))
|
if(m_mapped_memory[i].addr == addr && IsInMyRange(m_mapped_memory[i].addr, m_mapped_memory[i].size))
|
||||||
{
|
{
|
||||||
u32 size = m_mapped_memory[i].size;
|
u32 size = m_mapped_memory[i].size;
|
||||||
m_mapped_memory.RemoveAt(i);
|
m_mapped_memory.erase(m_mapped_memory.begin() + i);
|
||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -711,7 +711,7 @@ bool VirtualMemoryBlock::Write128(const u64 addr, const u128 value)
|
||||||
|
|
||||||
u64 VirtualMemoryBlock::getRealAddr(u64 addr)
|
u64 VirtualMemoryBlock::getRealAddr(u64 addr)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_mapped_memory.GetCount(); ++i)
|
for(u32 i=0; i<m_mapped_memory.size(); ++i)
|
||||||
{
|
{
|
||||||
if(addr >= m_mapped_memory[i].addr && addr < m_mapped_memory[i].addr + m_mapped_memory[i].size)
|
if(addr >= m_mapped_memory[i].addr && addr < m_mapped_memory[i].addr + m_mapped_memory[i].size)
|
||||||
{
|
{
|
||||||
|
|
@ -724,7 +724,7 @@ u64 VirtualMemoryBlock::getRealAddr(u64 addr)
|
||||||
|
|
||||||
u64 VirtualMemoryBlock::getMappedAddress(u64 realAddress)
|
u64 VirtualMemoryBlock::getMappedAddress(u64 realAddress)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_mapped_memory.GetCount(); ++i)
|
for(u32 i=0; i<m_mapped_memory.size(); ++i)
|
||||||
{
|
{
|
||||||
if(realAddress >= m_mapped_memory[i].realAddress && realAddress < m_mapped_memory[i].realAddress + m_mapped_memory[i].size)
|
if(realAddress >= m_mapped_memory[i].realAddress && realAddress < m_mapped_memory[i].realAddress + m_mapped_memory[i].size)
|
||||||
{
|
{
|
||||||
|
|
@ -737,7 +737,7 @@ u64 VirtualMemoryBlock::getMappedAddress(u64 realAddress)
|
||||||
|
|
||||||
void VirtualMemoryBlock::Delete()
|
void VirtualMemoryBlock::Delete()
|
||||||
{
|
{
|
||||||
m_mapped_memory.Clear();
|
m_mapped_memory.clear();
|
||||||
|
|
||||||
MemoryBlock::Delete();
|
MemoryBlock::Delete();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,8 @@
|
||||||
#include "MemoryBlock.h"
|
#include "MemoryBlock.h"
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
using std::nullptr_t;
|
||||||
|
|
||||||
enum MemoryType
|
enum MemoryType
|
||||||
{
|
{
|
||||||
Memory_PS3,
|
Memory_PS3,
|
||||||
|
|
@ -488,7 +490,8 @@ public:
|
||||||
u8* operator + (const u64 vaddr)
|
u8* operator + (const u64 vaddr)
|
||||||
{
|
{
|
||||||
u8* ret = GetMemFromAddr(vaddr);
|
u8* ret = GetMemFromAddr(vaddr);
|
||||||
if(!ret) throw fmt::Format("GetMemFromAddr(0x%llx)", vaddr);
|
if(ret == nullptr)
|
||||||
|
throw fmt::Format("GetMemFromAddr(0x%x)", vaddr);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ struct MemInfo
|
||||||
|
|
||||||
struct MemBlockInfo : public MemInfo
|
struct MemBlockInfo : public MemInfo
|
||||||
{
|
{
|
||||||
void* mem;
|
void *mem;
|
||||||
|
|
||||||
MemBlockInfo(u64 _addr, u32 _size)
|
MemBlockInfo(u64 _addr, u32 _size)
|
||||||
: MemInfo(_addr, PAGE_4K(_size))
|
: MemInfo(_addr, PAGE_4K(_size))
|
||||||
|
|
@ -31,13 +31,27 @@ struct MemBlockInfo : public MemInfo
|
||||||
ConLog.Error("Not enought free memory.");
|
ConLog.Error("Not enought free memory.");
|
||||||
assert(0);
|
assert(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(mem, 0, size);
|
memset(mem, 0, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MemBlockInfo(MemBlockInfo &other) = delete;
|
||||||
|
MemBlockInfo(MemBlockInfo &&other) : MemInfo(other.addr,other.size) ,mem(other.mem)
|
||||||
|
{
|
||||||
|
other.mem = nullptr;
|
||||||
|
}
|
||||||
|
MemBlockInfo& operator =(MemBlockInfo &other) = delete;
|
||||||
|
MemBlockInfo& operator =(MemBlockInfo &&other){
|
||||||
|
this->addr = other.addr;
|
||||||
|
this->size = other.size;
|
||||||
|
if (this->mem) _aligned_free(mem);
|
||||||
|
this->mem = other.mem;
|
||||||
|
other.mem = nullptr;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
~MemBlockInfo()
|
~MemBlockInfo()
|
||||||
{
|
{
|
||||||
_aligned_free(mem);
|
if(mem) _aligned_free(mem);
|
||||||
mem = nullptr;
|
mem = nullptr;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -193,9 +207,9 @@ template<typename PT>
|
||||||
class DynamicMemoryBlockBase : public PT
|
class DynamicMemoryBlockBase : public PT
|
||||||
{
|
{
|
||||||
mutable std::mutex m_lock;
|
mutable std::mutex m_lock;
|
||||||
Array<MemBlockInfo> m_allocated; // allocation info
|
std::vector<MemBlockInfo> m_allocated; // allocation info
|
||||||
Array<u8*> m_pages; // real addresses of every 4096 byte pages (array size should be fixed)
|
std::vector<u8*> m_pages; // real addresses of every 4096 byte pages (array size should be fixed)
|
||||||
Array<u8*> m_locked; // locked pages should be moved here
|
std::vector<u8*> m_locked; // locked pages should be moved here
|
||||||
|
|
||||||
u32 m_max_size;
|
u32 m_max_size;
|
||||||
|
|
||||||
|
|
@ -229,7 +243,7 @@ private:
|
||||||
|
|
||||||
class VirtualMemoryBlock : public MemoryBlock
|
class VirtualMemoryBlock : public MemoryBlock
|
||||||
{
|
{
|
||||||
Array<VirtualMemInfo> m_mapped_memory;
|
std::vector<VirtualMemInfo> m_mapped_memory;
|
||||||
u32 m_reserve_size;
|
u32 m_reserve_size;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
@ -283,3 +297,4 @@ public:
|
||||||
|
|
||||||
typedef DynamicMemoryBlockBase<MemoryBlock> DynamicMemoryBlock;
|
typedef DynamicMemoryBlockBase<MemoryBlock> DynamicMemoryBlock;
|
||||||
typedef DynamicMemoryBlockBase<MemoryBlockLE> DynamicMemoryBlockLE;
|
typedef DynamicMemoryBlockBase<MemoryBlockLE> DynamicMemoryBlockLE;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ struct Callback3 : public Callback
|
||||||
|
|
||||||
struct Callbacks
|
struct Callbacks
|
||||||
{
|
{
|
||||||
Array<Callback> m_callbacks;
|
std::vector<Callback> m_callbacks;
|
||||||
bool m_in_manager;
|
bool m_in_manager;
|
||||||
|
|
||||||
Callbacks() : m_in_manager(false)
|
Callbacks() : m_in_manager(false)
|
||||||
|
|
@ -58,11 +58,11 @@ struct Callbacks
|
||||||
|
|
||||||
void Unregister(u32 slot)
|
void Unregister(u32 slot)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_callbacks.GetCount(); ++i)
|
for(u32 i=0; i<m_callbacks.size(); ++i)
|
||||||
{
|
{
|
||||||
if(m_callbacks[i].GetSlot() == slot)
|
if(m_callbacks[i].GetSlot() == slot)
|
||||||
{
|
{
|
||||||
m_callbacks.RemoveAt(i);
|
m_callbacks.erase(m_callbacks.begin() + i);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -74,7 +74,7 @@ struct Callbacks
|
||||||
{
|
{
|
||||||
bool handled = false;
|
bool handled = false;
|
||||||
|
|
||||||
for(u32 i=0; i<m_callbacks.GetCount(); ++i)
|
for(u32 i=0; i<m_callbacks.size(); ++i)
|
||||||
{
|
{
|
||||||
if(m_callbacks[i].HasData())
|
if(m_callbacks[i].HasData())
|
||||||
{
|
{
|
||||||
|
|
@ -96,12 +96,13 @@ struct Callbacks2 : public Callbacks
|
||||||
void Register(u32 slot, u64 addr, u64 userdata)
|
void Register(u32 slot, u64 addr, u64 userdata)
|
||||||
{
|
{
|
||||||
Callbacks::Register(slot, addr, userdata);
|
Callbacks::Register(slot, addr, userdata);
|
||||||
m_callbacks.Move(new Callback2(slot, addr, userdata));
|
Callback2 callback(slot, addr, userdata);
|
||||||
|
m_callbacks.push_back(callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Handle(u64 a1, u64 a2)
|
void Handle(u64 a1, u64 a2)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_callbacks.GetCount(); ++i)
|
for(u32 i=0; i<m_callbacks.size(); ++i)
|
||||||
{
|
{
|
||||||
((Callback2&)m_callbacks[i]).Handle(a1);
|
((Callback2&)m_callbacks[i]).Handle(a1);
|
||||||
}
|
}
|
||||||
|
|
@ -117,12 +118,13 @@ struct Callbacks3 : public Callbacks
|
||||||
void Register(u32 slot, u64 addr, u64 userdata)
|
void Register(u32 slot, u64 addr, u64 userdata)
|
||||||
{
|
{
|
||||||
Callbacks::Register(slot, addr, userdata);
|
Callbacks::Register(slot, addr, userdata);
|
||||||
m_callbacks.Move(new Callback3(slot, addr, userdata));
|
Callback3 callback(slot, addr, userdata);
|
||||||
|
m_callbacks.push_back(callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Handle(u64 a1, u64 a2)
|
void Handle(u64 a1, u64 a2)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_callbacks.GetCount(); ++i)
|
for(u32 i=0; i<m_callbacks.size(); ++i)
|
||||||
{
|
{
|
||||||
((Callback3&)m_callbacks[i]).Handle(a1, a2);
|
((Callback3&)m_callbacks[i]).Handle(a1, a2);
|
||||||
}
|
}
|
||||||
|
|
@ -131,7 +133,7 @@ struct Callbacks3 : public Callbacks
|
||||||
|
|
||||||
struct CallbackManager
|
struct CallbackManager
|
||||||
{
|
{
|
||||||
ArrayF<Callbacks> m_callbacks;
|
std::vector<Callbacks *> m_callbacks;
|
||||||
Callbacks3 m_exit_callback;
|
Callbacks3 m_exit_callback;
|
||||||
|
|
||||||
void Add(Callbacks& c)
|
void Add(Callbacks& c)
|
||||||
|
|
@ -139,7 +141,7 @@ struct CallbackManager
|
||||||
if(c.m_in_manager) return;
|
if(c.m_in_manager) return;
|
||||||
|
|
||||||
c.m_in_manager = true;
|
c.m_in_manager = true;
|
||||||
m_callbacks.Add(c);
|
m_callbacks.push_back(&c);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Init()
|
void Init()
|
||||||
|
|
@ -149,12 +151,12 @@ struct CallbackManager
|
||||||
|
|
||||||
void Clear()
|
void Clear()
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<m_callbacks.GetCount(); ++i)
|
for(u32 i=0; i<m_callbacks.size(); ++i)
|
||||||
{
|
{
|
||||||
m_callbacks[i].m_callbacks.Clear();
|
m_callbacks[i]->m_callbacks.clear();
|
||||||
m_callbacks[i].m_in_manager = false;
|
m_callbacks[i]->m_in_manager = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_callbacks.ClearF();
|
m_callbacks.clear();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -3,12 +3,13 @@
|
||||||
#include "SC_FUNC.h"
|
#include "SC_FUNC.h"
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
|
||||||
|
|
||||||
Module* g_modules[3][0xff] = {0};
|
Module* g_modules[3][0xff] = {0};
|
||||||
uint g_max_module_id = 0;
|
uint g_max_module_id = 0;
|
||||||
uint g_module_2_count = 0;
|
uint g_module_2_count = 0;
|
||||||
ArrayF<ModuleFunc> g_modules_funcs_list;
|
std::vector<ModuleFunc *> g_modules_funcs_list;
|
||||||
std::mutex g_funcs_lock;
|
std::mutex g_funcs_lock;
|
||||||
ArrayF<SFunc> g_static_funcs_list;
|
std::vector<SFunc *> g_static_funcs_list;
|
||||||
|
|
||||||
struct ModuleInfo
|
struct ModuleInfo
|
||||||
{
|
{
|
||||||
|
|
@ -116,25 +117,50 @@ static const g_module_list[] =
|
||||||
{0xf034, "cellSailRec"},
|
{0xf034, "cellSailRec"},
|
||||||
{0xf035, "sceNpTrophy"},
|
{0xf035, "sceNpTrophy"},
|
||||||
{0xf053, "cellAdecAt3multi"},
|
{0xf053, "cellAdecAt3multi"},
|
||||||
{0xf054, "cellLibatrac3multi"},
|
{0xf054, "cellLibatrac3multi"}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _InitNullModules
|
struct _InitNullModules
|
||||||
{
|
{
|
||||||
|
std::vector<Module*> m_modules;
|
||||||
|
|
||||||
_InitNullModules()
|
_InitNullModules()
|
||||||
{
|
{
|
||||||
for(auto& m : g_module_list)
|
for(auto& m : g_module_list)
|
||||||
{
|
{
|
||||||
new Module(m.id, m.name);
|
m_modules.push_back(new Module(m.id, m.name));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
~_InitNullModules()
|
||||||
|
{
|
||||||
|
for (int i = 0; i < m_modules.size(); ++i)
|
||||||
|
{
|
||||||
|
delete m_modules[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} InitNullModules;
|
} InitNullModules;
|
||||||
|
|
||||||
|
/** HACK: Used to delete SFunc objects that get added to the global static function array (g_static_funcs_list).
|
||||||
|
* The destructor of this static object gets called when the program shuts down.
|
||||||
|
*/
|
||||||
|
struct StaticFunctionListCleaner_t
|
||||||
|
{
|
||||||
|
StaticFunctionListCleaner_t() {}
|
||||||
|
~StaticFunctionListCleaner_t()
|
||||||
|
{
|
||||||
|
for (int i = 0; i < g_static_funcs_list.size(); ++i)
|
||||||
|
{
|
||||||
|
delete g_static_funcs_list[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} StaticFunctionListCleaner;
|
||||||
|
|
||||||
bool IsLoadedFunc(u32 id)
|
bool IsLoadedFunc(u32 id)
|
||||||
{
|
{
|
||||||
for(u32 i=0; i<g_modules_funcs_list.GetCount(); ++i)
|
for(u32 i=0; i<g_modules_funcs_list.size(); ++i)
|
||||||
{
|
{
|
||||||
if(g_modules_funcs_list[i].id == id)
|
if(g_modules_funcs_list[i]->id == id)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
@ -149,11 +175,11 @@ bool CallFunc(u32 num)
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(g_funcs_lock);
|
std::lock_guard<std::mutex> lock(g_funcs_lock);
|
||||||
|
|
||||||
for(u32 i=0; i<g_modules_funcs_list.GetCount(); ++i)
|
for(u32 i=0; i<g_modules_funcs_list.size(); ++i)
|
||||||
{
|
{
|
||||||
if(g_modules_funcs_list[i].id == num)
|
if(g_modules_funcs_list[i]->id == num)
|
||||||
{
|
{
|
||||||
func = g_modules_funcs_list[i].func;
|
func = g_modules_funcs_list[i]->func;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -170,11 +196,11 @@ bool UnloadFunc(u32 id)
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(g_funcs_lock);
|
std::lock_guard<std::mutex> lock(g_funcs_lock);
|
||||||
|
|
||||||
for(u32 i=0; i<g_modules_funcs_list.GetCount(); ++i)
|
for(u32 i=0; i<g_modules_funcs_list.size(); ++i)
|
||||||
{
|
{
|
||||||
if(g_modules_funcs_list[i].id == id)
|
if(g_modules_funcs_list[i]->id == id)
|
||||||
{
|
{
|
||||||
g_modules_funcs_list.RemoveFAt(i);
|
g_modules_funcs_list.erase(g_modules_funcs_list.begin() +i);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
@ -202,7 +228,7 @@ void UnloadModules()
|
||||||
}
|
}
|
||||||
|
|
||||||
std::lock_guard<std::mutex> lock(g_funcs_lock);
|
std::lock_guard<std::mutex> lock(g_funcs_lock);
|
||||||
g_modules_funcs_list.Clear();
|
g_modules_funcs_list.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
Module* GetModuleByName(const std::string& name)
|
Module* GetModuleByName(const std::string& name)
|
||||||
|
|
@ -268,13 +294,13 @@ void SetModule(int id, Module* module, bool with_data)
|
||||||
if(with_data)
|
if(with_data)
|
||||||
{
|
{
|
||||||
module->SetName(g_modules[index][(u8)id]->GetName());
|
module->SetName(g_modules[index][(u8)id]->GetName());
|
||||||
delete g_modules[index][(u8)id];
|
// delete g_modules[index][(u8)id];
|
||||||
g_modules[index][(u8)id] = module;
|
g_modules[index][(u8)id] = module;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
g_modules[index][(u8)id]->SetName(module->GetName());
|
g_modules[index][(u8)id]->SetName(module->GetName());
|
||||||
delete module;
|
// delete module;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -324,6 +350,16 @@ Module::Module(u16 id, void (*init)(), void (*load)(), void (*unload)())
|
||||||
if(init) init();
|
if(init) init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Module::~Module()
|
||||||
|
{
|
||||||
|
UnLoad();
|
||||||
|
|
||||||
|
for (int i = 0; i < m_funcs_list.size(); i++)
|
||||||
|
{
|
||||||
|
delete m_funcs_list[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void Module::Load()
|
void Module::Load()
|
||||||
{
|
{
|
||||||
if(IsLoaded())
|
if(IsLoaded())
|
||||||
|
|
@ -331,13 +367,13 @@ void Module::Load()
|
||||||
|
|
||||||
if(m_load_func) m_load_func();
|
if(m_load_func) m_load_func();
|
||||||
|
|
||||||
for(u32 i=0; i<m_funcs_list.GetCount(); ++i)
|
for(u32 i=0; i<m_funcs_list.size(); ++i)
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(g_funcs_lock);
|
std::lock_guard<std::mutex> lock(g_funcs_lock);
|
||||||
|
|
||||||
if(IsLoadedFunc(m_funcs_list[i].id)) continue;
|
if(IsLoadedFunc(m_funcs_list[i]->id)) continue;
|
||||||
|
|
||||||
g_modules_funcs_list.Add(m_funcs_list[i]);
|
g_modules_funcs_list.push_back(m_funcs_list[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
SetLoaded(true);
|
SetLoaded(true);
|
||||||
|
|
@ -350,9 +386,9 @@ void Module::UnLoad()
|
||||||
|
|
||||||
if(m_unload_func) m_unload_func();
|
if(m_unload_func) m_unload_func();
|
||||||
|
|
||||||
for(u32 i=0; i<m_funcs_list.GetCount(); ++i)
|
for(u32 i=0; i<m_funcs_list.size(); ++i)
|
||||||
{
|
{
|
||||||
UnloadFunc(m_funcs_list[i].id);
|
UnloadFunc(m_funcs_list[i]->id);
|
||||||
}
|
}
|
||||||
|
|
||||||
SetLoaded(false);
|
SetLoaded(false);
|
||||||
|
|
@ -364,11 +400,11 @@ bool Module::Load(u32 id)
|
||||||
|
|
||||||
if(IsLoadedFunc(id)) return false;
|
if(IsLoadedFunc(id)) return false;
|
||||||
|
|
||||||
for(u32 i=0; i<m_funcs_list.GetCount(); ++i)
|
for(u32 i=0; i<m_funcs_list.size(); ++i)
|
||||||
{
|
{
|
||||||
if(m_funcs_list[i].id == id)
|
if(m_funcs_list[i]->id == id)
|
||||||
{
|
{
|
||||||
g_modules_funcs_list.Add(m_funcs_list[i]);
|
g_modules_funcs_list.push_back(m_funcs_list[i]);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
@ -470,3 +506,4 @@ bool Module::CheckID(u32 id, ID*& _id) const
|
||||||
{
|
{
|
||||||
return Emu.GetIdManager().CheckID(id) && (_id = &Emu.GetIdManager().GetID(id))->m_name == GetName();
|
return Emu.GetIdManager().CheckID(id) && (_id = &Emu.GetIdManager().GetID(id))->m_name == GetName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "Modules/cellResc.h"
|
|
||||||
#include "Modules/cellPngDec.h"
|
|
||||||
#include "Modules/cellJpgDec.h"
|
|
||||||
#include "Modules/cellGifDec.h"
|
|
||||||
|
|
||||||
#define declCPU PPUThread& CPU = GetCurrentPPUThread
|
#define declCPU PPUThread& CPU = GetCurrentPPUThread
|
||||||
|
|
||||||
class func_caller
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
virtual void operator()() = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
//TODO
|
//TODO
|
||||||
struct ModuleFunc
|
struct ModuleFunc
|
||||||
|
|
@ -23,6 +14,11 @@ struct ModuleFunc
|
||||||
, func(func)
|
, func(func)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
~ModuleFunc()
|
||||||
|
{
|
||||||
|
safe_delete(func);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct SFuncOp
|
struct SFuncOp
|
||||||
|
|
@ -36,12 +32,17 @@ struct SFunc
|
||||||
func_caller* func;
|
func_caller* func;
|
||||||
void* ptr;
|
void* ptr;
|
||||||
char* name;
|
char* name;
|
||||||
Array<SFuncOp> ops;
|
std::vector<SFuncOp> ops;
|
||||||
u64 group;
|
u64 group;
|
||||||
u32 found;
|
u32 found;
|
||||||
|
|
||||||
|
~SFunc()
|
||||||
|
{
|
||||||
|
safe_delete(func);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
extern ArrayF<SFunc> g_static_funcs_list;
|
extern std::vector<SFunc *> g_static_funcs_list;
|
||||||
|
|
||||||
class Module
|
class Module
|
||||||
{
|
{
|
||||||
|
|
@ -52,12 +53,14 @@ class Module
|
||||||
void (*m_unload_func)();
|
void (*m_unload_func)();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Array<ModuleFunc> m_funcs_list;
|
std::vector<ModuleFunc*> m_funcs_list;
|
||||||
|
|
||||||
Module(u16 id, const char* name);
|
Module(u16 id, const char* name);
|
||||||
Module(const char* name, void (*init)(), void (*load)() = nullptr, void (*unload)() = nullptr);
|
Module(const char* name, void (*init)(), void (*load)() = nullptr, void (*unload)() = nullptr);
|
||||||
Module(u16 id, void (*init)(), void (*load)() = nullptr, void (*unload)() = nullptr);
|
Module(u16 id, void (*init)(), void (*load)() = nullptr, void (*unload)() = nullptr);
|
||||||
|
|
||||||
|
~Module();
|
||||||
|
|
||||||
void Load();
|
void Load();
|
||||||
void UnLoad();
|
void UnLoad();
|
||||||
bool Load(u32 id);
|
bool Load(u32 id);
|
||||||
|
|
@ -120,7 +123,7 @@ public:
|
||||||
template<typename T>
|
template<typename T>
|
||||||
__forceinline void Module::AddFunc(u32 id, T func)
|
__forceinline void Module::AddFunc(u32 id, T func)
|
||||||
{
|
{
|
||||||
m_funcs_list.Move(new ModuleFunc(id, bind_func(func)));
|
m_funcs_list.emplace_back(new ModuleFunc(id, bind_func(func)));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
|
|
@ -128,8 +131,9 @@ __forceinline void Module::AddFuncSub(const char group[8], const u64 ops[], char
|
||||||
{
|
{
|
||||||
if (!ops[0]) return;
|
if (!ops[0]) return;
|
||||||
|
|
||||||
|
//TODO: track down where this is supposed to be deleted
|
||||||
SFunc* sf = new SFunc;
|
SFunc* sf = new SFunc;
|
||||||
sf->ptr = func;
|
sf->ptr = (void *)func;
|
||||||
sf->func = bind_func(func);
|
sf->func = bind_func(func);
|
||||||
sf->name = name;
|
sf->name = name;
|
||||||
sf->group = *(u64*)group;
|
sf->group = *(u64*)group;
|
||||||
|
|
@ -145,9 +149,9 @@ __forceinline void Module::AddFuncSub(const char group[8], const u64 ops[], char
|
||||||
if (op.mask) op.crc &= op.mask;
|
if (op.mask) op.crc &= op.mask;
|
||||||
op.mask = re(op.mask);
|
op.mask = re(op.mask);
|
||||||
op.crc = re(op.crc);
|
op.crc = re(op.crc);
|
||||||
sf->ops.AddCpy(op);
|
sf->ops.push_back(op);
|
||||||
}
|
}
|
||||||
g_static_funcs_list.Add(sf);
|
g_static_funcs_list.push_back(sf);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsLoadedFunc(u32 id);
|
bool IsLoadedFunc(u32 id);
|
||||||
|
|
@ -157,3 +161,4 @@ void UnloadModules();
|
||||||
u32 GetFuncNumById(u32 id);
|
u32 GetFuncNumById(u32 id);
|
||||||
Module* GetModuleByName(const std::string& name);
|
Module* GetModuleByName(const std::string& name);
|
||||||
Module* GetModuleById(u16 id);
|
Module* GetModuleById(u16 id);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@ int cellAudioInit()
|
||||||
}
|
}
|
||||||
queue.Clear();
|
queue.Clear();
|
||||||
|
|
||||||
Array<u64> keys;
|
std::vector<u64> keys;
|
||||||
|
|
||||||
if(m_audio_out)
|
if(m_audio_out)
|
||||||
{
|
{
|
||||||
|
|
@ -354,10 +354,10 @@ int cellAudioInit()
|
||||||
index = (position + 1) % port.block; // write new value
|
index = (position + 1) % port.block; // write new value
|
||||||
}
|
}
|
||||||
// load keys:
|
// load keys:
|
||||||
keys.SetCount(m_config.m_keys.GetCount());
|
keys.resize(m_config.m_keys.size());
|
||||||
memcpy(keys.GetPtr(), m_config.m_keys.GetPtr(), sizeof(u64) * keys.GetCount());
|
memcpy(keys.data(), m_config.m_keys.data(), sizeof(u64) * keys.size());
|
||||||
}
|
}
|
||||||
for (u32 i = 0; i < keys.GetCount(); i++)
|
for (u32 i = 0; i < keys.size(); i++)
|
||||||
{
|
{
|
||||||
// TODO: check event source
|
// TODO: check event source
|
||||||
Emu.GetEventManager().SendEvent(keys[i], 0x10103000e010e07, 0, 0, 0);
|
Emu.GetEventManager().SendEvent(keys[i], 0x10103000e010e07, 0, 0, 0);
|
||||||
|
|
@ -402,7 +402,7 @@ abort:
|
||||||
|
|
||||||
m_config.m_is_audio_initialized = false;
|
m_config.m_is_audio_initialized = false;
|
||||||
|
|
||||||
m_config.m_keys.Clear();
|
m_config.m_keys.clear();
|
||||||
for (u32 i = 0; i < m_config.AUDIO_PORT_COUNT; i++)
|
for (u32 i = 0; i < m_config.AUDIO_PORT_COUNT; i++)
|
||||||
{
|
{
|
||||||
AudioPortConfig& port = m_config.m_ports[i];
|
AudioPortConfig& port = m_config.m_ports[i];
|
||||||
|
|
@ -736,14 +736,14 @@ int cellAudioSetNotifyEventQueue(u64 key)
|
||||||
|
|
||||||
SMutexGeneralLocker lock(audioMutex);
|
SMutexGeneralLocker lock(audioMutex);
|
||||||
|
|
||||||
for (u32 i = 0; i < m_config.m_keys.GetCount(); i++) // check for duplicates
|
for (u32 i = 0; i < m_config.m_keys.size(); i++) // check for duplicates
|
||||||
{
|
{
|
||||||
if (m_config.m_keys[i] == key)
|
if (m_config.m_keys[i] == key)
|
||||||
{
|
{
|
||||||
return CELL_AUDIO_ERROR_PARAM;
|
return CELL_AUDIO_ERROR_PARAM;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
m_config.m_keys.AddCpy(key);
|
m_config.m_keys.push_back(key);
|
||||||
|
|
||||||
/*EventQueue* eq;
|
/*EventQueue* eq;
|
||||||
if (!Emu.GetEventManager().GetEventQueue(key, eq))
|
if (!Emu.GetEventManager().GetEventQueue(key, eq))
|
||||||
|
|
@ -769,11 +769,11 @@ int cellAudioRemoveNotifyEventQueue(u64 key)
|
||||||
SMutexGeneralLocker lock(audioMutex);
|
SMutexGeneralLocker lock(audioMutex);
|
||||||
|
|
||||||
bool found = false;
|
bool found = false;
|
||||||
for (u32 i = 0; i < m_config.m_keys.GetCount(); i++)
|
for (u32 i = 0; i < m_config.m_keys.size(); i++)
|
||||||
{
|
{
|
||||||
if (m_config.m_keys[i] == key)
|
if (m_config.m_keys[i] == key)
|
||||||
{
|
{
|
||||||
m_config.m_keys.RemoveAt(i);
|
m_config.m_keys.erase(m_config.m_keys.begin() + i);
|
||||||
found = true;
|
found = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,9 @@
|
||||||
#include "stblib/stb_truetype.h"
|
#include "stblib/stb_truetype.h"
|
||||||
|
|
||||||
void cellFont_init();
|
void cellFont_init();
|
||||||
|
void cellFont_load();
|
||||||
void cellFont_unload();
|
void cellFont_unload();
|
||||||
Module cellFont(0x0019, cellFont_init, nullptr, cellFont_unload);
|
Module cellFont(0x0019, cellFont_init, cellFont_load, cellFont_unload);
|
||||||
|
|
||||||
// Font Set Types
|
// Font Set Types
|
||||||
enum
|
enum
|
||||||
|
|
@ -226,7 +227,7 @@ struct CCellFontInternal //Module cellFont
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
CCellFontInternal* s_fontInternalInstance = new CCellFontInternal();
|
CCellFontInternal* s_fontInternalInstance = nullptr;
|
||||||
|
|
||||||
// Functions
|
// Functions
|
||||||
int cellFontInitializeWithRevision(u64 revisionFlags, mem_ptr_t<CellFontConfig> config)
|
int cellFontInitializeWithRevision(u64 revisionFlags, mem_ptr_t<CellFontConfig> config)
|
||||||
|
|
@ -899,8 +900,14 @@ void cellFont_init()
|
||||||
cellFont.AddFunc(0xb015a84e, cellFontGetRevisionFlags);
|
cellFont.AddFunc(0xb015a84e, cellFontGetRevisionFlags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void cellFont_load()
|
||||||
|
{
|
||||||
|
s_fontInternalInstance = new CCellFontInternal();
|
||||||
|
}
|
||||||
|
|
||||||
void cellFont_unload()
|
void cellFont_unload()
|
||||||
{
|
{
|
||||||
s_fontInternalInstance->m_bInitialized = false;
|
// s_fontInternalInstance->m_bInitialized = false;
|
||||||
s_fontInternalInstance->m_bFontGcmInitialized = false;
|
// s_fontInternalInstance->m_bFontGcmInitialized = false;
|
||||||
|
delete s_fontInternalInstance;
|
||||||
}
|
}
|
||||||
|
|
@ -4,7 +4,9 @@
|
||||||
#include "cellFont.h"
|
#include "cellFont.h"
|
||||||
|
|
||||||
void cellFontFT_init();
|
void cellFontFT_init();
|
||||||
Module cellFontFT(0x001a, cellFontFT_init);
|
void cellFontFT_load();
|
||||||
|
void cellFontFT_unload();
|
||||||
|
Module cellFontFT(0x001a, cellFontFT_init, cellFontFT_load, cellFontFT_unload);
|
||||||
|
|
||||||
struct CellFontLibraryConfigFT
|
struct CellFontLibraryConfigFT
|
||||||
{
|
{
|
||||||
|
|
@ -33,7 +35,7 @@ struct CCellFontFTInternal
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
CCellFontFTInternal* s_fontFtInternalInstance = new CCellFontFTInternal();
|
CCellFontFTInternal* s_fontFtInternalInstance = nullptr;
|
||||||
|
|
||||||
int cellFontInitLibraryFreeTypeWithRevision(u64 revisionFlags, mem_ptr_t<CellFontLibraryConfigFT> config, u32 lib_addr_addr)
|
int cellFontInitLibraryFreeTypeWithRevision(u64 revisionFlags, mem_ptr_t<CellFontLibraryConfigFT> config, u32 lib_addr_addr)
|
||||||
{
|
{
|
||||||
|
|
@ -68,3 +70,13 @@ void cellFontFT_init()
|
||||||
cellFontFT.AddFunc(0xec89a187, cellFontFTGetRevisionFlags);
|
cellFontFT.AddFunc(0xec89a187, cellFontFTGetRevisionFlags);
|
||||||
cellFontFT.AddFunc(0xfa0c2de0, cellFontFTGetInitializedRevisionFlags);
|
cellFontFT.AddFunc(0xfa0c2de0, cellFontFTGetInitializedRevisionFlags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void cellFontFT_load()
|
||||||
|
{
|
||||||
|
s_fontFtInternalInstance = new CCellFontFTInternal();
|
||||||
|
}
|
||||||
|
|
||||||
|
void cellFontFT_unload()
|
||||||
|
{
|
||||||
|
delete s_fontFtInternalInstance;
|
||||||
|
}
|
||||||
|
|
@ -164,7 +164,11 @@ int cellPngDecDecodeData(u32 mainHandle, u32 subHandle, mem8_ptr_t data, const m
|
||||||
|
|
||||||
//Decode PNG file. (TODO: Is there any faster alternative? Can we do it without external libraries?)
|
//Decode PNG file. (TODO: Is there any faster alternative? Can we do it without external libraries?)
|
||||||
int width, height, actual_components;
|
int width, height, actual_components;
|
||||||
std::shared_ptr<unsigned char> image(stbi_load_from_memory(png.GetPtr(), fileSize, &width, &height, &actual_components, 4));
|
auto image = std::unique_ptr<unsigned char,decltype(&::free)>
|
||||||
|
(
|
||||||
|
stbi_load_from_memory(png.GetPtr(), fileSize, &width, &height, &actual_components, 4),
|
||||||
|
&::free
|
||||||
|
);
|
||||||
if (!image) return CELL_PNGDEC_ERROR_STREAM_FORMAT;
|
if (!image) return CELL_PNGDEC_ERROR_STREAM_FORMAT;
|
||||||
|
|
||||||
uint image_size = width * height;
|
uint image_size = width * height;
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,9 @@
|
||||||
#include "cellResc.h"
|
#include "cellResc.h"
|
||||||
|
|
||||||
void cellResc_init();
|
void cellResc_init();
|
||||||
|
void cellResc_load();
|
||||||
void cellResc_unload();
|
void cellResc_unload();
|
||||||
Module cellResc(0x001f, cellResc_init, nullptr, cellResc_unload);
|
Module cellResc(0x001f, cellResc_init, cellResc_load, cellResc_unload);
|
||||||
|
|
||||||
// Error Codes
|
// Error Codes
|
||||||
enum
|
enum
|
||||||
|
|
@ -71,7 +72,7 @@ struct CCellRescInternal
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
CCellRescInternal* s_rescInternalInstance = new CCellRescInternal();
|
CCellRescInternal* s_rescInternalInstance = nullptr;
|
||||||
|
|
||||||
// Extern Functions
|
// Extern Functions
|
||||||
extern int cellGcmSetFlipMode(u32 mode);
|
extern int cellGcmSetFlipMode(u32 mode);
|
||||||
|
|
@ -810,7 +811,13 @@ void cellResc_init()
|
||||||
//cellResc.AddFunc(0xe0cef79e, cellRescCreateInterlaceTable);
|
//cellResc.AddFunc(0xe0cef79e, cellRescCreateInterlaceTable);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void cellResc_load()
|
||||||
|
{
|
||||||
|
s_rescInternalInstance = new CCellRescInternal();
|
||||||
|
}
|
||||||
|
|
||||||
void cellResc_unload()
|
void cellResc_unload()
|
||||||
{
|
{
|
||||||
s_rescInternalInstance->m_bInitialized = false;
|
// s_rescInternalInstance->m_bInitialized = false;
|
||||||
|
delete s_rescInternalInstance;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,7 @@ int cellUserInfoGetStat(u32 id, mem_ptr_t<CellUserInfoUserStat> stat)
|
||||||
memset(name, 0, CELL_USERINFO_USERNAME_SIZE);
|
memset(name, 0, CELL_USERINFO_USERNAME_SIZE);
|
||||||
stream->Read(name, CELL_USERINFO_USERNAME_SIZE);
|
stream->Read(name, CELL_USERINFO_USERNAME_SIZE);
|
||||||
stream->Close();
|
stream->Close();
|
||||||
|
delete stream;
|
||||||
|
|
||||||
stat->id = id;
|
stat->id = id;
|
||||||
memcpy(stat->name, name, CELL_USERINFO_USERNAME_SIZE);
|
memcpy(stat->name, name, CELL_USERINFO_USERNAME_SIZE);
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@ int cellVpostExec(u32 handle, const u32 inPicBuff_addr, const mem_ptr_t<CellVpos
|
||||||
return CELL_VPOST_ERROR_E_ARG_CTRL_INVALID;
|
return CELL_VPOST_ERROR_E_ARG_CTRL_INVALID;
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 w = ctrlParam->inWidth;
|
s32 w = ctrlParam->inWidth;
|
||||||
u32 h = ctrlParam->inHeight;
|
u32 h = ctrlParam->inHeight;
|
||||||
u32 ow = ctrlParam->outWidth;
|
u32 ow = ctrlParam->outWidth;
|
||||||
u32 oh = ctrlParam->outHeight;
|
u32 oh = ctrlParam->outHeight;
|
||||||
|
|
@ -193,7 +193,7 @@ int cellVpostExec(u32 handle, const u32 inPicBuff_addr, const mem_ptr_t<CellVpos
|
||||||
u8* in_data[4] = { pY, pU, pV, pA };
|
u8* in_data[4] = { pY, pU, pV, pA };
|
||||||
int in_line[4] = { w, w/2, w/2, w };
|
int in_line[4] = { w, w/2, w/2, w };
|
||||||
u8* out_data[4] = { (u8*)res, NULL, NULL, NULL };
|
u8* out_data[4] = { (u8*)res, NULL, NULL, NULL };
|
||||||
int out_line[4] = { ow*4, 0, 0, 0 };
|
int out_line[4] = { static_cast<int>(ow*4), 0, 0, 0 };
|
||||||
|
|
||||||
sws_scale(sws, in_data, in_line, 0, h, out_data, out_line);
|
sws_scale(sws, in_data, in_line, 0, h, out_data, out_line);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -51,12 +51,12 @@ int sceNpDrmIsAvailable(u32 k_licensee_addr, u32 drm_path_addr)
|
||||||
sceNp.Warning("sceNpDrmIsAvailable: Can't find RAP file for DRM!");
|
sceNp.Warning("sceNpDrmIsAvailable: Can't find RAP file for DRM!");
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Array<DirEntryInfo> entries = raps_dir->GetEntries();
|
const std::vector<DirEntryInfo> &entries = raps_dir->GetEntries();
|
||||||
for (unsigned int i = 0; i < entries.GetCount(); i++)
|
for (auto &entry: entries)
|
||||||
{
|
{
|
||||||
if (entries[i].name.find(fmt::ToUTF8(titleID)) != std::string::npos )
|
if (entry.name.find(fmt::ToUTF8(titleID)) != std::string::npos )
|
||||||
{
|
{
|
||||||
rap_file_path += fmt::FromUTF8(entries[i].name);
|
rap_file_path += fmt::FromUTF8(entry.name);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,18 @@ struct sceNpTrophyInternalContext
|
||||||
vfsStream* trp_stream;
|
vfsStream* trp_stream;
|
||||||
|
|
||||||
TROPUSRLoader* tropusr;
|
TROPUSRLoader* tropusr;
|
||||||
|
|
||||||
|
sceNpTrophyInternalContext()
|
||||||
|
: trp_stream(nullptr),
|
||||||
|
tropusr(nullptr)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
~sceNpTrophyInternalContext()
|
||||||
|
{
|
||||||
|
safe_delete(trp_stream);
|
||||||
|
safe_delete(tropusr);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct sceNpTrophyInternal
|
struct sceNpTrophyInternal
|
||||||
|
|
@ -132,8 +144,10 @@ int sceNpTrophyRegisterContext(u32 context, u32 handle, u32 statusCb_addr, u32 a
|
||||||
return SCE_NP_TROPHY_ERROR_ILLEGAL_UPDATE;
|
return SCE_NP_TROPHY_ERROR_ILLEGAL_UPDATE;
|
||||||
|
|
||||||
// Rename or discard certain entries based on the files found
|
// Rename or discard certain entries based on the files found
|
||||||
char target [32];
|
const size_t kTargetBufferLength = 31;
|
||||||
sprintf(target, "TROP_%02d.SFM", Ini.SysLanguage.GetValue());
|
char target[kTargetBufferLength+1];
|
||||||
|
target[kTargetBufferLength] = 0;
|
||||||
|
snprintf(target, kTargetBufferLength, "TROP_%02d.SFM", Ini.SysLanguage.GetValue());
|
||||||
|
|
||||||
if (trp.ContainsEntry(target)) {
|
if (trp.ContainsEntry(target)) {
|
||||||
trp.RemoveEntry("TROPCONF.SFM");
|
trp.RemoveEntry("TROPCONF.SFM");
|
||||||
|
|
@ -150,7 +164,7 @@ int sceNpTrophyRegisterContext(u32 context, u32 handle, u32 statusCb_addr, u32 a
|
||||||
|
|
||||||
// Discard unnecessary TROP_XX.SFM files
|
// Discard unnecessary TROP_XX.SFM files
|
||||||
for (int i=0; i<=18; i++) {
|
for (int i=0; i<=18; i++) {
|
||||||
sprintf(target, "TROP_%02d.SFM", i);
|
snprintf(target, kTargetBufferLength, "TROP_%02d.SFM", i);
|
||||||
if (i != Ini.SysLanguage.GetValue())
|
if (i != Ini.SysLanguage.GetValue())
|
||||||
trp.RemoveEntry(target);
|
trp.RemoveEntry(target);
|
||||||
}
|
}
|
||||||
|
|
@ -288,7 +302,7 @@ int sceNpTrophyUnlockTrophy(u32 context, u32 handle, s32 trophyId, mem32_t plati
|
||||||
// TODO: There are other possible errors
|
// TODO: There are other possible errors
|
||||||
|
|
||||||
sceNpTrophyInternalContext& ctxt = s_npTrophyInstance.contexts[context];
|
sceNpTrophyInternalContext& ctxt = s_npTrophyInstance.contexts[context];
|
||||||
if (trophyId >= ctxt.tropusr->GetTrophiesCount())
|
if (trophyId >= (s32)ctxt.tropusr->GetTrophiesCount())
|
||||||
return SCE_NP_TROPHY_ERROR_INVALID_TROPHY_ID;
|
return SCE_NP_TROPHY_ERROR_INVALID_TROPHY_ID;
|
||||||
if (ctxt.tropusr->GetTrophyUnlockState(trophyId))
|
if (ctxt.tropusr->GetTrophyUnlockState(trophyId))
|
||||||
return SCE_NP_TROPHY_ERROR_ALREADY_UNLOCKED;
|
return SCE_NP_TROPHY_ERROR_ALREADY_UNLOCKED;
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,11 @@ s32 getLastError()
|
||||||
return errno;
|
return errno;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
#ifdef _WIN32
|
||||||
|
using pck_len_t = s32;
|
||||||
|
#else
|
||||||
|
using pck_len_t = u32;
|
||||||
|
#endif
|
||||||
|
|
||||||
// Functions
|
// Functions
|
||||||
int sys_net_accept(s32 s, mem_ptr_t<sys_net_sockaddr> addr, mem32_t paddrlen)
|
int sys_net_accept(s32 s, mem_ptr_t<sys_net_sockaddr> addr, mem32_t paddrlen)
|
||||||
|
|
@ -89,7 +93,7 @@ int sys_net_accept(s32 s, mem_ptr_t<sys_net_sockaddr> addr, mem32_t paddrlen)
|
||||||
sockaddr _addr;
|
sockaddr _addr;
|
||||||
memcpy(&_addr, Memory.VirtualToRealAddr(addr.GetAddr()), sizeof(sockaddr));
|
memcpy(&_addr, Memory.VirtualToRealAddr(addr.GetAddr()), sizeof(sockaddr));
|
||||||
_addr.sa_family = addr->sa_family;
|
_addr.sa_family = addr->sa_family;
|
||||||
s32 *_paddrlen = (s32 *)Memory.VirtualToRealAddr(paddrlen.GetAddr());
|
pck_len_t *_paddrlen = (pck_len_t *) Memory.VirtualToRealAddr(paddrlen.GetAddr());
|
||||||
int ret = accept(s, &_addr, _paddrlen);
|
int ret = accept(s, &_addr, _paddrlen);
|
||||||
g_lastError = getLastError();
|
g_lastError = getLastError();
|
||||||
return ret;
|
return ret;
|
||||||
|
|
@ -227,7 +231,7 @@ int sys_net_recvfrom(s32 s, u32 buf_addr, u32 len, s32 flags, mem_ptr_t<sys_net_
|
||||||
sockaddr _addr;
|
sockaddr _addr;
|
||||||
memcpy(&_addr, Memory.VirtualToRealAddr(addr.GetAddr()), sizeof(sockaddr));
|
memcpy(&_addr, Memory.VirtualToRealAddr(addr.GetAddr()), sizeof(sockaddr));
|
||||||
_addr.sa_family = addr->sa_family;
|
_addr.sa_family = addr->sa_family;
|
||||||
s32 *_paddrlen = (s32 *)Memory.VirtualToRealAddr(paddrlen.GetAddr());
|
pck_len_t *_paddrlen = (pck_len_t *) Memory.VirtualToRealAddr(paddrlen.GetAddr());
|
||||||
int ret = recvfrom(s, _buf_addr, len, flags, &_addr, _paddrlen);
|
int ret = recvfrom(s, _buf_addr, len, flags, &_addr, _paddrlen);
|
||||||
g_lastError = getLastError();
|
g_lastError = getLastError();
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,14 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "Modules.h"
|
|
||||||
|
|
||||||
#define RESULT(x) SC_ARGS_1 = (x)
|
#define RESULT(x) SC_ARGS_1 = (x)
|
||||||
|
|
||||||
|
class func_caller
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
virtual void operator()() = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
template<bool is_in_sp, bool is_fp, bool is_ptr, typename T, int i>
|
template<bool is_in_sp, bool is_fp, bool is_ptr, typename T, int i>
|
||||||
struct get_arg;
|
struct get_arg;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
#include "Emu/SysCalls/SysCalls.h"
|
#include "Emu/SysCalls/SysCalls.h"
|
||||||
#include "Emu/SysCalls/SC_FUNC.h"
|
#include "Emu/SysCalls/SC_FUNC.h"
|
||||||
|
|
||||||
extern ArrayF<SFunc> g_static_funcs_list;
|
extern std::vector<SFunc*> g_static_funcs_list;
|
||||||
|
|
||||||
void StaticAnalyse(void* ptr, u32 size, u32 base)
|
void StaticAnalyse(void* ptr, u32 size, u32 base)
|
||||||
{
|
{
|
||||||
|
|
@ -15,13 +15,13 @@ void StaticAnalyse(void* ptr, u32 size, u32 base)
|
||||||
// TODO: optimize search
|
// TODO: optimize search
|
||||||
for (u32 i = 0; i < size; i++)
|
for (u32 i = 0; i < size; i++)
|
||||||
{
|
{
|
||||||
for (u32 j = 0; j < g_static_funcs_list.GetCount(); j++)
|
for (u32 j = 0; j < g_static_funcs_list.size(); j++)
|
||||||
{
|
{
|
||||||
if ((data[i] & g_static_funcs_list[j].ops[0].mask) == g_static_funcs_list[j].ops[0].crc)
|
if ((data[i] & g_static_funcs_list[j]->ops[0].mask) == g_static_funcs_list[j]->ops[0].crc)
|
||||||
{
|
{
|
||||||
bool found = true;
|
bool found = true;
|
||||||
u32 can_skip = 0;
|
u32 can_skip = 0;
|
||||||
for (u32 k = i, x = 0; x + 1 <= g_static_funcs_list[j].ops.GetCount(); k++, x++)
|
for (u32 k = i, x = 0; x + 1 <= g_static_funcs_list[j]->ops.size(); k++, x++)
|
||||||
{
|
{
|
||||||
if (k >= size)
|
if (k >= size)
|
||||||
{
|
{
|
||||||
|
|
@ -36,8 +36,8 @@ void StaticAnalyse(void* ptr, u32 size, u32 base)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
const u32 mask = g_static_funcs_list[j].ops[x].mask;
|
const u32 mask = g_static_funcs_list[j]->ops[x].mask;
|
||||||
const u32 crc = g_static_funcs_list[j].ops[x].crc;
|
const u32 crc = g_static_funcs_list[j]->ops[x].crc;
|
||||||
|
|
||||||
if (!mask)
|
if (!mask)
|
||||||
{
|
{
|
||||||
|
|
@ -83,8 +83,8 @@ void StaticAnalyse(void* ptr, u32 size, u32 base)
|
||||||
}
|
}
|
||||||
if (found)
|
if (found)
|
||||||
{
|
{
|
||||||
ConLog.Write("Function '%s' hooked (addr=0x%x)", g_static_funcs_list[j].name, i * 4 + base);
|
ConLog.Write("Function '%s' hooked (addr=0x%x)", g_static_funcs_list[j]->name, i * 4 + base);
|
||||||
g_static_funcs_list[j].found++;
|
g_static_funcs_list[j]->found++;
|
||||||
data[i+0] = re32(0x39600000 | j); // li r11, j
|
data[i+0] = re32(0x39600000 | j); // li r11, j
|
||||||
data[i+1] = se32(0x44000003); // sc 3
|
data[i+1] = se32(0x44000003); // sc 3
|
||||||
data[i+2] = se32(0x4e800020); // blr
|
data[i+2] = se32(0x4e800020); // blr
|
||||||
|
|
@ -95,11 +95,11 @@ void StaticAnalyse(void* ptr, u32 size, u32 base)
|
||||||
}
|
}
|
||||||
|
|
||||||
// check function groups
|
// check function groups
|
||||||
for (u32 i = 0; i < g_static_funcs_list.GetCount(); i++)
|
for (u32 i = 0; i < g_static_funcs_list.size(); i++)
|
||||||
{
|
{
|
||||||
if (g_static_funcs_list[i].found) // start from some group
|
if (g_static_funcs_list[i]->found) // start from some group
|
||||||
{
|
{
|
||||||
const u64 group = g_static_funcs_list[i].group;
|
const u64 group = g_static_funcs_list[i]->group;
|
||||||
|
|
||||||
enum GroupSearchResult : u32
|
enum GroupSearchResult : u32
|
||||||
{
|
{
|
||||||
|
|
@ -110,24 +110,24 @@ void StaticAnalyse(void* ptr, u32 size, u32 base)
|
||||||
u32 res = GSR_SUCCESS;
|
u32 res = GSR_SUCCESS;
|
||||||
|
|
||||||
// analyse
|
// analyse
|
||||||
for (u32 j = 0; j < g_static_funcs_list.GetCount(); j++) if (g_static_funcs_list[j].group == group)
|
for (u32 j = 0; j < g_static_funcs_list.size(); j++) if (g_static_funcs_list[j]->group == group)
|
||||||
{
|
{
|
||||||
u32 count = g_static_funcs_list[j].found;
|
u32 count = g_static_funcs_list[j]->found;
|
||||||
|
|
||||||
if (count == 0) // not found
|
if (count == 0) // not found
|
||||||
{
|
{
|
||||||
// check if this function has been found with different pattern
|
// check if this function has been found with different pattern
|
||||||
for (u32 k = 0; k < g_static_funcs_list.GetCount(); k++) if (g_static_funcs_list[k].group == group)
|
for (u32 k = 0; k < g_static_funcs_list.size(); k++) if (g_static_funcs_list[k]->group == group)
|
||||||
{
|
{
|
||||||
if (k != j && g_static_funcs_list[k].ptr == g_static_funcs_list[j].ptr)
|
if (k != j && g_static_funcs_list[k]->ptr == g_static_funcs_list[j]->ptr)
|
||||||
{
|
{
|
||||||
count += g_static_funcs_list[k].found;
|
count += g_static_funcs_list[k]->found;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (count == 0)
|
if (count == 0)
|
||||||
{
|
{
|
||||||
res |= GSR_MISSING;
|
res |= GSR_MISSING;
|
||||||
ConLog.Error("Function '%s' not found", g_static_funcs_list[j].name);
|
ConLog.Error("Function '%s' not found", g_static_funcs_list[j]->name);
|
||||||
}
|
}
|
||||||
else if (count > 1)
|
else if (count > 1)
|
||||||
{
|
{
|
||||||
|
|
@ -137,14 +137,14 @@ void StaticAnalyse(void* ptr, u32 size, u32 base)
|
||||||
else if (count == 1) // found
|
else if (count == 1) // found
|
||||||
{
|
{
|
||||||
// ensure that this function has NOT been found with different pattern
|
// ensure that this function has NOT been found with different pattern
|
||||||
for (u32 k = 0; k < g_static_funcs_list.GetCount(); k++) if (g_static_funcs_list[k].group == group)
|
for (u32 k = 0; k < g_static_funcs_list.size(); k++) if (g_static_funcs_list[k]->group == group)
|
||||||
{
|
{
|
||||||
if (k != j && g_static_funcs_list[k].ptr == g_static_funcs_list[j].ptr)
|
if (k != j && g_static_funcs_list[k]->ptr == g_static_funcs_list[j]->ptr)
|
||||||
{
|
{
|
||||||
if (g_static_funcs_list[k].found)
|
if (g_static_funcs_list[k]->found)
|
||||||
{
|
{
|
||||||
res |= GSR_EXCESS;
|
res |= GSR_EXCESS;
|
||||||
ConLog.Error("Function '%s' hooked twice", g_static_funcs_list[j].name);
|
ConLog.Error("Function '%s' hooked twice", g_static_funcs_list[j]->name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -152,14 +152,14 @@ void StaticAnalyse(void* ptr, u32 size, u32 base)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
res |= GSR_EXCESS;
|
res |= GSR_EXCESS;
|
||||||
ConLog.Error("Function '%s' hooked twice", g_static_funcs_list[j].name);
|
ConLog.Error("Function '%s' hooked twice", g_static_funcs_list[j]->name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// clear data
|
// clear data
|
||||||
for (u32 j = 0; j < g_static_funcs_list.GetCount(); j++)
|
for (u32 j = 0; j < g_static_funcs_list.size(); j++)
|
||||||
{
|
{
|
||||||
if (g_static_funcs_list[j].group == group) g_static_funcs_list[j].found = 0;
|
if (g_static_funcs_list[j]->group == group) g_static_funcs_list[j]->found = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
char name[9] = "????????";
|
char name[9] = "????????";
|
||||||
|
|
@ -182,9 +182,9 @@ void StaticAnalyse(void* ptr, u32 size, u32 base)
|
||||||
|
|
||||||
void StaticExecute(u32 code)
|
void StaticExecute(u32 code)
|
||||||
{
|
{
|
||||||
if (code < g_static_funcs_list.GetCount())
|
if (code < g_static_funcs_list.size())
|
||||||
{
|
{
|
||||||
(*g_static_funcs_list[code].func)();
|
(*g_static_funcs_list[code]->func)();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -194,5 +194,5 @@ void StaticExecute(u32 code)
|
||||||
|
|
||||||
void StaticFinalize()
|
void StaticFinalize()
|
||||||
{
|
{
|
||||||
g_static_funcs_list.Clear();
|
g_static_funcs_list.clear();
|
||||||
}
|
}
|
||||||
|
|
@ -13,7 +13,9 @@ namespace detail{
|
||||||
void default_syscall();
|
void default_syscall();
|
||||||
static func_caller *null_func = bind_func(default_syscall);
|
static func_caller *null_func = bind_func(default_syscall);
|
||||||
|
|
||||||
static func_caller* sc_table[1024] =
|
static const int kSyscallTableLength = 1024;
|
||||||
|
|
||||||
|
static func_caller* sc_table[kSyscallTableLength] =
|
||||||
{
|
{
|
||||||
null_func,
|
null_func,
|
||||||
bind_func(sys_process_getpid), //1 (0x001)
|
bind_func(sys_process_getpid), //1 (0x001)
|
||||||
|
|
@ -502,6 +504,24 @@ static func_caller* sc_table[1024] =
|
||||||
null_func, null_func, null_func, bind_func(cellGcmCallback), //1024
|
null_func, null_func, null_func, bind_func(cellGcmCallback), //1024
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** HACK: Used to delete func_caller objects that get allocated and stored in sc_table (above).
|
||||||
|
* The destructor of this static object gets called when the program shuts down.
|
||||||
|
*/
|
||||||
|
struct SyscallTableCleaner_t
|
||||||
|
{
|
||||||
|
SyscallTableCleaner_t() {}
|
||||||
|
~SyscallTableCleaner_t()
|
||||||
|
{
|
||||||
|
for (int i = 0; i < kSyscallTableLength; ++i)
|
||||||
|
{
|
||||||
|
if (sc_table[i] != null_func)
|
||||||
|
delete sc_table[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
delete null_func;
|
||||||
|
}
|
||||||
|
} SyscallTableCleaner_t;
|
||||||
|
|
||||||
void default_syscall()
|
void default_syscall()
|
||||||
{
|
{
|
||||||
declCPU();
|
declCPU();
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ int sys_event_queue_destroy(u32 equeue_id, int mode)
|
||||||
eq->sq.m_mutex.lock();
|
eq->sq.m_mutex.lock();
|
||||||
eq->owner.lock(tid);
|
eq->owner.lock(tid);
|
||||||
// check if some threads are waiting for an event
|
// check if some threads are waiting for an event
|
||||||
if (!mode && eq->sq.list.GetCount())
|
if (!mode && eq->sq.list.size())
|
||||||
{
|
{
|
||||||
eq->owner.unlock(tid);
|
eq->owner.unlock(tid);
|
||||||
eq->sq.m_mutex.unlock();
|
eq->sq.m_mutex.unlock();
|
||||||
|
|
@ -85,7 +85,7 @@ int sys_event_queue_destroy(u32 equeue_id, int mode)
|
||||||
}
|
}
|
||||||
eq->owner.unlock(tid, ~0);
|
eq->owner.unlock(tid, ~0);
|
||||||
eq->sq.m_mutex.unlock();
|
eq->sq.m_mutex.unlock();
|
||||||
while (eq->sq.list.GetCount())
|
while (eq->sq.list.size())
|
||||||
{
|
{
|
||||||
Sleep(1);
|
Sleep(1);
|
||||||
if (Emu.IsStopped())
|
if (Emu.IsStopped())
|
||||||
|
|
@ -138,7 +138,7 @@ int sys_event_queue_tryreceive(u32 equeue_id, mem_ptr_t<sys_event_data> event_ar
|
||||||
|
|
||||||
eq->sq.m_mutex.lock();
|
eq->sq.m_mutex.lock();
|
||||||
eq->owner.lock(tid);
|
eq->owner.lock(tid);
|
||||||
if (eq->sq.list.GetCount())
|
if (eq->sq.list.size())
|
||||||
{
|
{
|
||||||
number = 0;
|
number = 0;
|
||||||
eq->owner.unlock(tid);
|
eq->owner.unlock(tid);
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ int sys_event_flag_destroy(u32 eflag_id)
|
||||||
EventFlag* ef;
|
EventFlag* ef;
|
||||||
if(!sys_event_flag.CheckId(eflag_id, ef)) return CELL_ESRCH;
|
if(!sys_event_flag.CheckId(eflag_id, ef)) return CELL_ESRCH;
|
||||||
|
|
||||||
if (ef->waiters.GetCount()) // ???
|
if (ef->waiters.size()) // ???
|
||||||
{
|
{
|
||||||
return CELL_EBUSY;
|
return CELL_EBUSY;
|
||||||
}
|
}
|
||||||
|
|
@ -89,7 +89,7 @@ int sys_event_flag_wait(u32 eflag_id, u64 bitptn, u32 mode, mem64_t result, u64
|
||||||
|
|
||||||
{
|
{
|
||||||
SMutexLocker lock(ef->m_mutex);
|
SMutexLocker lock(ef->m_mutex);
|
||||||
if (ef->m_type == SYS_SYNC_WAITER_SINGLE && ef->waiters.GetCount() > 0)
|
if (ef->m_type == SYS_SYNC_WAITER_SINGLE && ef->waiters.size() > 0)
|
||||||
{
|
{
|
||||||
return CELL_EPERM;
|
return CELL_EPERM;
|
||||||
}
|
}
|
||||||
|
|
@ -97,13 +97,13 @@ int sys_event_flag_wait(u32 eflag_id, u64 bitptn, u32 mode, mem64_t result, u64
|
||||||
rec.bitptn = bitptn;
|
rec.bitptn = bitptn;
|
||||||
rec.mode = mode;
|
rec.mode = mode;
|
||||||
rec.tid = tid;
|
rec.tid = tid;
|
||||||
ef->waiters.AddCpy(rec);
|
ef->waiters.push_back(rec);
|
||||||
|
|
||||||
if (ef->check() == tid)
|
if (ef->check() == tid)
|
||||||
{
|
{
|
||||||
u64 flags = ef->flags;
|
u64 flags = ef->flags;
|
||||||
|
|
||||||
ef->waiters.RemoveAt(ef->waiters.GetCount() - 1);
|
ef->waiters.erase(ef->waiters.end() - 1);
|
||||||
|
|
||||||
if (mode & SYS_EVENT_FLAG_WAIT_CLEAR)
|
if (mode & SYS_EVENT_FLAG_WAIT_CLEAR)
|
||||||
{
|
{
|
||||||
|
|
@ -141,11 +141,11 @@ int sys_event_flag_wait(u32 eflag_id, u64 bitptn, u32 mode, mem64_t result, u64
|
||||||
|
|
||||||
u64 flags = ef->flags;
|
u64 flags = ef->flags;
|
||||||
|
|
||||||
for (u32 i = 0; i < ef->waiters.GetCount(); i++)
|
for (u32 i = 0; i < ef->waiters.size(); i++)
|
||||||
{
|
{
|
||||||
if (ef->waiters[i].tid == tid)
|
if (ef->waiters[i].tid == tid)
|
||||||
{
|
{
|
||||||
ef->waiters.RemoveAt(i);
|
ef->waiters.erase(ef->waiters.begin() +i);
|
||||||
|
|
||||||
if (mode & SYS_EVENT_FLAG_WAIT_CLEAR)
|
if (mode & SYS_EVENT_FLAG_WAIT_CLEAR)
|
||||||
{
|
{
|
||||||
|
|
@ -179,11 +179,11 @@ int sys_event_flag_wait(u32 eflag_id, u64 bitptn, u32 mode, mem64_t result, u64
|
||||||
{
|
{
|
||||||
SMutexLocker lock(ef->m_mutex);
|
SMutexLocker lock(ef->m_mutex);
|
||||||
|
|
||||||
for (u32 i = 0; i < ef->waiters.GetCount(); i++)
|
for (u32 i = 0; i < ef->waiters.size(); i++)
|
||||||
{
|
{
|
||||||
if (ef->waiters[i].tid == tid)
|
if (ef->waiters[i].tid == tid)
|
||||||
{
|
{
|
||||||
ef->waiters.RemoveAt(i);
|
ef->waiters.erase(ef->waiters.begin() + i);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -300,19 +300,19 @@ int sys_event_flag_cancel(u32 eflag_id, mem32_t num)
|
||||||
EventFlag* ef;
|
EventFlag* ef;
|
||||||
if(!sys_event_flag.CheckId(eflag_id, ef)) return CELL_ESRCH;
|
if(!sys_event_flag.CheckId(eflag_id, ef)) return CELL_ESRCH;
|
||||||
|
|
||||||
Array<u32> tids;
|
std::vector<u32> tids;
|
||||||
|
|
||||||
{
|
{
|
||||||
SMutexLocker lock(ef->m_mutex);
|
SMutexLocker lock(ef->m_mutex);
|
||||||
tids.SetCount(ef->waiters.GetCount());
|
tids.resize(ef->waiters.size());
|
||||||
for (u32 i = 0; i < ef->waiters.GetCount(); i++)
|
for (u32 i = 0; i < ef->waiters.size(); i++)
|
||||||
{
|
{
|
||||||
tids[i] = ef->waiters[i].tid;
|
tids[i] = ef->waiters[i].tid;
|
||||||
}
|
}
|
||||||
ef->waiters.Clear();
|
ef->waiters.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
for (u32 i = 0; i < tids.GetCount(); i++)
|
for (u32 i = 0; i < tids.size(); i++)
|
||||||
{
|
{
|
||||||
if (Emu.IsStopped()) break;
|
if (Emu.IsStopped()) break;
|
||||||
ef->signal.lock(tids[i]);
|
ef->signal.lock(tids[i]);
|
||||||
|
|
@ -326,7 +326,7 @@ int sys_event_flag_cancel(u32 eflag_id, mem32_t num)
|
||||||
|
|
||||||
if (num.IsGood())
|
if (num.IsGood())
|
||||||
{
|
{
|
||||||
num = tids.GetCount();
|
num = tids.size();
|
||||||
return CELL_OK;
|
return CELL_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ struct EventFlag
|
||||||
{
|
{
|
||||||
SMutex m_mutex;
|
SMutex m_mutex;
|
||||||
u64 flags;
|
u64 flags;
|
||||||
Array<EventFlagWaiter> waiters;
|
std::vector<EventFlagWaiter> waiters;
|
||||||
SMutex signal;
|
SMutex signal;
|
||||||
const u32 m_protocol;
|
const u32 m_protocol;
|
||||||
const int m_type;
|
const int m_type;
|
||||||
|
|
@ -51,7 +51,7 @@ struct EventFlag
|
||||||
|
|
||||||
u32 target = 0;
|
u32 target = 0;
|
||||||
|
|
||||||
for (u32 i = 0; i < waiters.GetCount(); i++)
|
for (u32 i = 0; i < waiters.size(); i++)
|
||||||
{
|
{
|
||||||
if (((waiters[i].mode & SYS_EVENT_FLAG_WAIT_AND) && (flags & waiters[i].bitptn) == waiters[i].bitptn) ||
|
if (((waiters[i].mode & SYS_EVENT_FLAG_WAIT_AND) && (flags & waiters[i].bitptn) == waiters[i].bitptn) ||
|
||||||
((waiters[i].mode & SYS_EVENT_FLAG_WAIT_OR) && (flags & waiters[i].bitptn)))
|
((waiters[i].mode & SYS_EVENT_FLAG_WAIT_OR) && (flags & waiters[i].bitptn)))
|
||||||
|
|
@ -61,7 +61,7 @@ struct EventFlag
|
||||||
target = waiters[i].tid;
|
target = waiters[i].tid;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
sq.list.AddCpy(waiters[i].tid);
|
sq.list.push_back(waiters[i].tid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -94,7 +94,8 @@ int cellFsOpen(u32 path_addr, int flags, mem32_t fd, mem32_t arg, u64 size)
|
||||||
{
|
{
|
||||||
_oflags &= ~CELL_O_TRUNC;
|
_oflags &= ~CELL_O_TRUNC;
|
||||||
//truncate file before opening it as read/write
|
//truncate file before opening it as read/write
|
||||||
Emu.GetVFS().OpenFile(ppath, vfsWrite);
|
auto filePtr = Emu.GetVFS().OpenFile(ppath, vfsWrite);
|
||||||
|
delete filePtr;
|
||||||
}
|
}
|
||||||
o_mode = vfsReadWrite;
|
o_mode = vfsReadWrite;
|
||||||
break;
|
break;
|
||||||
|
|
@ -110,6 +111,7 @@ int cellFsOpen(u32 path_addr, int flags, mem32_t fd, mem32_t arg, u64 size)
|
||||||
|
|
||||||
if(!stream || !stream->IsOpened())
|
if(!stream || !stream->IsOpened())
|
||||||
{
|
{
|
||||||
|
delete stream;
|
||||||
sys_fs.Error("\"%s\" not found! flags: 0x%08x", ppath.c_str(), flags);
|
sys_fs.Error("\"%s\" not found! flags: 0x%08x", ppath.c_str(), flags);
|
||||||
return CELL_ENOENT;
|
return CELL_ENOENT;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -228,11 +228,11 @@ int sys_lwcond_wait(mem_ptr_t<sys_lwcond_t> lwcond, u64 timeout)
|
||||||
switch (mutex->lock(tid, 0))
|
switch (mutex->lock(tid, 0))
|
||||||
{
|
{
|
||||||
case CELL_OK: break;
|
case CELL_OK: break;
|
||||||
case CELL_EDEADLK: sys_lwcond.Warning("sys_lwcond_wait(id=%d): associated mutex was locked",
|
case static_cast<int>(CELL_EDEADLK): sys_lwcond.Warning("sys_lwcond_wait(id=%d): associated mutex was locked",
|
||||||
(u32)lwcond->lwcond_queue); return CELL_OK;
|
(u32)lwcond->lwcond_queue); return CELL_OK;
|
||||||
case CELL_ESRCH: sys_lwcond.Warning("sys_lwcond_wait(id=%d): associated mutex not found (%d)",
|
case static_cast<int>(CELL_ESRCH): sys_lwcond.Warning("sys_lwcond_wait(id=%d): associated mutex not found (%d)",
|
||||||
(u32)lwcond->lwcond_queue, (u32)mutex->sleep_queue); return CELL_ESRCH;
|
(u32)lwcond->lwcond_queue, (u32)mutex->sleep_queue); return CELL_ESRCH;
|
||||||
case CELL_EINVAL: goto abort;
|
case static_cast<int>(CELL_EINVAL): goto abort;
|
||||||
}
|
}
|
||||||
|
|
||||||
mutex->recursive_count = 1;
|
mutex->recursive_count = 1;
|
||||||
|
|
|
||||||
|
|
@ -100,7 +100,7 @@ int sys_lwmutex_unlock(mem_ptr_t<sys_lwmutex_t> lwmutex)
|
||||||
void SleepQueue::push(u32 tid)
|
void SleepQueue::push(u32 tid)
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(m_mutex);
|
std::lock_guard<std::mutex> lock(m_mutex);
|
||||||
list.AddCpy(tid);
|
list.push_back(tid);
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 SleepQueue::pop() // SYS_SYNC_FIFO
|
u32 SleepQueue::pop() // SYS_SYNC_FIFO
|
||||||
|
|
@ -109,10 +109,10 @@ u32 SleepQueue::pop() // SYS_SYNC_FIFO
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
if (list.GetCount())
|
if (list.size())
|
||||||
{
|
{
|
||||||
u32 res = list[0];
|
u32 res = list[0];
|
||||||
list.RemoveAt(0);
|
list.erase(list.begin());
|
||||||
if (res && Emu.GetIdManager().CheckID(res))
|
if (res && Emu.GetIdManager().CheckID(res))
|
||||||
// check thread
|
// check thread
|
||||||
{
|
{
|
||||||
|
|
@ -129,11 +129,11 @@ u32 SleepQueue::pop_prio() // SYS_SYNC_PRIORITY
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
if (list.GetCount())
|
if (list.size())
|
||||||
{
|
{
|
||||||
u32 highest_prio = ~0;
|
u32 highest_prio = ~0;
|
||||||
u32 sel = 0;
|
u32 sel = 0;
|
||||||
for (u32 i = 0; i < list.GetCount(); i++)
|
for (u32 i = 0; i < list.size(); i++)
|
||||||
{
|
{
|
||||||
CPUThread* t = Emu.GetCPU().GetThread(list[i]);
|
CPUThread* t = Emu.GetCPU().GetThread(list[i]);
|
||||||
if (!t)
|
if (!t)
|
||||||
|
|
@ -150,7 +150,7 @@ u32 SleepQueue::pop_prio() // SYS_SYNC_PRIORITY
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
u32 res = list[sel];
|
u32 res = list[sel];
|
||||||
list.RemoveAt(sel);
|
list.erase(list.begin() + sel);
|
||||||
/* if (Emu.GetIdManager().CheckID(res)) */
|
/* if (Emu.GetIdManager().CheckID(res)) */
|
||||||
if (res)
|
if (res)
|
||||||
// check thread
|
// check thread
|
||||||
|
|
@ -173,11 +173,11 @@ bool SleepQueue::invalidate(u32 tid)
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(m_mutex);
|
std::lock_guard<std::mutex> lock(m_mutex);
|
||||||
|
|
||||||
if (tid) for (u32 i = 0; i < list.GetCount(); i++)
|
if (tid) for (u32 i = 0; i < list.size(); i++)
|
||||||
{
|
{
|
||||||
if (list[i] == tid)
|
if (list[i] == tid)
|
||||||
{
|
{
|
||||||
list.RemoveAt(i);
|
list.erase(list.begin() + i);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -189,7 +189,7 @@ bool SleepQueue::finalize()
|
||||||
{
|
{
|
||||||
if (!m_mutex.try_lock()) return false;
|
if (!m_mutex.try_lock()) return false;
|
||||||
|
|
||||||
for (u32 i = 0; i < list.GetCount(); i++)
|
for (u32 i = 0; i < list.size(); i++)
|
||||||
{
|
{
|
||||||
if (list[i])
|
if (list[i])
|
||||||
{
|
{
|
||||||
|
|
@ -299,7 +299,7 @@ int sys_lwmutex_t::lock(be_t<u32> tid, u64 timeout)
|
||||||
{
|
{
|
||||||
switch (int res = trylock(tid))
|
switch (int res = trylock(tid))
|
||||||
{
|
{
|
||||||
case CELL_EBUSY: break;
|
case static_cast<int>(CELL_EBUSY): break;
|
||||||
default: return res;
|
default: return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ struct SleepQueue
|
||||||
u64 prio;
|
u64 prio;
|
||||||
q_rec(u32 tid, u64 prio): tid(tid), prio(prio) {}
|
q_rec(u32 tid, u64 prio): tid(tid), prio(prio) {}
|
||||||
}; */
|
}; */
|
||||||
Array<u32> list;
|
std::vector<u32> list;
|
||||||
std::mutex m_mutex;
|
std::mutex m_mutex;
|
||||||
u64 m_name;
|
u64 m_name;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ struct Mutex
|
||||||
|
|
||||||
if (!m_queue.m_mutex.try_lock()) return;
|
if (!m_queue.m_mutex.try_lock()) return;
|
||||||
|
|
||||||
for (u32 i = 0; i < m_queue.list.GetCount(); i++)
|
for (u32 i = 0; i < m_queue.list.size(); i++)
|
||||||
{
|
{
|
||||||
if (u32 owner = m_queue.list[i]) ConLog.Write("Mutex(%d) was waited by thread %d", id, owner);
|
if (u32 owner = m_queue.list[i]) ConLog.Write("Mutex(%d) was waited by thread %d", id, owner);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ int sys_rwlock_destroy(u32 rw_lock_id)
|
||||||
|
|
||||||
std::lock_guard<std::mutex> lock(rw->m_lock);
|
std::lock_guard<std::mutex> lock(rw->m_lock);
|
||||||
|
|
||||||
if (rw->wlock_queue.GetCount() || rw->rlock_list.GetCount() || rw->wlock_thread) return CELL_EBUSY;
|
if (rw->wlock_queue.size() || rw->rlock_list.size() || rw->wlock_thread) return CELL_EBUSY;
|
||||||
|
|
||||||
Emu.GetIdManager().RemoveID(rw_lock_id);
|
Emu.GetIdManager().RemoveID(rw_lock_id);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,8 @@ struct RWLock
|
||||||
{
|
{
|
||||||
std::mutex m_lock; // internal lock
|
std::mutex m_lock; // internal lock
|
||||||
u32 wlock_thread; // write lock owner
|
u32 wlock_thread; // write lock owner
|
||||||
Array<u32> wlock_queue; // write lock queue
|
std::vector<u32> wlock_queue; // write lock queue
|
||||||
Array<u32> rlock_list; // read lock list
|
std::vector<u32> rlock_list; // read lock list
|
||||||
u32 m_protocol; // TODO
|
u32 m_protocol; // TODO
|
||||||
|
|
||||||
union
|
union
|
||||||
|
|
@ -41,9 +41,9 @@ struct RWLock
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(m_lock);
|
std::lock_guard<std::mutex> lock(m_lock);
|
||||||
|
|
||||||
if (!wlock_thread && !wlock_queue.GetCount())
|
if (!wlock_thread && !wlock_queue.size())
|
||||||
{
|
{
|
||||||
rlock_list.AddCpy(tid);
|
rlock_list.push_back(tid);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -53,11 +53,11 @@ struct RWLock
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(m_lock);
|
std::lock_guard<std::mutex> lock(m_lock);
|
||||||
|
|
||||||
for (u32 i = rlock_list.GetCount() - 1; ~i; i--)
|
for (u32 i = rlock_list.size() - 1; ~i; i--)
|
||||||
{
|
{
|
||||||
if (rlock_list[i] == tid)
|
if (rlock_list[i] == tid)
|
||||||
{
|
{
|
||||||
rlock_list.RemoveAt(i);
|
rlock_list.erase(rlock_list.begin() + i);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -72,7 +72,7 @@ struct RWLock
|
||||||
{
|
{
|
||||||
return false; // deadlock
|
return false; // deadlock
|
||||||
}
|
}
|
||||||
for (u32 i = rlock_list.GetCount() - 1; ~i; i--)
|
for (u32 i = rlock_list.size() - 1; ~i; i--)
|
||||||
{
|
{
|
||||||
if (rlock_list[i] == tid)
|
if (rlock_list[i] == tid)
|
||||||
{
|
{
|
||||||
|
|
@ -86,31 +86,31 @@ struct RWLock
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(m_lock);
|
std::lock_guard<std::mutex> lock(m_lock);
|
||||||
|
|
||||||
if (wlock_thread || rlock_list.GetCount()) // already locked
|
if (wlock_thread || rlock_list.size()) // already locked
|
||||||
{
|
{
|
||||||
if (!enqueue)
|
if (!enqueue)
|
||||||
{
|
{
|
||||||
return false; // do not enqueue
|
return false; // do not enqueue
|
||||||
}
|
}
|
||||||
for (u32 i = wlock_queue.GetCount() - 1; ~i; i--)
|
for (u32 i = wlock_queue.size() - 1; ~i; i--)
|
||||||
{
|
{
|
||||||
if (wlock_queue[i] == tid)
|
if (wlock_queue[i] == tid)
|
||||||
{
|
{
|
||||||
return false; // already enqueued
|
return false; // already enqueued
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
wlock_queue.AddCpy(tid); // enqueue new thread
|
wlock_queue.push_back(tid); // enqueue new thread
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (wlock_queue.GetCount())
|
if (wlock_queue.size())
|
||||||
{
|
{
|
||||||
// SYNC_FIFO only yet
|
// SYNC_FIFO only yet
|
||||||
if (wlock_queue[0] == tid)
|
if (wlock_queue[0] == tid)
|
||||||
{
|
{
|
||||||
wlock_thread = tid;
|
wlock_thread = tid;
|
||||||
wlock_queue.RemoveAt(0);
|
wlock_queue.erase(wlock_queue.begin());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -119,14 +119,14 @@ struct RWLock
|
||||||
{
|
{
|
||||||
return false; // do not enqueue
|
return false; // do not enqueue
|
||||||
}
|
}
|
||||||
for (u32 i = wlock_queue.GetCount() - 1; ~i; i--)
|
for (u32 i = wlock_queue.size() - 1; ~i; i--)
|
||||||
{
|
{
|
||||||
if (wlock_queue[i] == tid)
|
if (wlock_queue[i] == tid)
|
||||||
{
|
{
|
||||||
return false; // already enqueued
|
return false; // already enqueued
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
wlock_queue.AddCpy(tid); // enqueue new thread
|
wlock_queue.push_back(tid); // enqueue new thread
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ int sys_spu_thread_initialize(mem32_t thread, u32 group, u32 spu_num, mem_ptr_t<
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(spu_num >= group_info->list.GetCount())
|
if(spu_num >= group_info->list.size())
|
||||||
{
|
{
|
||||||
return CELL_EINVAL;
|
return CELL_EINVAL;
|
||||||
}
|
}
|
||||||
|
|
@ -204,7 +204,7 @@ int sys_spu_thread_group_destroy(u32 id)
|
||||||
return CELL_EBUSY;
|
return CELL_EBUSY;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (u32 i = 0; i < group_info->list.GetCount(); i++)
|
for (u32 i = 0; i < group_info->list.size(); i++)
|
||||||
{
|
{
|
||||||
// TODO: disconnect all event ports
|
// TODO: disconnect all event ports
|
||||||
|
|
||||||
|
|
@ -228,7 +228,7 @@ int sys_spu_thread_group_start(u32 id)
|
||||||
|
|
||||||
// TODO: check group state
|
// TODO: check group state
|
||||||
|
|
||||||
for (u32 i = 0; i < group_info->list.GetCount(); i++)
|
for (u32 i = 0; i < group_info->list.size(); i++)
|
||||||
{
|
{
|
||||||
CPUThread* t;
|
CPUThread* t;
|
||||||
if (t = Emu.GetCPU().GetThread(group_info->list[i]))
|
if (t = Emu.GetCPU().GetThread(group_info->list[i]))
|
||||||
|
|
@ -253,7 +253,7 @@ int sys_spu_thread_group_suspend(u32 id)
|
||||||
|
|
||||||
// TODO: check group state
|
// TODO: check group state
|
||||||
|
|
||||||
for (u32 i = 0; i < group_info->list.GetCount(); i++)
|
for (u32 i = 0; i < group_info->list.size(); i++)
|
||||||
{
|
{
|
||||||
if (CPUThread* t = Emu.GetCPU().GetThread(group_info->list[i]))
|
if (CPUThread* t = Emu.GetCPU().GetThread(group_info->list[i]))
|
||||||
{
|
{
|
||||||
|
|
@ -277,7 +277,7 @@ int sys_spu_thread_group_resume(u32 id)
|
||||||
|
|
||||||
// TODO: check group state
|
// TODO: check group state
|
||||||
|
|
||||||
for (u32 i = 0; i < group_info->list.GetCount(); i++)
|
for (u32 i = 0; i < group_info->list.size(); i++)
|
||||||
{
|
{
|
||||||
if (CPUThread* t = Emu.GetCPU().GetThread(group_info->list[i]))
|
if (CPUThread* t = Emu.GetCPU().GetThread(group_info->list[i]))
|
||||||
{
|
{
|
||||||
|
|
@ -331,7 +331,7 @@ int sys_spu_thread_group_join(u32 id, mem32_t cause, mem32_t status)
|
||||||
cause = SYS_SPU_THREAD_GROUP_JOIN_ALL_THREADS_EXIT;
|
cause = SYS_SPU_THREAD_GROUP_JOIN_ALL_THREADS_EXIT;
|
||||||
status = 0; //unspecified because of ALL_THREADS_EXIT
|
status = 0; //unspecified because of ALL_THREADS_EXIT
|
||||||
|
|
||||||
for (u32 i = 0; i < group_info->list.GetCount(); i++)
|
for (u32 i = 0; i < group_info->list.size(); i++)
|
||||||
{
|
{
|
||||||
while (CPUThread* t = Emu.GetCPU().GetThread(group_info->list[i]))
|
while (CPUThread* t = Emu.GetCPU().GetThread(group_info->list[i]))
|
||||||
{
|
{
|
||||||
|
|
@ -725,7 +725,7 @@ int sys_spu_thread_group_connect_event_all_threads(u32 id, u32 eq, u64 req, u32
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
for(u32 i=0; i<group->list.GetCount(); ++i)
|
for(u32 i=0; i<group->list.size(); ++i)
|
||||||
{
|
{
|
||||||
CPUThread* t;
|
CPUThread* t;
|
||||||
if(t = Emu.GetCPU().GetThread(group->list[i]))
|
if(t = Emu.GetCPU().GetThread(group->list[i]))
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ struct sys_spu_segment
|
||||||
|
|
||||||
struct SpuGroupInfo
|
struct SpuGroupInfo
|
||||||
{
|
{
|
||||||
Array<u32> list;
|
std::vector<u32> list;
|
||||||
std::atomic<u32> lock;
|
std::atomic<u32> lock;
|
||||||
std::string m_name;
|
std::string m_name;
|
||||||
int m_prio;
|
int m_prio;
|
||||||
|
|
@ -73,7 +73,7 @@ struct SpuGroupInfo
|
||||||
, lock(0)
|
, lock(0)
|
||||||
{
|
{
|
||||||
num = 256;
|
num = 256;
|
||||||
list.SetCount(num);
|
list.resize(num);
|
||||||
for (u32 i = 0; i < num; i++)
|
for (u32 i = 0; i < num; i++)
|
||||||
{
|
{
|
||||||
list[i] = 0;
|
list[i] = 0;
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ static const u16 bpdb_version = 0x1000;
|
||||||
|
|
||||||
ModuleInitializer::ModuleInitializer()
|
ModuleInitializer::ModuleInitializer()
|
||||||
{
|
{
|
||||||
Emu.AddModuleInit(this);
|
Emu.AddModuleInit(std::move(std::unique_ptr<ModuleInitializer>(this)));
|
||||||
}
|
}
|
||||||
|
|
||||||
Emulator::Emulator()
|
Emulator::Emulator()
|
||||||
|
|
@ -32,10 +32,10 @@ Emulator::Emulator()
|
||||||
|
|
||||||
void Emulator::Init()
|
void Emulator::Init()
|
||||||
{
|
{
|
||||||
while(m_modules_init.GetCount())
|
while(m_modules_init.size())
|
||||||
{
|
{
|
||||||
m_modules_init[0].Init();
|
m_modules_init[0]->Init();
|
||||||
m_modules_init.RemoveAt(0);
|
m_modules_init.erase(m_modules_init.begin());
|
||||||
}
|
}
|
||||||
//if(m_memory_viewer) m_memory_viewer->Close();
|
//if(m_memory_viewer) m_memory_viewer->Close();
|
||||||
//m_memory_viewer = new MemoryViewerPanel(wxGetApp().m_MainFrame);
|
//m_memory_viewer = new MemoryViewerPanel(wxGetApp().m_MainFrame);
|
||||||
|
|
@ -54,17 +54,17 @@ void Emulator::SetTitleID(const std::string& id)
|
||||||
|
|
||||||
void Emulator::CheckStatus()
|
void Emulator::CheckStatus()
|
||||||
{
|
{
|
||||||
ArrayF<CPUThread>& threads = GetCPU().GetThreads();
|
std::vector<CPUThread *>& threads = GetCPU().GetThreads();
|
||||||
if(!threads.GetCount())
|
if(!threads.size())
|
||||||
{
|
{
|
||||||
Stop();
|
Stop();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsAllPaused = true;
|
bool IsAllPaused = true;
|
||||||
for(u32 i=0; i<threads.GetCount(); ++i)
|
for(u32 i=0; i<threads.size(); ++i)
|
||||||
{
|
{
|
||||||
if(threads[i].IsPaused()) continue;
|
if(threads[i]->IsPaused()) continue;
|
||||||
IsAllPaused = false;
|
IsAllPaused = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -76,9 +76,9 @@ void Emulator::CheckStatus()
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsAllStoped = true;
|
bool IsAllStoped = true;
|
||||||
for(u32 i=0; i<threads.GetCount(); ++i)
|
for(u32 i=0; i<threads.size(); ++i)
|
||||||
{
|
{
|
||||||
if(threads[i].IsStopped()) continue;
|
if(threads[i]->IsStopped()) continue;
|
||||||
IsAllStoped = false;
|
IsAllStoped = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -147,9 +147,9 @@ void Emulator::Load()
|
||||||
|
|
||||||
ConLog.SkipLn();
|
ConLog.SkipLn();
|
||||||
ConLog.Write("Mount info:");
|
ConLog.Write("Mount info:");
|
||||||
for(uint i=0; i<m_vfs.m_devices.GetCount(); ++i)
|
for(uint i=0; i<m_vfs.m_devices.size(); ++i)
|
||||||
{
|
{
|
||||||
ConLog.Write("%s -> %s", m_vfs.m_devices[i].GetPs3Path().c_str(), m_vfs.m_devices[i].GetLocalPath().c_str());
|
ConLog.Write("%s -> %s", m_vfs.m_devices[i]->GetPs3Path().c_str(), m_vfs.m_devices[i]->GetLocalPath().c_str());
|
||||||
}
|
}
|
||||||
ConLog.SkipLn();
|
ConLog.SkipLn();
|
||||||
|
|
||||||
|
|
@ -377,8 +377,8 @@ void Emulator::Stop()
|
||||||
m_rsx_callback = 0;
|
m_rsx_callback = 0;
|
||||||
|
|
||||||
SavePoints(BreakPointsDBName);
|
SavePoints(BreakPointsDBName);
|
||||||
m_break_points.Clear();
|
m_break_points.clear();
|
||||||
m_marked_points.Clear();
|
m_marked_points.clear();
|
||||||
|
|
||||||
m_vfs.UnMountAll();
|
m_vfs.UnMountAll();
|
||||||
|
|
||||||
|
|
@ -407,8 +407,8 @@ void Emulator::SavePoints(const std::string& path)
|
||||||
{
|
{
|
||||||
std::ofstream f(path, std::ios::binary | std::ios::trunc);
|
std::ofstream f(path, std::ios::binary | std::ios::trunc);
|
||||||
|
|
||||||
u32 break_count = m_break_points.GetCount();
|
u32 break_count = m_break_points.size();
|
||||||
u32 marked_count = m_marked_points.GetCount();
|
u32 marked_count = m_marked_points.size();
|
||||||
|
|
||||||
f << bpdb_version << break_count << marked_count;
|
f << bpdb_version << break_count << marked_count;
|
||||||
|
|
||||||
|
|
@ -447,13 +447,13 @@ void Emulator::LoadPoints(const std::string& path)
|
||||||
|
|
||||||
if(break_count > 0)
|
if(break_count > 0)
|
||||||
{
|
{
|
||||||
m_break_points.SetCount(break_count);
|
m_break_points.resize(break_count);
|
||||||
f.read(reinterpret_cast<char*>(&m_break_points[0]), sizeof(u64) * break_count);
|
f.read(reinterpret_cast<char*>(&m_break_points[0]), sizeof(u64) * break_count);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(marked_count > 0)
|
if(marked_count > 0)
|
||||||
{
|
{
|
||||||
m_marked_points.SetCount(marked_count);
|
m_marked_points.resize(marked_count);
|
||||||
f.read(reinterpret_cast<char*>(&m_marked_points[0]), sizeof(u64) * marked_count);
|
f.read(reinterpret_cast<char*>(&m_marked_points[0]), sizeof(u64) * marked_count);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -76,10 +76,10 @@ class Emulator
|
||||||
u32 m_ppu_thr_exit;
|
u32 m_ppu_thr_exit;
|
||||||
MemoryViewerPanel* m_memory_viewer;
|
MemoryViewerPanel* m_memory_viewer;
|
||||||
//ArrayF<CPUThread> m_cpu_threads;
|
//ArrayF<CPUThread> m_cpu_threads;
|
||||||
ArrayF<ModuleInitializer> m_modules_init;
|
std::vector<std::unique_ptr<ModuleInitializer>> m_modules_init;
|
||||||
|
|
||||||
Array<u64> m_break_points;
|
std::vector<u64> m_break_points;
|
||||||
Array<u64> m_marked_points;
|
std::vector<u64> m_marked_points;
|
||||||
|
|
||||||
CPUThreadManager m_thread_manager;
|
CPUThreadManager m_thread_manager;
|
||||||
PadManager m_pad_manager;
|
PadManager m_pad_manager;
|
||||||
|
|
@ -118,14 +118,14 @@ public:
|
||||||
AudioManager& GetAudioManager() { return m_audio_manager; }
|
AudioManager& GetAudioManager() { return m_audio_manager; }
|
||||||
CallbackManager& GetCallbackManager() { return m_callback_manager; }
|
CallbackManager& GetCallbackManager() { return m_callback_manager; }
|
||||||
VFS& GetVFS() { return m_vfs; }
|
VFS& GetVFS() { return m_vfs; }
|
||||||
Array<u64>& GetBreakPoints() { return m_break_points; }
|
std::vector<u64>& GetBreakPoints() { return m_break_points; }
|
||||||
Array<u64>& GetMarkedPoints() { return m_marked_points; }
|
std::vector<u64>& GetMarkedPoints() { return m_marked_points; }
|
||||||
CPUThread& GetCallbackThread() { return *m_ppu_callback_thr; }
|
CPUThread& GetCallbackThread() { return *m_ppu_callback_thr; }
|
||||||
EventManager& GetEventManager() { return *m_event_manager; }
|
EventManager& GetEventManager() { return *m_event_manager; }
|
||||||
|
|
||||||
void AddModuleInit(ModuleInitializer* m)
|
void AddModuleInit(std::unique_ptr<ModuleInitializer> m)
|
||||||
{
|
{
|
||||||
m_modules_init.Add(m);
|
m_modules_init.push_back(std::move(m));
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetTLSData(const u64 addr, const u64 filesz, const u64 memsz)
|
void SetTLSData(const u64 addr, const u64 filesz, const u64 memsz)
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ struct EventPort
|
||||||
|
|
||||||
class EventRingBuffer
|
class EventRingBuffer
|
||||||
{
|
{
|
||||||
Array<sys_event_data> data;
|
std::vector<sys_event_data> data;
|
||||||
SMutex m_lock;
|
SMutex m_lock;
|
||||||
u32 buf_pos;
|
u32 buf_pos;
|
||||||
u32 buf_count;
|
u32 buf_count;
|
||||||
|
|
@ -82,7 +82,7 @@ public:
|
||||||
, buf_pos(0)
|
, buf_pos(0)
|
||||||
, buf_count(0)
|
, buf_count(0)
|
||||||
{
|
{
|
||||||
data.SetCount(size);
|
data.resize(size);
|
||||||
}
|
}
|
||||||
|
|
||||||
void clear()
|
void clear()
|
||||||
|
|
@ -151,7 +151,7 @@ public:
|
||||||
|
|
||||||
class EventPortList
|
class EventPortList
|
||||||
{
|
{
|
||||||
Array<EventPort*> data;
|
std::vector<EventPort*> data;
|
||||||
SMutex m_lock;
|
SMutex m_lock;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
@ -159,28 +159,28 @@ public:
|
||||||
void clear()
|
void clear()
|
||||||
{
|
{
|
||||||
SMutexLocker lock(m_lock);
|
SMutexLocker lock(m_lock);
|
||||||
for (u32 i = 0; i < data.GetCount(); i++)
|
for (u32 i = 0; i < data.size(); i++)
|
||||||
{
|
{
|
||||||
SMutexLocker lock2(data[i]->mutex);
|
SMutexLocker lock2(data[i]->mutex);
|
||||||
data[i]->eq = nullptr; // force all ports to disconnect
|
data[i]->eq = nullptr; // force all ports to disconnect
|
||||||
}
|
}
|
||||||
data.Clear();
|
data.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void add(EventPort* port)
|
void add(EventPort* port)
|
||||||
{
|
{
|
||||||
SMutexLocker lock(m_lock);
|
SMutexLocker lock(m_lock);
|
||||||
data.AddCpy(port);
|
data.push_back(port);
|
||||||
}
|
}
|
||||||
|
|
||||||
void remove(EventPort* port)
|
void remove(EventPort* port)
|
||||||
{
|
{
|
||||||
SMutexLocker lock(m_lock);
|
SMutexLocker lock(m_lock);
|
||||||
for (u32 i = 0; i < data.GetCount(); i++)
|
for (u32 i = 0; i < data.size(); i++)
|
||||||
{
|
{
|
||||||
if (data[i] == port)
|
if (data[i] == port)
|
||||||
{
|
{
|
||||||
data.RemoveAt(i);
|
data.erase(data.begin() + i);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ struct _LogBuffer : public MTPacketBuffer<LogPacket>
|
||||||
const u32 stext = data.m_text.length();
|
const u32 stext = data.m_text.length();
|
||||||
const u32 scolour = data.m_colour.length();
|
const u32 scolour = data.m_colour.length();
|
||||||
|
|
||||||
m_buffer.Reserve(
|
m_buffer.resize( m_buffer.size() +
|
||||||
sizeof(u32) + sprefix +
|
sizeof(u32) + sprefix +
|
||||||
sizeof(u32) + stext +
|
sizeof(u32) + stext +
|
||||||
sizeof(u32) + scolour);
|
sizeof(u32) + scolour);
|
||||||
|
|
|
||||||
|
|
@ -104,8 +104,8 @@ void DisAsmFrame::Resume()
|
||||||
|
|
||||||
#include <Utilities/MTProgressDialog.h>
|
#include <Utilities/MTProgressDialog.h>
|
||||||
#include "Loader/ELF.h"
|
#include "Loader/ELF.h"
|
||||||
Array<Elf64_Shdr>* shdr_arr_64 = NULL;
|
std::vector<Elf64_Shdr>* shdr_arr_64 = NULL;
|
||||||
Array<Elf32_Shdr>* shdr_arr_32 = NULL;
|
std::vector<Elf32_Shdr>* shdr_arr_32 = NULL;
|
||||||
ELF64Loader* l_elf64 = NULL;
|
ELF64Loader* l_elf64 = NULL;
|
||||||
ELF32Loader* l_elf32 = NULL;
|
ELF32Loader* l_elf32 = NULL;
|
||||||
bool ElfType64 = false;
|
bool ElfType64 = false;
|
||||||
|
|
@ -135,7 +135,7 @@ public:
|
||||||
|
|
||||||
*done = false;
|
*done = false;
|
||||||
|
|
||||||
if(Emu.GetCPU().GetThreads()[0].GetType() != CPU_THREAD_PPU)
|
if(Emu.GetCPU().GetThreads()[0]->GetType() != CPU_THREAD_PPU)
|
||||||
{
|
{
|
||||||
SPUDisAsm& dis_asm = *new SPUDisAsm(CPUDisAsm_DumpMode);
|
SPUDisAsm& dis_asm = *new SPUDisAsm(CPUDisAsm_DumpMode);
|
||||||
decoder = new SPUDecoder(dis_asm);
|
decoder = new SPUDecoder(dis_asm);
|
||||||
|
|
@ -143,9 +143,9 @@ public:
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
PPUDisAsm& dis_asm = *new PPUDisAsm(CPUDisAsm_DumpMode);
|
PPUDisAsm* dis_asm = new PPUDisAsm(CPUDisAsm_DumpMode);
|
||||||
decoder = new PPUDecoder(dis_asm);
|
decoder = new PPUDecoder(dis_asm);
|
||||||
disasm = &dis_asm;
|
disasm = dis_asm;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -153,7 +153,7 @@ public:
|
||||||
{
|
{
|
||||||
ConLog.Write("Start dump in thread %d!", (int)id);
|
ConLog.Write("Start dump in thread %d!", (int)id);
|
||||||
const u32 max_value = prog_dial->GetMaxValue(id);
|
const u32 max_value = prog_dial->GetMaxValue(id);
|
||||||
const u32 shdr_count = ElfType64 ? shdr_arr_64->GetCount() : shdr_arr_32->GetCount();
|
const u32 shdr_count = ElfType64 ? shdr_arr_64->size() : shdr_arr_32->size();
|
||||||
|
|
||||||
for(u32 sh=0, vsize=0; sh<shdr_count; ++sh)
|
for(u32 sh=0, vsize=0; sh<shdr_count; ++sh)
|
||||||
{
|
{
|
||||||
|
|
@ -235,7 +235,7 @@ struct WaitDumperThread : public ThreadBase
|
||||||
wxFile fd;
|
wxFile fd;
|
||||||
fd.Open(patch, wxFile::write);
|
fd.Open(patch, wxFile::write);
|
||||||
|
|
||||||
const u32 shdr_count = ElfType64 ? shdr_arr_64->GetCount() : shdr_arr_32->GetCount();
|
const u32 shdr_count = ElfType64 ? shdr_arr_64->size() : shdr_arr_32->size();
|
||||||
|
|
||||||
for(uint sh=0, counter=0; sh<shdr_count; ++sh)
|
for(uint sh=0, counter=0; sh<shdr_count; ++sh)
|
||||||
{
|
{
|
||||||
|
|
@ -320,7 +320,7 @@ void DisAsmFrame::Dump(wxCommandEvent& WXUNUSED(event))
|
||||||
}
|
}
|
||||||
name_arr = l_elf64->shdr_name_arr;
|
name_arr = l_elf64->shdr_name_arr;
|
||||||
shdr_arr_64 = &l_elf64->shdr_arr;
|
shdr_arr_64 = &l_elf64->shdr_arr;
|
||||||
if(l_elf64->shdr_arr.GetCount() <= 0) return;
|
if(l_elf64->shdr_arr.size() <= 0) return;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CLASS_ELF32:
|
case CLASS_ELF32:
|
||||||
|
|
@ -334,7 +334,7 @@ void DisAsmFrame::Dump(wxCommandEvent& WXUNUSED(event))
|
||||||
|
|
||||||
name_arr = l_elf32->shdr_name_arr;
|
name_arr = l_elf32->shdr_name_arr;
|
||||||
shdr_arr_32 = &l_elf32->shdr_arr;
|
shdr_arr_32 = &l_elf32->shdr_arr;
|
||||||
if(l_elf32->shdr_arr.GetCount() <= 0) return;
|
if(l_elf32->shdr_arr.size() <= 0) return;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default: ConLog.Error("Corrupted ELF!"); return;
|
default: ConLog.Error("Corrupted ELF!"); return;
|
||||||
|
|
@ -343,13 +343,13 @@ void DisAsmFrame::Dump(wxCommandEvent& WXUNUSED(event))
|
||||||
PPCDisAsm* disasm;
|
PPCDisAsm* disasm;
|
||||||
PPCDecoder* decoder;
|
PPCDecoder* decoder;
|
||||||
|
|
||||||
switch(Emu.GetCPU().GetThreads()[0].GetType())
|
switch(Emu.GetCPU().GetThreads()[0]->GetType())
|
||||||
{
|
{
|
||||||
case CPU_THREAD_PPU:
|
case CPU_THREAD_PPU:
|
||||||
{
|
{
|
||||||
PPUDisAsm& dis_asm = *new PPUDisAsm(CPUDisAsm_DumpMode);
|
PPUDisAsm* dis_asm = new PPUDisAsm(CPUDisAsm_DumpMode);
|
||||||
decoder = new PPUDecoder(dis_asm);
|
decoder = new PPUDecoder(dis_asm);
|
||||||
disasm = &dis_asm;
|
disasm = dis_asm;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
@ -363,7 +363,7 @@ void DisAsmFrame::Dump(wxCommandEvent& WXUNUSED(event))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
const u32 shdr_count = ElfType64 ? shdr_arr_64->GetCount() : shdr_arr_32->GetCount();
|
const u32 shdr_count = ElfType64 ? shdr_arr_64->size() : shdr_arr_32->size();
|
||||||
|
|
||||||
u64 max_count = 0;
|
u64 max_count = 0;
|
||||||
for(u32 sh=0; sh<shdr_count; ++sh)
|
for(u32 sh=0; sh<shdr_count; ++sh)
|
||||||
|
|
|
||||||
|
|
@ -37,9 +37,8 @@ FnIdGenerator::FnIdGenerator(wxWindow* parent)
|
||||||
|
|
||||||
FnIdGenerator::~FnIdGenerator()
|
FnIdGenerator::~FnIdGenerator()
|
||||||
{
|
{
|
||||||
m_func_name.Clear();
|
|
||||||
m_func_id.Clear();
|
|
||||||
delete m_list;
|
delete m_list;
|
||||||
|
m_list = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void FnIdGenerator::OnInput(wxCommandEvent &event)
|
void FnIdGenerator::OnInput(wxCommandEvent &event)
|
||||||
|
|
@ -51,8 +50,8 @@ void FnIdGenerator::OnInput(wxCommandEvent &event)
|
||||||
void FnIdGenerator::OnClear(wxCommandEvent &event)
|
void FnIdGenerator::OnClear(wxCommandEvent &event)
|
||||||
{
|
{
|
||||||
m_list->DeleteAllItems();
|
m_list->DeleteAllItems();
|
||||||
m_func_name.Clear();
|
m_func_name.clear();
|
||||||
m_func_id.Clear();
|
m_func_id.clear();
|
||||||
event.Skip();
|
event.Skip();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -82,8 +81,8 @@ void FnIdGenerator::PrintId()
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const be_t<u32> result = GenerateFnId(func_name);
|
const be_t<u32> result = GenerateFnId(func_name);
|
||||||
m_func_name.AddCpy(func_name);
|
m_func_name.push_back(func_name);
|
||||||
m_func_id.AddCpy(result);
|
m_func_id.push_back(result);
|
||||||
|
|
||||||
ConLog.Write("Function: %s, Id: 0x%08x ", func_name.c_str(), result);
|
ConLog.Write("Function: %s, Id: 0x%08x ", func_name.c_str(), result);
|
||||||
UpdateInformation();
|
UpdateInformation();
|
||||||
|
|
@ -93,9 +92,9 @@ void FnIdGenerator::UpdateInformation()
|
||||||
{
|
{
|
||||||
m_list->DeleteAllItems();
|
m_list->DeleteAllItems();
|
||||||
|
|
||||||
for(u32 i = 0; i < m_func_name.GetCount(); i++)
|
for(u32 i = 0; i < m_func_name.size(); i++)
|
||||||
{
|
{
|
||||||
m_list->InsertItem(m_func_name.GetCount(), wxEmptyString);
|
m_list->InsertItem(m_func_name.size(), wxEmptyString);
|
||||||
m_list->SetItem(i, 0, m_func_name[i]);
|
m_list->SetItem(i, 0, m_func_name[i]);
|
||||||
m_list->SetItem(i, 1, wxString::Format("0x%08x", re(m_func_id[i])));
|
m_list->SetItem(i, 1, wxString::Format("0x%08x", re(m_func_id[i])));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,8 @@
|
||||||
class FnIdGenerator : public wxDialog
|
class FnIdGenerator : public wxDialog
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
Array<std::string> m_func_name;
|
std::vector<std::string> m_func_name;
|
||||||
Array<u32> m_func_id;
|
std::vector<u32> m_func_id;
|
||||||
wxListView* m_list;
|
wxListView* m_list;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
|
||||||
|
|
@ -28,40 +28,40 @@ struct Column
|
||||||
|
|
||||||
struct ColumnsArr
|
struct ColumnsArr
|
||||||
{
|
{
|
||||||
ArrayF<Column> m_columns;
|
std::vector<Column> m_columns;
|
||||||
|
|
||||||
ColumnsArr()
|
ColumnsArr()
|
||||||
{
|
{
|
||||||
Init();
|
Init();
|
||||||
}
|
}
|
||||||
|
|
||||||
ArrayF<Column>* GetSortedColumnsByPos()
|
std::vector<Column*> GetSortedColumnsByPos()
|
||||||
{
|
{
|
||||||
static ArrayF<Column>& arr = *new ArrayF<Column>(); arr.ClearF();
|
std::vector<Column*> arr;
|
||||||
for(u32 pos=0; pos<m_columns.GetCount(); pos++)
|
for(u32 pos=0; pos<m_columns.size(); pos++)
|
||||||
{
|
{
|
||||||
for(u32 c=0; c<m_columns.GetCount(); ++c)
|
for(u32 c=0; c<m_columns.size(); ++c)
|
||||||
{
|
{
|
||||||
if(m_columns[c].pos != pos) continue;
|
if(m_columns[c].pos != pos) continue;
|
||||||
arr.Add(m_columns[c]);
|
arr.push_back(&m_columns[c]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return &arr;
|
return arr;
|
||||||
}
|
}
|
||||||
|
|
||||||
Column* GetColumnByPos(u32 pos)
|
Column* GetColumnByPos(u32 pos)
|
||||||
{
|
{
|
||||||
ArrayF<Column>& columns = *GetSortedColumnsByPos();
|
std::vector<Column *> columns = GetSortedColumnsByPos();
|
||||||
for(u32 c=0; c<columns.GetCount(); ++c)
|
for(u32 c=0; c<columns.size(); ++c)
|
||||||
{
|
{
|
||||||
if(!columns[c].shown)
|
if(!columns[c]->shown)
|
||||||
{
|
{
|
||||||
pos++;
|
pos++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if(columns[c].pos != pos) continue;
|
if(columns[c]->pos != pos) continue;
|
||||||
return &columns[c];
|
return columns[c];
|
||||||
}
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
@ -77,16 +77,19 @@ public:
|
||||||
|
|
||||||
void Init()
|
void Init()
|
||||||
{
|
{
|
||||||
m_columns.Clear();
|
m_columns.clear();
|
||||||
|
m_columns.emplace_back(m_columns.size(), 160, "Name");
|
||||||
#define ADD_COLUMN(x, w, n) x = new Column(m_columns.GetCount(), w, n); m_columns.Add(x);
|
m_columns.emplace_back(m_columns.size(), 85, "Serial");
|
||||||
ADD_COLUMN(m_col_name, 160, "Name");
|
m_columns.emplace_back(m_columns.size(), 55, "FW");
|
||||||
ADD_COLUMN(m_col_serial, 85, "Serial");
|
m_columns.emplace_back(m_columns.size(), 55, "App version");
|
||||||
ADD_COLUMN(m_col_fw, 55, "FW");
|
m_columns.emplace_back(m_columns.size(), 55, "Category");
|
||||||
ADD_COLUMN(m_col_app_ver, 55, "App version");
|
m_columns.emplace_back(m_columns.size(), 160, "Path");
|
||||||
ADD_COLUMN(m_col_category, 55, "Category");
|
m_col_name = &m_columns[0];
|
||||||
ADD_COLUMN(m_col_path, 160, "Path");
|
m_col_serial = &m_columns[1];
|
||||||
#undef ADD_COLUMN
|
m_col_fw = &m_columns[2];
|
||||||
|
m_col_app_ver = &m_columns[3];
|
||||||
|
m_col_category = &m_columns[4];
|
||||||
|
m_col_path = &m_columns[5];
|
||||||
}
|
}
|
||||||
|
|
||||||
void Update(std::vector<GameInfo>& game_data)
|
void Update(std::vector<GameInfo>& game_data)
|
||||||
|
|
@ -98,7 +101,7 @@ public:
|
||||||
m_col_category->data.clear();
|
m_col_category->data.clear();
|
||||||
m_col_path->data.clear();
|
m_col_path->data.clear();
|
||||||
|
|
||||||
if(m_columns.GetCount() == 0) return;
|
if(m_columns.size() == 0) return;
|
||||||
|
|
||||||
for(const auto& game : game_data)
|
for(const auto& game : game_data)
|
||||||
{
|
{
|
||||||
|
|
@ -114,11 +117,11 @@ public:
|
||||||
void Show(wxListView* list)
|
void Show(wxListView* list)
|
||||||
{
|
{
|
||||||
list->DeleteAllColumns();
|
list->DeleteAllColumns();
|
||||||
ArrayF<Column>& c_col = *GetSortedColumnsByPos();
|
std::vector<Column *> c_col = GetSortedColumnsByPos();
|
||||||
for(u32 i=0, c=0; i<c_col.GetCount(); ++i)
|
for(u32 i=0, c=0; i<c_col.size(); ++i)
|
||||||
{
|
{
|
||||||
if(!c_col[i].shown) continue;
|
if(!c_col[i]->shown) continue;
|
||||||
list->InsertColumn(c++, fmt::FromUTF8(c_col[i].name), 0, c_col[i].width);
|
list->InsertColumn(c++, fmt::FromUTF8(c_col[i]->name), 0, c_col[i]->width);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -167,7 +170,7 @@ public:
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
for(u32 i=0; i<m_columns.GetCount(); ++i)
|
for(u32 i=0; i<m_columns.size(); ++i)
|
||||||
{
|
{
|
||||||
ADD_COLUMN(pos, m_columns[i].def_pos, int, "position", 1);
|
ADD_COLUMN(pos, m_columns[i].def_pos, int, "position", 1);
|
||||||
ADD_COLUMN(width, m_columns[i].def_width, int, "width", 1);
|
ADD_COLUMN(width, m_columns[i].def_width, int, "width", 1);
|
||||||
|
|
@ -177,9 +180,9 @@ public:
|
||||||
if(isLoad)
|
if(isLoad)
|
||||||
{
|
{
|
||||||
//check for errors
|
//check for errors
|
||||||
for(u32 c1=0; c1<m_columns.GetCount(); ++c1)
|
for(u32 c1=0; c1<m_columns.size(); ++c1)
|
||||||
{
|
{
|
||||||
for(u32 c2=c1+1; c2<m_columns.GetCount(); ++c2)
|
for(u32 c2=c1+1; c2<m_columns.size(); ++c2)
|
||||||
{
|
{
|
||||||
if(m_columns[c1].pos == m_columns[c2].pos)
|
if(m_columns[c1].pos == m_columns[c2].pos)
|
||||||
{
|
{
|
||||||
|
|
@ -190,10 +193,10 @@ public:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for(u32 p=0; p<m_columns.GetCount(); ++p)
|
for(u32 p=0; p<m_columns.size(); ++p)
|
||||||
{
|
{
|
||||||
bool ishas = false;
|
bool ishas = false;
|
||||||
for(u32 c=0; c<m_columns.GetCount(); ++c)
|
for(u32 c=0; c<m_columns.size(); ++c)
|
||||||
{
|
{
|
||||||
if(m_columns[c].pos != p) continue;
|
if(m_columns[c].pos != p) continue;
|
||||||
ishas = true;
|
ishas = true;
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue