RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-06 15:05:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

cpu_init removed

Browse source
This commit is contained in:
Nekotekina 2016-08-13 17:58:19 +03:00
parent 949200cd3e
commit 5e0489dcc0
10 changed files with 34 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

42
rpcs3/Emu/PSP2/ARMv7Thread.cpp
View file

@ -17,7 +17,8 @@ std::string ARMv7Thread::get_name() const
std::string ARMv7Thread::dump() const
{
std::string result = "Registers:\n=========\n";
std::string result = cpu_thread::dump();
result += "Registers:\n=========\n";
for(int i=0; i<15; ++i)
{
result += fmt::format("r%u\t= 0x%08x\n", i, GPR[i]);
@ -34,33 +35,6 @@ std::string ARMv7Thread::dump() const
return result;
}
void ARMv7Thread::cpu_init()
{
if (!stack_addr)
{
if (!stack_size)
{
fmt::throw_exception("Invalid stack size" HERE);
}
stack_addr = vm::alloc(stack_size, vm::main);
if (!stack_addr)
{
fmt::throw_exception("Out of stack memory" HERE);
}
}
memset(GPR, 0, sizeof(GPR));
APSR.APSR = 0;
IPSR.IPSR = 0;
ISET = PC & 1 ? Thumb : ARM; // select instruction set
PC = PC & ~1; // and fix PC
ITSTATE.IT = 0;
SP = stack_addr + stack_size;
TLS = 0;
}
extern thread_local std::string(*g_tls_log_prefix)();
void ARMv7Thread::cpu_task()
@ -119,10 +93,20 @@ ARMv7Thread::~ARMv7Thread()
}
}
ARMv7Thread::ARMv7Thread(const std::string& name)
ARMv7Thread::ARMv7Thread(const std::string& name, u32 prio, u32 stack)
: cpu_thread()
, m_name(name)
, prio(prio)
, stack_addr(vm::alloc(stack, vm::main))
, stack_size(stack)
{
verify(__func__), stack_size, stack_addr;
std::memset(GPR, 0, sizeof(GPR));
APSR.APSR = 0;
IPSR.IPSR = 0;
ITSTATE.IT = 0;
SP = stack_addr + stack_size;
}
void ARMv7Thread::fast_call(u32 addr)