mirror of https://github.com/RPCS3/rpcs3.git
.ToLE() changed to .value() or removed
This commit is contained in:
parent
8df825abc5
commit
bf7cf0ee9d
|
@ -556,7 +556,6 @@ private:
|
||||||
return m_data;
|
return m_data;
|
||||||
}
|
}
|
||||||
|
|
||||||
public:
|
|
||||||
type ToLE() const
|
type ToLE() const
|
||||||
{
|
{
|
||||||
return se_t<type, sizeof(T2)>::from_be(m_data);
|
return se_t<type, sizeof(T2)>::from_be(m_data);
|
||||||
|
@ -572,6 +571,7 @@ public:
|
||||||
m_data = se_t<type, sizeof(T2)>::to_be(value);
|
m_data = se_t<type, sizeof(T2)>::to_be(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public:
|
||||||
static be_t MakeFromLE(const type& value)
|
static be_t MakeFromLE(const type& value)
|
||||||
{
|
{
|
||||||
stype data = se_t<type, sizeof(T2)>::to_be(value);
|
stype data = se_t<type, sizeof(T2)>::to_be(value);
|
||||||
|
|
|
@ -184,7 +184,7 @@ void decode_x64_reg_op(const u8* code, x64_op_t& decoded_op, x64_reg_t& decoded_
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
throw fmt::Format("decode_x64_reg_op(%.16llX): unsupported opcode found (0x%.2X, 0x%.2X, 0x%.2X)", code - decoded_size, op1, code[0], code[1]);
|
throw fmt::Format("decode_x64_reg_op(%.16llXh): unsupported opcode found (0x%.2X, 0x%.2X, 0x%.2X)", code - decoded_size, op1, code[0], code[1]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -198,7 +198,7 @@ void _se_translator(unsigned int u, EXCEPTION_POINTERS* pExp)
|
||||||
if (u == EXCEPTION_ACCESS_VIOLATION && addr64 < 0x100000000ull)
|
if (u == EXCEPTION_ACCESS_VIOLATION && addr64 < 0x100000000ull)
|
||||||
{
|
{
|
||||||
const u32 addr = (u32)addr64;
|
const u32 addr = (u32)addr64;
|
||||||
if (addr >= RAW_SPU_BASE_ADDR && (addr % RAW_SPU_OFFSET) >= RAW_SPU_PROB_OFFSET) // RawSPU MMIO registers
|
if (addr - RAW_SPU_BASE_ADDR < (6 * RAW_SPU_OFFSET) && (addr % RAW_SPU_OFFSET) >= RAW_SPU_PROB_OFFSET) // RawSPU MMIO registers
|
||||||
{
|
{
|
||||||
// one x64 instruction is manually decoded and interpreted
|
// one x64 instruction is manually decoded and interpreted
|
||||||
x64_op_t op;
|
x64_op_t op;
|
||||||
|
@ -267,12 +267,12 @@ void _se_translator(unsigned int u, EXCEPTION_POINTERS* pExp)
|
||||||
// TODO: allow recovering from a page fault as a feature of PS3 virtual memory
|
// TODO: allow recovering from a page fault as a feature of PS3 virtual memory
|
||||||
if (CPUThread* t = GetCurrentCPUThread())
|
if (CPUThread* t = GetCurrentCPUThread())
|
||||||
{
|
{
|
||||||
throw fmt::Format("Access violation %s location 0x%x (is_alive=%d, last_syscall=0x%llx (%s))", is_writing ? "writing" : "reading", (u32)addr,
|
throw fmt::Format("Access violation %s location 0x%x (is_alive=%d, last_syscall=0x%llx (%s))", is_writing ? "writing" : "reading", addr,
|
||||||
t->IsAlive() ? 1 : 0, t->m_last_syscall, SysCalls::GetHLEFuncName((u32)t->m_last_syscall).c_str());
|
t->IsAlive() ? 1 : 0, t->m_last_syscall, SysCalls::GetHLEFuncName((u32)t->m_last_syscall).c_str());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
throw fmt::Format("Access violation %s location 0x%x", is_writing ? "writing" : "reading", (u32)addr);
|
throw fmt::Format("Access violation %s location 0x%x", is_writing ? "writing" : "reading", addr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -296,7 +296,7 @@ void signal_handler(int sig, siginfo_t* info, void* uct)
|
||||||
if (addr64 < 0x100000000ull)
|
if (addr64 < 0x100000000ull)
|
||||||
{
|
{
|
||||||
const u32 addr = (u32)addr64;
|
const u32 addr = (u32)addr64;
|
||||||
if (addr >= RAW_SPU_BASE_ADDR && (addr % RAW_SPU_OFFSET) >= RAW_SPU_PROB_OFFSET) // RawSPU MMIO registers
|
if (addr - RAW_SPU_BASE_ADDR < (6 * RAW_SPU_OFFSET) && (addr % RAW_SPU_OFFSET) >= RAW_SPU_PROB_OFFSET) // RawSPU MMIO registers
|
||||||
{
|
{
|
||||||
// one x64 instruction is manually decoded and interpreted
|
// one x64 instruction is manually decoded and interpreted
|
||||||
x64_op_t op;
|
x64_op_t op;
|
||||||
|
@ -365,12 +365,12 @@ void signal_handler(int sig, siginfo_t* info, void* uct)
|
||||||
// TODO: allow recovering from a page fault as a feature of PS3 virtual memory
|
// TODO: allow recovering from a page fault as a feature of PS3 virtual memory
|
||||||
if (CPUThread* t = GetCurrentCPUThread())
|
if (CPUThread* t = GetCurrentCPUThread())
|
||||||
{
|
{
|
||||||
throw fmt::Format("Access violation %s location 0x%x (is_alive=%d, last_syscall=0x%llx (%s))", /*is_writing ? "writing" : "reading"*/ "at", (u32)addr,
|
throw fmt::Format("Access violation %s location 0x%x (is_alive=%d, last_syscall=0x%llx (%s))", /*is_writing ? "writing" : "reading"*/ "at", addr,
|
||||||
t->IsAlive() ? 1 : 0, t->m_last_syscall, SysCalls::GetHLEFuncName((u32)t->m_last_syscall).c_str());
|
t->IsAlive() ? 1 : 0, t->m_last_syscall, SysCalls::GetHLEFuncName((u32)t->m_last_syscall).c_str());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
throw fmt::Format("Access violation %s location 0x%x", /*is_writing ? "writing" : "reading"*/ "at", (u32)addr);
|
throw fmt::Format("Access violation %s location 0x%x", /*is_writing ? "writing" : "reading"*/ "at", addr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -67,5 +67,5 @@ public:
|
||||||
void WriteHeader();
|
void WriteHeader();
|
||||||
size_t WriteData(const void* buffer, size_t size);
|
size_t WriteData(const void* buffer, size_t size);
|
||||||
void Finalize();
|
void Finalize();
|
||||||
const u8 GetCh() const { return (u8)m_header.FMT.NumChannels; }
|
const u16 GetCh() const { return m_header.FMT.NumChannels; }
|
||||||
};
|
};
|
||||||
|
|
|
@ -3263,7 +3263,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
CPU.FPR[frd] = vm::get_ref<be_t<float>>((u32)addr).ToLE();
|
CPU.FPR[frd] = vm::get_ref<be_t<float>>((u32)addr).value();
|
||||||
}
|
}
|
||||||
void SRW(u32 ra, u32 rs, u32 rb, bool rc)
|
void SRW(u32 ra, u32 rs, u32 rb, bool rc)
|
||||||
{
|
{
|
||||||
|
@ -3342,8 +3342,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
(u64&)CPU.FPR[frd] = vm::read32((u32)addr);
|
CPU.FPR[frd] = vm::get_ref<be_t<float>>((u32)addr).value();
|
||||||
CPU.FPR[frd] = (float&)CPU.FPR[frd];
|
|
||||||
CPU.GPR[ra] = addr;
|
CPU.GPR[ra] = addr;
|
||||||
}
|
}
|
||||||
void SYNC(u32 l)
|
void SYNC(u32 l)
|
||||||
|
@ -3359,7 +3358,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
(u64&)CPU.FPR[frd] = vm::read64((u32)addr);
|
CPU.FPR[frd] = vm::get_ref<be_t<double>>((u32)addr).value();
|
||||||
}
|
}
|
||||||
void LFDUX(u32 frd, u32 ra, u32 rb)
|
void LFDUX(u32 frd, u32 ra, u32 rb)
|
||||||
{
|
{
|
||||||
|
@ -3370,7 +3369,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
(u64&)CPU.FPR[frd] = vm::read64((u32)addr);
|
CPU.FPR[frd] = vm::get_ref<be_t<double>>((u32)addr).value();
|
||||||
CPU.GPR[ra] = addr;
|
CPU.GPR[ra] = addr;
|
||||||
}
|
}
|
||||||
void STVLX(u32 vs, u32 ra, u32 rb)
|
void STVLX(u32 vs, u32 ra, u32 rb)
|
||||||
|
@ -3410,7 +3409,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
vm::write32((u32)addr, CPU.FPR[frs].To32());
|
vm::get_ref<be_t<float>>((u32)addr) = (float)CPU.FPR[frs];
|
||||||
}
|
}
|
||||||
void STVRX(u32 vs, u32 ra, u32 rb)
|
void STVRX(u32 vs, u32 ra, u32 rb)
|
||||||
{
|
{
|
||||||
|
@ -3434,7 +3433,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
vm::write32((u32)addr, CPU.FPR[frs].To32());
|
vm::get_ref<be_t<float>>((u32)addr) = (float)CPU.FPR[frs];
|
||||||
CPU.GPR[ra] = addr;
|
CPU.GPR[ra] = addr;
|
||||||
}
|
}
|
||||||
void STSWI(u32 rd, u32 ra, u32 nb)
|
void STSWI(u32 rd, u32 ra, u32 nb)
|
||||||
|
@ -3480,7 +3479,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
vm::write64((u32)addr, (u64&)CPU.FPR[frs]);
|
vm::get_ref<be_t<double>>((u32)addr) = CPU.FPR[frs];
|
||||||
}
|
}
|
||||||
void STFDUX(u32 frs, u32 ra, u32 rb)
|
void STFDUX(u32 frs, u32 ra, u32 rb)
|
||||||
{
|
{
|
||||||
|
@ -3491,7 +3490,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
vm::write64((u32)addr, (u64&)CPU.FPR[frs]);
|
vm::get_ref<be_t<double>>((u32)addr) = CPU.FPR[frs];
|
||||||
CPU.GPR[ra] = addr;
|
CPU.GPR[ra] = addr;
|
||||||
}
|
}
|
||||||
void LVLXL(u32 vd, u32 ra, u32 rb)
|
void LVLXL(u32 vd, u32 ra, u32 rb)
|
||||||
|
@ -3873,8 +3872,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const u32 v = vm::read32((u32)addr);
|
CPU.FPR[frd] = vm::get_ref<be_t<float>>((u32)addr).value();
|
||||||
CPU.FPR[frd] = (float&)v;
|
|
||||||
}
|
}
|
||||||
void LFSU(u32 frd, u32 ra, s32 ds)
|
void LFSU(u32 frd, u32 ra, s32 ds)
|
||||||
{
|
{
|
||||||
|
@ -3885,8 +3883,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const u32 v = vm::read32((u32)addr);
|
CPU.FPR[frd] = vm::get_ref<be_t<float>>((u32)addr).value();
|
||||||
CPU.FPR[frd] = (float&)v;
|
|
||||||
CPU.GPR[ra] = addr;
|
CPU.GPR[ra] = addr;
|
||||||
}
|
}
|
||||||
void LFD(u32 frd, u32 ra, s32 d)
|
void LFD(u32 frd, u32 ra, s32 d)
|
||||||
|
@ -3898,7 +3895,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
(u64&)CPU.FPR[frd] = vm::read64((u32)addr);
|
CPU.FPR[frd] = vm::get_ref<be_t<double>>((u32)addr).value();
|
||||||
}
|
}
|
||||||
void LFDU(u32 frd, u32 ra, s32 ds)
|
void LFDU(u32 frd, u32 ra, s32 ds)
|
||||||
{
|
{
|
||||||
|
@ -3909,7 +3906,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
(u64&)CPU.FPR[frd] = vm::read64((u32)addr);
|
CPU.FPR[frd] = vm::get_ref<be_t<double>>((u32)addr).value();
|
||||||
CPU.GPR[ra] = addr;
|
CPU.GPR[ra] = addr;
|
||||||
}
|
}
|
||||||
void STFS(u32 frs, u32 ra, s32 d)
|
void STFS(u32 frs, u32 ra, s32 d)
|
||||||
|
@ -3921,7 +3918,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
vm::write32((u32)addr, CPU.FPR[frs].To32());
|
vm::get_ref<be_t<float>>((u32)addr) = (float)CPU.FPR[frs];
|
||||||
}
|
}
|
||||||
void STFSU(u32 frs, u32 ra, s32 d)
|
void STFSU(u32 frs, u32 ra, s32 d)
|
||||||
{
|
{
|
||||||
|
@ -3932,7 +3929,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
vm::write32((u32)addr, CPU.FPR[frs].To32());
|
vm::get_ref<be_t<float>>((u32)addr) = (float)CPU.FPR[frs];
|
||||||
CPU.GPR[ra] = addr;
|
CPU.GPR[ra] = addr;
|
||||||
}
|
}
|
||||||
void STFD(u32 frs, u32 ra, s32 d)
|
void STFD(u32 frs, u32 ra, s32 d)
|
||||||
|
@ -3944,7 +3941,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
vm::write64((u32)addr, (u64&)CPU.FPR[frs]);
|
vm::get_ref<be_t<double>>((u32)addr) = CPU.FPR[frs];
|
||||||
}
|
}
|
||||||
void STFDU(u32 frs, u32 ra, s32 d)
|
void STFDU(u32 frs, u32 ra, s32 d)
|
||||||
{
|
{
|
||||||
|
@ -3955,7 +3952,7 @@ private:
|
||||||
Emu.Pause();
|
Emu.Pause();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
vm::write64((u32)addr, (u64&)CPU.FPR[frs]);
|
vm::get_ref<be_t<double>>((u32)addr) = CPU.FPR[frs];
|
||||||
CPU.GPR[ra] = addr;
|
CPU.GPR[ra] = addr;
|
||||||
}
|
}
|
||||||
void LD(u32 rd, u32 ra, s32 ds)
|
void LD(u32 rd, u32 ra, s32 ds)
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include "Emu/SysCalls/CB_FUNC.h"
|
#include "Emu/SysCalls/CB_FUNC.h"
|
||||||
#include "Emu/SysCalls/lv2/sys_time.h"
|
#include "Emu/SysCalls/lv2/sys_time.h"
|
||||||
|
|
||||||
#define ARGS(x) (x >= count ? OutOfArgsCount(x, cmd, count, args.addr()) : args[x].ToLE())
|
#define ARGS(x) (x >= count ? OutOfArgsCount(x, cmd, count, args.addr()) : args[x].value())
|
||||||
#define CMD_DEBUG 0
|
#define CMD_DEBUG 0
|
||||||
|
|
||||||
u32 methodRegisters[0xffff];
|
u32 methodRegisters[0xffff];
|
||||||
|
|
|
@ -617,7 +617,7 @@ int cellAdecStartSeq(u32 handle, u32 param_addr)
|
||||||
{
|
{
|
||||||
auto param = vm::ptr<const CellAdecParamMP3>::make(param_addr);
|
auto param = vm::ptr<const CellAdecParamMP3>::make(param_addr);
|
||||||
|
|
||||||
cellAdec->Todo("*** CellAdecParamMP3: bw_pcm=%d", param->bw_pcm.ToLE());
|
cellAdec->Todo("*** CellAdecParamMP3: bw_pcm=%d", param->bw_pcm);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -356,7 +356,7 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (code.ToLE())
|
switch (code)
|
||||||
{
|
{
|
||||||
case PACK_START_CODE:
|
case PACK_START_CODE:
|
||||||
{
|
{
|
||||||
|
@ -387,9 +387,9 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
|
||||||
stream.skip(4);
|
stream.skip(4);
|
||||||
stream.get(len);
|
stream.get(len);
|
||||||
|
|
||||||
if (!stream.check(len.ToLE()))
|
if (!stream.check(len))
|
||||||
{
|
{
|
||||||
DMUX_ERROR("End of stream (PADDING_STREAM, len=%d)", len.ToLE());
|
DMUX_ERROR("End of stream (PADDING_STREAM, len=%d)", len);
|
||||||
}
|
}
|
||||||
stream.skip(len);
|
stream.skip(len);
|
||||||
break;
|
break;
|
||||||
|
@ -404,11 +404,11 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
|
||||||
stream.skip(4);
|
stream.skip(4);
|
||||||
stream.get(len);
|
stream.get(len);
|
||||||
|
|
||||||
cellDmux->Notice("PRIVATE_STREAM_2 (%d)", len.ToLE());
|
cellDmux->Notice("PRIVATE_STREAM_2 (%d)", len);
|
||||||
|
|
||||||
if (!stream.check(len.ToLE()))
|
if (!stream.check(len))
|
||||||
{
|
{
|
||||||
DMUX_ERROR("End of stream (PRIVATE_STREAM_2, len=%d)", len.ToLE());
|
DMUX_ERROR("End of stream (PRIVATE_STREAM_2, len=%d)", len);
|
||||||
}
|
}
|
||||||
stream.skip(len);
|
stream.skip(len);
|
||||||
break;
|
break;
|
||||||
|
@ -426,20 +426,20 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
|
||||||
stream.skip(4);
|
stream.skip(4);
|
||||||
stream.get(len);
|
stream.get(len);
|
||||||
|
|
||||||
if (!stream.check(len.ToLE()))
|
if (!stream.check(len))
|
||||||
{
|
{
|
||||||
DMUX_ERROR("End of stream (PRIVATE_STREAM_1, len=%d)", len.ToLE());
|
DMUX_ERROR("End of stream (PRIVATE_STREAM_1, len=%d)", len);
|
||||||
}
|
}
|
||||||
|
|
||||||
const PesHeader pes(stream);
|
const PesHeader pes(stream);
|
||||||
if (!pes.is_ok)
|
if (!pes.is_ok)
|
||||||
{
|
{
|
||||||
DMUX_ERROR("PesHeader error (PRIVATE_STREAM_1, len=%d)", len.ToLE());
|
DMUX_ERROR("PesHeader error (PRIVATE_STREAM_1, len=%d)", len);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (len < pes.size + 4)
|
if (len < pes.size + 4)
|
||||||
{
|
{
|
||||||
DMUX_ERROR("End of block (PRIVATE_STREAM_1, PesHeader + fid_minor, len=%d)", len.ToLE());
|
DMUX_ERROR("End of block (PRIVATE_STREAM_1, PesHeader + fid_minor, len=%d)", len);
|
||||||
}
|
}
|
||||||
len -= pes.size + 4;
|
len -= pes.size + 4;
|
||||||
|
|
||||||
|
@ -462,7 +462,7 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
|
||||||
|
|
||||||
if (len < 3 || !stream.check(3))
|
if (len < 3 || !stream.check(3))
|
||||||
{
|
{
|
||||||
DMUX_ERROR("End of block (ATX, unknown header, len=%d)", len.ToLE());
|
DMUX_ERROR("End of block (ATX, unknown header, len=%d)", len);
|
||||||
}
|
}
|
||||||
len -= 3;
|
len -= 3;
|
||||||
stream.skip(3);
|
stream.skip(3);
|
||||||
|
@ -484,7 +484,7 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
|
||||||
|
|
||||||
if (data[0] != 0x0f || data[1] != 0xd0)
|
if (data[0] != 0x0f || data[1] != 0xd0)
|
||||||
{
|
{
|
||||||
DMUX_ERROR("ATX: 0x0fd0 header not found (ats=0x%llx)", ((be_t<u64>*)data)->ToLE());
|
DMUX_ERROR("ATX: 0x0fd0 header not found (ats=0x%llx)", *(be_t<u64>*)data);
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 frame_size = ((((u32)data[2] & 0x3) << 8) | (u32)data[3]) * 8 + 8;
|
u32 frame_size = ((((u32)data[2] & 0x3) << 8) | (u32)data[3]) * 8 + 8;
|
||||||
|
@ -495,7 +495,7 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
|
||||||
|
|
||||||
es.push_au(frame_size + 8, es.last_dts, es.last_pts, stream.userdata, false /* TODO: set correct value */, 0);
|
es.push_au(frame_size + 8, es.last_dts, es.last_pts, stream.userdata, false /* TODO: set correct value */, 0);
|
||||||
|
|
||||||
//cellDmux->Notice("ATX AU pushed (ats=0x%llx, frame_size=%d)", ((be_t<u64>*)data)->ToLE(), frame_size);
|
//cellDmux->Notice("ATX AU pushed (ats=0x%llx, frame_size=%d)", *(be_t<u64>*)data, frame_size);
|
||||||
|
|
||||||
auto esMsg = vm::ptr<CellDmuxEsMsg>::make(dmux.memAddr + (cb_add ^= 16));
|
auto esMsg = vm::ptr<CellDmuxEsMsg>::make(dmux.memAddr + (cb_add ^= 16));
|
||||||
esMsg->msgType = CELL_DMUX_ES_MSG_TYPE_AU_FOUND;
|
esMsg->msgType = CELL_DMUX_ES_MSG_TYPE_AU_FOUND;
|
||||||
|
@ -505,7 +505,7 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cellDmux->Notice("PRIVATE_STREAM_1 (len=%d, fid_minor=0x%x)", len.ToLE(), fid_minor);
|
cellDmux->Notice("PRIVATE_STREAM_1 (len=%d, fid_minor=0x%x)", len, fid_minor);
|
||||||
stream.skip(len);
|
stream.skip(len);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -521,29 +521,29 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
|
||||||
|
|
||||||
if (!stream.check(6))
|
if (!stream.check(6))
|
||||||
{
|
{
|
||||||
DMUX_ERROR("End of stream (video, code=0x%x)", code.ToLE());
|
DMUX_ERROR("End of stream (video, code=0x%x)", code);
|
||||||
}
|
}
|
||||||
stream.skip(4);
|
stream.skip(4);
|
||||||
stream.get(len);
|
stream.get(len);
|
||||||
|
|
||||||
if (!stream.check(len.ToLE()))
|
if (!stream.check(len))
|
||||||
{
|
{
|
||||||
DMUX_ERROR("End of stream (video, code=0x%x, len=%d)", code.ToLE(), len.ToLE());
|
DMUX_ERROR("End of stream (video, code=0x%x, len=%d)", code, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
const PesHeader pes(stream);
|
const PesHeader pes(stream);
|
||||||
if (!pes.is_ok)
|
if (!pes.is_ok)
|
||||||
{
|
{
|
||||||
DMUX_ERROR("PesHeader error (video, code=0x%x, len=%d)", code.ToLE(), len.ToLE());
|
DMUX_ERROR("PesHeader error (video, code=0x%x, len=%d)", code, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (len < pes.size + 3)
|
if (len < pes.size + 3)
|
||||||
{
|
{
|
||||||
DMUX_ERROR("End of block (video, code=0x%x, PesHeader)", code.ToLE());
|
DMUX_ERROR("End of block (video, code=0x%x, PesHeader)", code);
|
||||||
}
|
}
|
||||||
len -= pes.size + 3;
|
len -= pes.size + 3;
|
||||||
|
|
||||||
const u32 ch = code.ToLE() % 16;
|
const u32 ch = code % 16;
|
||||||
if (esAVC[ch])
|
if (esAVC[ch])
|
||||||
{
|
{
|
||||||
ElementaryStream& es = *esAVC[ch];
|
ElementaryStream& es = *esAVC[ch];
|
||||||
|
@ -576,13 +576,13 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
|
||||||
}
|
}
|
||||||
|
|
||||||
// reconstruction of MPEG2-PS stream for vdec module
|
// reconstruction of MPEG2-PS stream for vdec module
|
||||||
const u32 size = (u32)len.ToLE() + pes.size + 9;
|
const u32 size = len + pes.size + 9;
|
||||||
stream = backup;
|
stream = backup;
|
||||||
es.push(stream, size);
|
es.push(stream, size);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cellDmux->Notice("Video stream (code=0x%x, len=%d)", code.ToLE(), len.ToLE());
|
cellDmux->Notice("Video stream (code=0x%x, len=%d)", code, len);
|
||||||
stream.skip(len);
|
stream.skip(len);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -590,9 +590,9 @@ u32 dmuxOpen(Demuxer* dmux_ptr)
|
||||||
|
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
if ((code.ToLE() & PACKET_START_CODE_MASK) == PACKET_START_CODE_PREFIX)
|
if ((code & PACKET_START_CODE_MASK) == PACKET_START_CODE_PREFIX)
|
||||||
{
|
{
|
||||||
DMUX_ERROR("Unknown code found (0x%x)", code.ToLE());
|
DMUX_ERROR("Unknown code found (0x%x)", code);
|
||||||
}
|
}
|
||||||
|
|
||||||
// search
|
// search
|
||||||
|
@ -1000,7 +1000,7 @@ int cellDmuxEnableEs(u32 demuxerHandle, vm::ptr<const CellCodecEsFilterId> esFil
|
||||||
*esHandle = id;
|
*esHandle = id;
|
||||||
|
|
||||||
cellDmux->Warning("*** New ES(dmux=%d, addr=0x%x, size=0x%x, filter(0x%x, 0x%x, 0x%x, 0x%x), cb=0x%x(arg=0x%x), spec=0x%x): id = %d",
|
cellDmux->Warning("*** New ES(dmux=%d, addr=0x%x, size=0x%x, filter(0x%x, 0x%x, 0x%x, 0x%x), cb=0x%x(arg=0x%x), spec=0x%x): id = %d",
|
||||||
demuxerHandle, es->memAddr, es->memSize, es->fidMajor, es->fidMinor, es->sup1, es->sup2, esCb->cbEsMsgFunc.addr().ToLE(), es->cbArg, es->spec, id);
|
demuxerHandle, es->memAddr, es->memSize, es->fidMajor, es->fidMinor, es->sup1, es->sup2, esCb->cbEsMsgFunc, es->cbArg, es->spec, id);
|
||||||
|
|
||||||
DemuxerTask task(dmuxEnableEs);
|
DemuxerTask task(dmuxEnableEs);
|
||||||
task.es.es = id;
|
task.es.es = id;
|
||||||
|
|
|
@ -20,7 +20,7 @@ int cellFontInitializeWithRevision(u64 revisionFlags, vm::ptr<CellFontConfig> co
|
||||||
if (config->FileCache.size < 24)
|
if (config->FileCache.size < 24)
|
||||||
return CELL_FONT_ERROR_INVALID_PARAMETER;
|
return CELL_FONT_ERROR_INVALID_PARAMETER;
|
||||||
if (config->flags != 0)
|
if (config->flags != 0)
|
||||||
cellFont->Warning("cellFontInitializeWithRevision: Unknown flags (0x%x)", config->flags.ToLE());
|
cellFont->Warning("cellFontInitializeWithRevision: Unknown flags (0x%x)", config->flags);
|
||||||
|
|
||||||
s_fontInternalInstance->m_buffer_addr = config->FileCache.buffer_addr;
|
s_fontInternalInstance->m_buffer_addr = config->FileCache.buffer_addr;
|
||||||
s_fontInternalInstance->m_buffer_size = config->FileCache.size;
|
s_fontInternalInstance->m_buffer_size = config->FileCache.size;
|
||||||
|
@ -168,12 +168,12 @@ int cellFontOpenFontset(PPUThread& CPU, vm::ptr<CellFontLibrary> library, vm::pt
|
||||||
case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_YG_DFHEI5_RSANS2_SET:
|
case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_YG_DFHEI5_RSANS2_SET:
|
||||||
case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_YG_DFHEI5_VAGR2_SET:
|
case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_YG_DFHEI5_VAGR2_SET:
|
||||||
case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_VAGR2_SET:
|
case CELL_FONT_TYPE_SEURAT_CAPIE_MARU_GOTHIC_VAGR2_SET:
|
||||||
cellFont->Warning("cellFontOpenFontset: fontType->type = %d not supported yet. RD-R-LATIN.TTF will be used instead.", fontType->type.ToLE());
|
cellFont->Warning("cellFontOpenFontset: fontType->type = %d not supported yet. RD-R-LATIN.TTF will be used instead.", fontType->type);
|
||||||
file = "/dev_flash/data/font/SCE-PS3-RD-R-LATIN.TTF";
|
file = "/dev_flash/data/font/SCE-PS3-RD-R-LATIN.TTF";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
cellFont->Warning("cellFontOpenFontset: fontType->type = %d not supported.", fontType->type.ToLE());
|
cellFont->Warning("cellFontOpenFontset: fontType->type = %d not supported.", fontType->type);
|
||||||
return CELL_FONT_ERROR_NO_SUPPORT_FONTSET;
|
return CELL_FONT_ERROR_NO_SUPPORT_FONTSET;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -272,7 +272,7 @@ int cellGameDataCheckCreate2(PPUThread& CPU, u32 version, vm::ptr<const char> di
|
||||||
if (cbSet->setParam)
|
if (cbSet->setParam)
|
||||||
{
|
{
|
||||||
// TODO: write PARAM.SFO from cbSet
|
// TODO: write PARAM.SFO from cbSet
|
||||||
cellGame->Todo("cellGameDataCheckCreate(2)(): writing PARAM.SFO parameters (addr=0x%x)", cbSet->setParam.addr().ToLE());
|
cellGame->Todo("cellGameDataCheckCreate(2)(): writing PARAM.SFO parameters (addr=0x%x)", cbSet->setParam);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch ((s32)cbResult->result)
|
switch ((s32)cbResult->result)
|
||||||
|
|
|
@ -33,14 +33,14 @@ int cellGifDecOpen(u32 mainHandle, vm::ptr<u32> subHandle, vm::ptr<CellGifDecSrc
|
||||||
switch(src->srcSelect.data())
|
switch(src->srcSelect.data())
|
||||||
{
|
{
|
||||||
case se32(CELL_GIFDEC_BUFFER):
|
case se32(CELL_GIFDEC_BUFFER):
|
||||||
current_subHandle->fileSize = src->streamSize.ToLE();
|
current_subHandle->fileSize = src->streamSize;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case se32(CELL_GIFDEC_FILE):
|
case se32(CELL_GIFDEC_FILE):
|
||||||
// Get file descriptor
|
// Get file descriptor
|
||||||
vm::var<be_t<u32>> fd;
|
vm::var<be_t<u32>> fd;
|
||||||
int ret = cellFsOpen(vm::ptr<const char>::make(src->fileName.addr()), 0, fd, vm::ptr<u32>::make(0), 0);
|
int ret = cellFsOpen(vm::ptr<const char>::make(src->fileName.addr()), 0, fd, vm::ptr<u32>::make(0), 0);
|
||||||
current_subHandle->fd = fd->ToLE();
|
current_subHandle->fd = fd.value();
|
||||||
if (ret != CELL_OK) return CELL_GIFDEC_ERROR_OPEN_FILE;
|
if (ret != CELL_OK) return CELL_GIFDEC_ERROR_OPEN_FILE;
|
||||||
|
|
||||||
// Get size of file
|
// Get size of file
|
||||||
|
|
|
@ -39,14 +39,14 @@ int cellJpgDecOpen(u32 mainHandle, vm::ptr<u32> subHandle, vm::ptr<CellJpgDecSrc
|
||||||
switch(src->srcSelect.data())
|
switch(src->srcSelect.data())
|
||||||
{
|
{
|
||||||
case se32(CELL_JPGDEC_BUFFER):
|
case se32(CELL_JPGDEC_BUFFER):
|
||||||
current_subHandle->fileSize = src->streamSize.ToLE();
|
current_subHandle->fileSize = src->streamSize;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case se32(CELL_JPGDEC_FILE):
|
case se32(CELL_JPGDEC_FILE):
|
||||||
// Get file descriptor
|
// Get file descriptor
|
||||||
vm::var<be_t<u32>> fd;
|
vm::var<be_t<u32>> fd;
|
||||||
int ret = cellFsOpen(vm::ptr<const char>::make(src->fileName.addr()), 0, fd, vm::ptr<u32>::make(0), 0);
|
int ret = cellFsOpen(vm::ptr<const char>::make(src->fileName.addr()), 0, fd, vm::ptr<u32>::make(0), 0);
|
||||||
current_subHandle->fd = fd->ToLE();
|
current_subHandle->fd = fd.value();
|
||||||
if (ret != CELL_OK) return CELL_JPGDEC_ERROR_OPEN_FILE;
|
if (ret != CELL_OK) return CELL_JPGDEC_ERROR_OPEN_FILE;
|
||||||
|
|
||||||
// Get size of file
|
// Get size of file
|
||||||
|
@ -261,7 +261,7 @@ int cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr<u8> data, vm::pt
|
||||||
case CELL_JPG_UPSAMPLE_ONLY:
|
case CELL_JPG_UPSAMPLE_ONLY:
|
||||||
case CELL_JPG_GRAYSCALE_TO_ALPHA_RGBA:
|
case CELL_JPG_GRAYSCALE_TO_ALPHA_RGBA:
|
||||||
case CELL_JPG_GRAYSCALE_TO_ALPHA_ARGB:
|
case CELL_JPG_GRAYSCALE_TO_ALPHA_ARGB:
|
||||||
cellJpgDec->Error("cellJpgDecDecodeData: Unsupported color space (%d)", current_outParam.outputColorSpace.ToLE());
|
cellJpgDec->Error("cellJpgDecDecodeData: Unsupported color space (%d)", current_outParam.outputColorSpace);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -80,14 +80,14 @@ s64 pngDecOpen(
|
||||||
switch (src->srcSelect.data())
|
switch (src->srcSelect.data())
|
||||||
{
|
{
|
||||||
case se32(CELL_PNGDEC_BUFFER):
|
case se32(CELL_PNGDEC_BUFFER):
|
||||||
stream->fileSize = src->streamSize.ToLE();
|
stream->fileSize = src->streamSize;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case se32(CELL_PNGDEC_FILE):
|
case se32(CELL_PNGDEC_FILE):
|
||||||
// Get file descriptor
|
// Get file descriptor
|
||||||
vm::var<be_t<u32>> fd;
|
vm::var<be_t<u32>> fd;
|
||||||
int ret = cellFsOpen(vm::ptr<const char>::make(src->fileName.addr()), 0, fd, vm::ptr<u32>::make(0), 0);
|
int ret = cellFsOpen(vm::ptr<const char>::make(src->fileName.addr()), 0, fd, vm::ptr<u32>::make(0), 0);
|
||||||
stream->fd = fd->ToLE();
|
stream->fd = fd.value();
|
||||||
if (ret != CELL_OK) return CELL_PNGDEC_ERROR_OPEN_FILE;
|
if (ret != CELL_OK) return CELL_PNGDEC_ERROR_OPEN_FILE;
|
||||||
|
|
||||||
// Get size of file
|
// Get size of file
|
||||||
|
@ -223,7 +223,7 @@ s64 pngDecSetParameter(
|
||||||
current_outParam.outputComponents = 4; break;
|
current_outParam.outputComponents = 4; break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
cellPngDec->Error("pngDecSetParameter: Unsupported color space (%d)", current_outParam.outputColorSpace.ToLE());
|
cellPngDec->Error("pngDecSetParameter: Unsupported color space (%d)", current_outParam.outputColorSpace);
|
||||||
return CELL_PNGDEC_ERROR_ARG;
|
return CELL_PNGDEC_ERROR_ARG;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -352,11 +352,11 @@ s64 pngDecodeData(
|
||||||
case se32(CELL_PNGDEC_GRAYSCALE):
|
case se32(CELL_PNGDEC_GRAYSCALE):
|
||||||
case se32(CELL_PNGDEC_PALETTE):
|
case se32(CELL_PNGDEC_PALETTE):
|
||||||
case se32(CELL_PNGDEC_GRAYSCALE_ALPHA):
|
case se32(CELL_PNGDEC_GRAYSCALE_ALPHA):
|
||||||
cellPngDec->Error("pngDecodeData: Unsupported color space (%d)", current_outParam.outputColorSpace.ToLE());
|
cellPngDec->Error("pngDecodeData: Unsupported color space (%d)", current_outParam.outputColorSpace);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
cellPngDec->Error("pngDecodeData: Unsupported color space (%d)", current_outParam.outputColorSpace.ToLE());
|
cellPngDec->Error("pngDecodeData: Unsupported color space (%d)", current_outParam.outputColorSpace);
|
||||||
return CELL_PNGDEC_ERROR_ARG;
|
return CELL_PNGDEC_ERROR_ARG;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -970,11 +970,11 @@ int cellRescSetSrc(s32 idx, vm::ptr<CellRescSrc> src)
|
||||||
return CELL_RESC_ERROR_BAD_ARGUMENT;
|
return CELL_RESC_ERROR_BAD_ARGUMENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
cellResc->Log(" *** format=0x%x", src->format.ToLE());
|
cellResc->Log(" *** format=0x%x", src->format);
|
||||||
cellResc->Log(" *** pitch=%d", src->pitch.ToLE());
|
cellResc->Log(" *** pitch=%d", src->pitch);
|
||||||
cellResc->Log(" *** width=%d", src->width.ToLE());
|
cellResc->Log(" *** width=%d", src->width);
|
||||||
cellResc->Log(" *** height=%d", src->height.ToLE());
|
cellResc->Log(" *** height=%d", src->height);
|
||||||
cellResc->Log(" *** offset=0x%x", src->offset.ToLE());
|
cellResc->Log(" *** offset=0x%x", src->offset);
|
||||||
|
|
||||||
s_rescInternalInstance->m_rescSrc[idx] = *src;
|
s_rescInternalInstance->m_rescSrc[idx] = *src;
|
||||||
|
|
||||||
|
@ -1054,7 +1054,7 @@ int cellRescSetBufferAddress(vm::ptr<u32> colorBuffers, vm::ptr<u32> vertexArray
|
||||||
|
|
||||||
for (int i=0; i<GetNumColorBuffers(); i++)
|
for (int i=0; i<GetNumColorBuffers(); i++)
|
||||||
{
|
{
|
||||||
s_rescInternalInstance->m_dstOffsets[i] = dstOffset->ToLE() + i * s_rescInternalInstance->m_dstBufInterval;
|
s_rescInternalInstance->m_dstOffsets[i] = dstOffset.value() + i * s_rescInternalInstance->m_dstBufInterval;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i=0; i<GetNumColorBuffers(); i++)
|
for (int i=0; i<GetNumColorBuffers(); i++)
|
||||||
|
|
|
@ -163,7 +163,7 @@ int cellRtcGetTick(vm::ptr<CellRtcDateTime> pTime, vm::ptr<CellRtcTick> pTick)
|
||||||
{
|
{
|
||||||
cellRtc->Log("cellRtcGetTick(pTime=0x%x, pTick=0x%x)", pTime.addr(), pTick.addr());
|
cellRtc->Log("cellRtcGetTick(pTime=0x%x, pTick=0x%x)", pTime.addr(), pTick.addr());
|
||||||
|
|
||||||
rDateTime datetime = rDateTime(pTime->day, (rDateTime::Month)pTime->month.ToLE(), pTime->year, pTime->hour, pTime->minute, pTime->second, (pTime->microsecond / 1000));
|
rDateTime datetime = rDateTime(pTime->day, (rDateTime::Month)pTime->month.value(), pTime->year, pTime->hour, pTime->minute, pTime->second, (pTime->microsecond / 1000));
|
||||||
pTick->tick = datetime.GetTicks();
|
pTick->tick = datetime.GetTicks();
|
||||||
|
|
||||||
return CELL_OK;
|
return CELL_OK;
|
||||||
|
@ -315,7 +315,7 @@ int cellRtcGetDosTime(vm::ptr<CellRtcDateTime> pDateTime, vm::ptr<u32> puiDosTim
|
||||||
cellRtc->Log("cellRtcGetDosTime(pDateTime=0x%x, puiDosTime=0x%x)", pDateTime.addr(), puiDosTime.addr());
|
cellRtc->Log("cellRtcGetDosTime(pDateTime=0x%x, puiDosTime=0x%x)", pDateTime.addr(), puiDosTime.addr());
|
||||||
|
|
||||||
// Convert to DOS time.
|
// Convert to DOS time.
|
||||||
rDateTime date_time = rDateTime(pDateTime->day, (rDateTime::Month)pDateTime->month.ToLE(), pDateTime->year, pDateTime->hour, pDateTime->minute, pDateTime->second, (pDateTime->microsecond / 1000));
|
rDateTime date_time = rDateTime(pDateTime->day, (rDateTime::Month)pDateTime->month.value(), pDateTime->year, pDateTime->hour, pDateTime->minute, pDateTime->second, (pDateTime->microsecond / 1000));
|
||||||
*puiDosTime = date_time.GetAsDOS();
|
*puiDosTime = date_time.GetAsDOS();
|
||||||
|
|
||||||
return CELL_OK;
|
return CELL_OK;
|
||||||
|
@ -326,7 +326,7 @@ int cellRtcGetTime_t(vm::ptr<CellRtcDateTime> pDateTime, vm::ptr<s64> piTime)
|
||||||
cellRtc->Log("cellRtcGetTime_t(pDateTime=0x%x, piTime=0x%x)", pDateTime.addr(), piTime.addr());
|
cellRtc->Log("cellRtcGetTime_t(pDateTime=0x%x, piTime=0x%x)", pDateTime.addr(), piTime.addr());
|
||||||
|
|
||||||
// Convert to POSIX time_t.
|
// Convert to POSIX time_t.
|
||||||
rDateTime date_time = rDateTime(pDateTime->day, (rDateTime::Month)pDateTime->month.ToLE(), pDateTime->year, pDateTime->hour, pDateTime->minute, pDateTime->second, (pDateTime->microsecond / 1000));
|
rDateTime date_time = rDateTime(pDateTime->day, (rDateTime::Month)pDateTime->month.value(), pDateTime->year, pDateTime->hour, pDateTime->minute, pDateTime->second, (pDateTime->microsecond / 1000));
|
||||||
*piTime = convertToUNIXTime(date_time.GetSecond(rDateTime::TZ::UTC), date_time.GetMinute(rDateTime::TZ::UTC),
|
*piTime = convertToUNIXTime(date_time.GetSecond(rDateTime::TZ::UTC), date_time.GetMinute(rDateTime::TZ::UTC),
|
||||||
date_time.GetHour(rDateTime::TZ::UTC), date_time.GetDay(rDateTime::TZ::UTC), date_time.GetYear(rDateTime::TZ::UTC));
|
date_time.GetHour(rDateTime::TZ::UTC), date_time.GetDay(rDateTime::TZ::UTC), date_time.GetYear(rDateTime::TZ::UTC));
|
||||||
|
|
||||||
|
@ -338,7 +338,7 @@ int cellRtcGetWin32FileTime(vm::ptr<CellRtcDateTime> pDateTime, vm::ptr<u64> pul
|
||||||
cellRtc->Log("cellRtcGetWin32FileTime(pDateTime=0x%x, pulWin32FileTime=0x%x)", pDateTime.addr(), pulWin32FileTime.addr());
|
cellRtc->Log("cellRtcGetWin32FileTime(pDateTime=0x%x, pulWin32FileTime=0x%x)", pDateTime.addr(), pulWin32FileTime.addr());
|
||||||
|
|
||||||
// Convert to WIN32 FILETIME.
|
// Convert to WIN32 FILETIME.
|
||||||
rDateTime date_time = rDateTime(pDateTime->day, (rDateTime::Month)pDateTime->month.ToLE(), pDateTime->year, pDateTime->hour, pDateTime->minute, pDateTime->second, (pDateTime->microsecond / 1000));
|
rDateTime date_time = rDateTime(pDateTime->day, (rDateTime::Month)pDateTime->month.value(), pDateTime->year, pDateTime->hour, pDateTime->minute, pDateTime->second, (pDateTime->microsecond / 1000));
|
||||||
*pulWin32FileTime = convertToWin32FILETIME(date_time.GetSecond(rDateTime::TZ::UTC), date_time.GetMinute(rDateTime::TZ::UTC),
|
*pulWin32FileTime = convertToWin32FILETIME(date_time.GetSecond(rDateTime::TZ::UTC), date_time.GetMinute(rDateTime::TZ::UTC),
|
||||||
date_time.GetHour(rDateTime::TZ::UTC), date_time.GetDay(rDateTime::TZ::UTC), date_time.GetYear(rDateTime::TZ::UTC));
|
date_time.GetHour(rDateTime::TZ::UTC), date_time.GetDay(rDateTime::TZ::UTC), date_time.GetYear(rDateTime::TZ::UTC));
|
||||||
|
|
||||||
|
|
|
@ -107,7 +107,7 @@ int cellSailDescriptorCreateDatabase(vm::ptr<CellSailDescriptor> pSelf, vm::ptr<
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
cellSail->Error("Unhandled stream type: %d", pSelf->streamType.ToLE());
|
cellSail->Error("Unhandled stream type: %d", pSelf->streamType);
|
||||||
}
|
}
|
||||||
|
|
||||||
return CELL_OK;
|
return CELL_OK;
|
||||||
|
|
|
@ -32,7 +32,7 @@ s64 spursCreateLv2EventQueue(vm::ptr<CellSpurs> spurs, u32& queue_id, vm::ptr<u8
|
||||||
vm::var<be_t<u32>> queue;
|
vm::var<be_t<u32>> queue;
|
||||||
s32 res = cb_call<s32, vm::ptr<CellSpurs>, vm::ptr<u32>, vm::ptr<u8>, s32, u32>(GetCurrentPPUThread(), libsre + 0xB14C, libsre_rtoc,
|
s32 res = cb_call<s32, vm::ptr<CellSpurs>, vm::ptr<u32>, vm::ptr<u8>, s32, u32>(GetCurrentPPUThread(), libsre + 0xB14C, libsre_rtoc,
|
||||||
spurs, queue, port, size, vm::read32(libsre_rtoc - 0x7E2C));
|
spurs, queue, port, size, vm::read32(libsre_rtoc - 0x7E2C));
|
||||||
queue_id = queue->ToLE();
|
queue_id = queue;
|
||||||
return res;
|
return res;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -763,7 +763,7 @@ s64 cellSpursInitializeWithAttribute(vm::ptr<CellSpurs> spurs, vm::ptr<const Cel
|
||||||
attr->m.nSpus,
|
attr->m.nSpus,
|
||||||
attr->m.spuPriority,
|
attr->m.spuPriority,
|
||||||
attr->m.ppuPriority,
|
attr->m.ppuPriority,
|
||||||
attr->m.flags.ToLE() | (attr->m.exitIfNoWork ? SAF_EXIT_IF_NO_WORK : 0),
|
attr->m.flags | (attr->m.exitIfNoWork ? SAF_EXIT_IF_NO_WORK : 0),
|
||||||
attr->m.prefix,
|
attr->m.prefix,
|
||||||
attr->m.prefixSize,
|
attr->m.prefixSize,
|
||||||
attr->m.container,
|
attr->m.container,
|
||||||
|
@ -799,7 +799,7 @@ s64 cellSpursInitializeWithAttribute2(vm::ptr<CellSpurs> spurs, vm::ptr<const Ce
|
||||||
attr->m.nSpus,
|
attr->m.nSpus,
|
||||||
attr->m.spuPriority,
|
attr->m.spuPriority,
|
||||||
attr->m.ppuPriority,
|
attr->m.ppuPriority,
|
||||||
attr->m.flags.ToLE() | (attr->m.exitIfNoWork ? SAF_EXIT_IF_NO_WORK : 0) | SAF_SECOND_VERSION,
|
attr->m.flags | (attr->m.exitIfNoWork ? SAF_EXIT_IF_NO_WORK : 0) | SAF_SECOND_VERSION,
|
||||||
attr->m.prefix,
|
attr->m.prefix,
|
||||||
attr->m.prefixSize,
|
attr->m.prefixSize,
|
||||||
attr->m.container,
|
attr->m.container,
|
||||||
|
@ -851,7 +851,7 @@ s64 cellSpursAttributeSetMemoryContainerForSpuThread(vm::ptr<CellSpursAttribute>
|
||||||
return CELL_SPURS_CORE_ERROR_ALIGN;
|
return CELL_SPURS_CORE_ERROR_ALIGN;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (attr->m.flags.ToLE() & SAF_SPU_TGT_EXCLUSIVE_NON_CONTEXT)
|
if (attr->m.flags & SAF_SPU_TGT_EXCLUSIVE_NON_CONTEXT)
|
||||||
{
|
{
|
||||||
return CELL_SPURS_CORE_ERROR_STAT;
|
return CELL_SPURS_CORE_ERROR_STAT;
|
||||||
}
|
}
|
||||||
|
@ -925,7 +925,7 @@ s64 cellSpursAttributeSetSpuThreadGroupType(vm::ptr<CellSpursAttribute> attr, s3
|
||||||
|
|
||||||
if (type == SYS_SPU_THREAD_GROUP_TYPE_EXCLUSIVE_NON_CONTEXT)
|
if (type == SYS_SPU_THREAD_GROUP_TYPE_EXCLUSIVE_NON_CONTEXT)
|
||||||
{
|
{
|
||||||
if (attr->m.flags.ToLE() & SAF_SPU_MEMORY_CONTAINER_SET)
|
if (attr->m.flags & SAF_SPU_MEMORY_CONTAINER_SET)
|
||||||
{
|
{
|
||||||
return CELL_SPURS_CORE_ERROR_STAT;
|
return CELL_SPURS_CORE_ERROR_STAT;
|
||||||
}
|
}
|
||||||
|
@ -976,7 +976,7 @@ s64 cellSpursAttributeEnableSystemWorkload(vm::ptr<CellSpursAttribute> attr, vm:
|
||||||
{
|
{
|
||||||
return CELL_SPURS_CORE_ERROR_PERM;
|
return CELL_SPURS_CORE_ERROR_PERM;
|
||||||
}
|
}
|
||||||
if (attr->m.flags.ToLE() & SAF_SYSTEM_WORKLOAD_ENABLED)
|
if (attr->m.flags & SAF_SYSTEM_WORKLOAD_ENABLED)
|
||||||
{
|
{
|
||||||
return CELL_SPURS_CORE_ERROR_BUSY;
|
return CELL_SPURS_CORE_ERROR_BUSY;
|
||||||
}
|
}
|
||||||
|
@ -1442,7 +1442,7 @@ s32 spursAddWorkload(
|
||||||
CellSpurs::_sub_str3& wkl = wnum <= 15 ? spurs->m.wklG1[wnum] : spurs->m.wklG2[wnum & 0xf];
|
CellSpurs::_sub_str3& wkl = wnum <= 15 ? spurs->m.wklG1[wnum] : spurs->m.wklG2[wnum & 0xf];
|
||||||
spurs->m.wklMskB.atomic_op_sync([spurs, &wkl, wnum, &res_wkl](be_t<u32>& v)
|
spurs->m.wklMskB.atomic_op_sync([spurs, &wkl, wnum, &res_wkl](be_t<u32>& v)
|
||||||
{
|
{
|
||||||
const u32 mask = v.ToLE() & ~(0x80000000u >> wnum);
|
const u32 mask = v & ~(0x80000000u >> wnum);
|
||||||
res_wkl = 0;
|
res_wkl = 0;
|
||||||
|
|
||||||
for (u32 i = 0, m = 0x80000000, k = 0; i < 32; i++, m >>= 1)
|
for (u32 i = 0, m = 0x80000000, k = 0; i < 32; i++, m >>= 1)
|
||||||
|
@ -1685,7 +1685,7 @@ s64 _cellSpursWorkloadFlagReceiver(vm::ptr<CellSpurs> spurs, u32 wid, u32 is_set
|
||||||
{
|
{
|
||||||
return CELL_SPURS_POLICY_MODULE_ERROR_INVAL;
|
return CELL_SPURS_POLICY_MODULE_ERROR_INVAL;
|
||||||
}
|
}
|
||||||
if ((spurs->m.wklMskA.read_relaxed().ToLE() & (0x80000000u >> wid)) == 0)
|
if ((spurs->m.wklMskA.read_relaxed() & (0x80000000u >> wid)) == 0)
|
||||||
{
|
{
|
||||||
return CELL_SPURS_POLICY_MODULE_ERROR_SRCH;
|
return CELL_SPURS_POLICY_MODULE_ERROR_SRCH;
|
||||||
}
|
}
|
||||||
|
@ -1797,7 +1797,7 @@ s64 cellSpursReadyCountStore(vm::ptr<CellSpurs> spurs, u32 wid, u32 value)
|
||||||
{
|
{
|
||||||
return CELL_SPURS_POLICY_MODULE_ERROR_INVAL;
|
return CELL_SPURS_POLICY_MODULE_ERROR_INVAL;
|
||||||
}
|
}
|
||||||
if ((spurs->m.wklMskA.read_relaxed().ToLE() & (0x80000000u >> wid)) == 0)
|
if ((spurs->m.wklMskA.read_relaxed() & (0x80000000u >> wid)) == 0)
|
||||||
{
|
{
|
||||||
return CELL_SPURS_POLICY_MODULE_ERROR_SRCH;
|
return CELL_SPURS_POLICY_MODULE_ERROR_SRCH;
|
||||||
}
|
}
|
||||||
|
|
|
@ -940,7 +940,7 @@ s32 syncLFQueueInitialize(vm::ptr<CellSyncLFQueue> queue, vm::ptr<u8> buffer, u3
|
||||||
{
|
{
|
||||||
return CELL_SYNC_ERROR_STAT;
|
return CELL_SYNC_ERROR_STAT;
|
||||||
}
|
}
|
||||||
old_value = old.ToLE();
|
old_value = old;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1314,7 +1314,7 @@ s32 _cellSyncLFQueuePushBody(PPUThread& CPU, vm::ptr<CellSyncLFQueue> queue, vm:
|
||||||
#ifdef PRX_DEBUG_XXX
|
#ifdef PRX_DEBUG_XXX
|
||||||
res = cb_call<s32, vm::ptr<CellSyncLFQueue>, u32, u32, u64>(CPU, libsre + 0x24B0, libsre_rtoc,
|
res = cb_call<s32, vm::ptr<CellSyncLFQueue>, u32, u32, u64>(CPU, libsre + 0x24B0, libsre_rtoc,
|
||||||
queue, position_v.addr(), isBlocking, 0);
|
queue, position_v.addr(), isBlocking, 0);
|
||||||
position = position_v->ToLE();
|
position = position_v.value();
|
||||||
#else
|
#else
|
||||||
res = syncLFQueueGetPushPointer(queue, position, isBlocking, 0);
|
res = syncLFQueueGetPushPointer(queue, position, isBlocking, 0);
|
||||||
#endif
|
#endif
|
||||||
|
@ -1324,7 +1324,7 @@ s32 _cellSyncLFQueuePushBody(PPUThread& CPU, vm::ptr<CellSyncLFQueue> queue, vm:
|
||||||
#ifdef PRX_DEBUG
|
#ifdef PRX_DEBUG
|
||||||
res = cb_call<s32, vm::ptr<CellSyncLFQueue>, u32, u32, u64>(CPU, libsre + 0x3050, libsre_rtoc,
|
res = cb_call<s32, vm::ptr<CellSyncLFQueue>, u32, u32, u64>(CPU, libsre + 0x3050, libsre_rtoc,
|
||||||
queue, position_v.addr(), isBlocking, 0);
|
queue, position_v.addr(), isBlocking, 0);
|
||||||
position = position_v->ToLE();
|
position = position_v.value();
|
||||||
#else
|
#else
|
||||||
res = syncLFQueueGetPushPointer2(queue, position, isBlocking, 0);
|
res = syncLFQueueGetPushPointer2(queue, position, isBlocking, 0);
|
||||||
#endif
|
#endif
|
||||||
|
@ -1689,7 +1689,7 @@ s32 _cellSyncLFQueuePopBody(PPUThread& CPU, vm::ptr<CellSyncLFQueue> queue, vm::
|
||||||
#ifdef PRX_DEBUG_XXX
|
#ifdef PRX_DEBUG_XXX
|
||||||
res = cb_call<s32, vm::ptr<CellSyncLFQueue>, u32, u32, u64, u64>(CPU, libsre + 0x2A90, libsre_rtoc,
|
res = cb_call<s32, vm::ptr<CellSyncLFQueue>, u32, u32, u64, u64>(CPU, libsre + 0x2A90, libsre_rtoc,
|
||||||
queue, position_v.addr(), isBlocking, 0, 0);
|
queue, position_v.addr(), isBlocking, 0, 0);
|
||||||
position = position_v->ToLE();
|
position = position_v.value();
|
||||||
#else
|
#else
|
||||||
res = syncLFQueueGetPopPointer(queue, position, isBlocking, 0, 0);
|
res = syncLFQueueGetPopPointer(queue, position, isBlocking, 0, 0);
|
||||||
#endif
|
#endif
|
||||||
|
@ -1699,7 +1699,7 @@ s32 _cellSyncLFQueuePopBody(PPUThread& CPU, vm::ptr<CellSyncLFQueue> queue, vm::
|
||||||
#ifdef PRX_DEBUG
|
#ifdef PRX_DEBUG
|
||||||
res = cb_call<s32, vm::ptr<CellSyncLFQueue>, u32, u32, u64>(CPU, libsre + 0x39AC, libsre_rtoc,
|
res = cb_call<s32, vm::ptr<CellSyncLFQueue>, u32, u32, u64>(CPU, libsre + 0x39AC, libsre_rtoc,
|
||||||
queue, position_v.addr(), isBlocking, 0);
|
queue, position_v.addr(), isBlocking, 0);
|
||||||
position = position_v->ToLE();
|
position = position_v.value();
|
||||||
#else
|
#else
|
||||||
res = syncLFQueueGetPopPointer2(queue, position, isBlocking, 0);
|
res = syncLFQueueGetPopPointer2(queue, position, isBlocking, 0);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -285,8 +285,7 @@ int cellVideoOutGetNumberOfDevice(u32 videoOut)
|
||||||
|
|
||||||
int cellVideoOutGetResolutionAvailability(u32 videoOut, u32 resolutionId, u32 aspect, u32 option)
|
int cellVideoOutGetResolutionAvailability(u32 videoOut, u32 resolutionId, u32 aspect, u32 option)
|
||||||
{
|
{
|
||||||
cellSysutil->Warning("cellVideoOutGetResolutionAvailability(videoOut=%d, resolutionId=0x%x, option_addr=0x%x, aspect=%d, option=%d)",
|
cellSysutil->Warning("cellVideoOutGetResolutionAvailability(videoOut=%d, resolutionId=0x%x, aspect=%d, option=%d)", videoOut, resolutionId, aspect, option);
|
||||||
videoOut, resolutionId, aspect, option);
|
|
||||||
|
|
||||||
if (!Ini.GS3DTV.GetValue() && (resolutionId == CELL_VIDEO_OUT_RESOLUTION_720_3D_FRAME_PACKING || resolutionId == CELL_VIDEO_OUT_RESOLUTION_1024x720_3D_FRAME_PACKING ||
|
if (!Ini.GS3DTV.GetValue() && (resolutionId == CELL_VIDEO_OUT_RESOLUTION_720_3D_FRAME_PACKING || resolutionId == CELL_VIDEO_OUT_RESOLUTION_1024x720_3D_FRAME_PACKING ||
|
||||||
resolutionId == CELL_VIDEO_OUT_RESOLUTION_960x720_3D_FRAME_PACKING || resolutionId == CELL_VIDEO_OUT_RESOLUTION_800x720_3D_FRAME_PACKING ||
|
resolutionId == CELL_VIDEO_OUT_RESOLUTION_960x720_3D_FRAME_PACKING || resolutionId == CELL_VIDEO_OUT_RESOLUTION_800x720_3D_FRAME_PACKING ||
|
||||||
|
@ -748,8 +747,8 @@ int cellHddGameCheck(u32 version, vm::ptr<const char> dirName, u32 errDialog, vm
|
||||||
|
|
||||||
funcStat(result, get, set);
|
funcStat(result, get, set);
|
||||||
|
|
||||||
if (result->result.ToLE() != CELL_HDDGAME_CBRESULT_OK &&
|
if (result->result != CELL_HDDGAME_CBRESULT_OK &&
|
||||||
result->result.ToLE() != CELL_HDDGAME_CBRESULT_OK_CANCEL) {
|
result->result != CELL_HDDGAME_CBRESULT_OK_CANCEL) {
|
||||||
return CELL_HDDGAME_ERROR_CBRESULT;
|
return CELL_HDDGAME_ERROR_CBRESULT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -448,7 +448,7 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event))
|
||||||
|
|
||||||
for(int i = 1; i < WXSIZEOF(ResolutionTable); ++i)
|
for(int i = 1; i < WXSIZEOF(ResolutionTable); ++i)
|
||||||
{
|
{
|
||||||
cbox_gs_resolution->Append(wxString::Format("%dx%d", ResolutionTable[i].width.ToLE(), ResolutionTable[i].height.ToLE()));
|
cbox_gs_resolution->Append(wxString::Format("%dx%d", ResolutionTable[i].width.value(), ResolutionTable[i].height.value()));
|
||||||
}
|
}
|
||||||
|
|
||||||
cbox_gs_aspect->Append("4:3");
|
cbox_gs_aspect->Append("4:3");
|
||||||
|
|
|
@ -47,7 +47,7 @@ namespace loader
|
||||||
|
|
||||||
if (m_ehdr.e_machine != MACHINE_PPC64 && m_ehdr.e_machine != MACHINE_SPU)
|
if (m_ehdr.e_machine != MACHINE_PPC64 && m_ehdr.e_machine != MACHINE_SPU)
|
||||||
{
|
{
|
||||||
LOG_ERROR(LOADER, "Unknown elf64 machine type: 0x%x", m_ehdr.e_machine.ToLE());
|
LOG_ERROR(LOADER, "Unknown elf64 machine type: 0x%x", m_ehdr.e_machine);
|
||||||
return bad_version;
|
return bad_version;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -399,7 +399,7 @@ namespace loader
|
||||||
{
|
{
|
||||||
for (auto &phdr : m_phdrs)
|
for (auto &phdr : m_phdrs)
|
||||||
{
|
{
|
||||||
switch (phdr.p_type.ToLE())
|
switch (phdr.p_type)
|
||||||
{
|
{
|
||||||
case 0x00000001: //LOAD
|
case 0x00000001: //LOAD
|
||||||
if (phdr.p_memsz)
|
if (phdr.p_memsz)
|
||||||
|
@ -442,12 +442,12 @@ namespace loader
|
||||||
{
|
{
|
||||||
sys_process_param_info& info = Emu.GetInfo().GetProcParam();
|
sys_process_param_info& info = Emu.GetInfo().GetProcParam();
|
||||||
/*
|
/*
|
||||||
LOG_NOTICE(LOADER, "*** sdk version: 0x%x", info.sdk_version.ToLE());
|
LOG_NOTICE(LOADER, "*** sdk version: 0x%x", info.sdk_version);
|
||||||
LOG_NOTICE(LOADER, "*** primary prio: %d", info.primary_prio.ToLE());
|
LOG_NOTICE(LOADER, "*** primary prio: %d", info.primary_prio);
|
||||||
LOG_NOTICE(LOADER, "*** primary stacksize: 0x%x", info.primary_stacksize.ToLE());
|
LOG_NOTICE(LOADER, "*** primary stacksize: 0x%x", info.primary_stacksize);
|
||||||
LOG_NOTICE(LOADER, "*** malloc pagesize: 0x%x", info.malloc_pagesize.ToLE());
|
LOG_NOTICE(LOADER, "*** malloc pagesize: 0x%x", info.malloc_pagesize);
|
||||||
LOG_NOTICE(LOADER, "*** ppc seg: 0x%x", info.ppc_seg.ToLE());
|
LOG_NOTICE(LOADER, "*** ppc seg: 0x%x", info.ppc_seg);
|
||||||
//LOG_NOTICE(LOADER, "*** crash dump param addr: 0x%x", info.crash_dump_param_addr.ToLE());
|
//LOG_NOTICE(LOADER, "*** crash dump param addr: 0x%x", info.crash_dump_param_addr);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
info = proc_param.info;
|
info = proc_param.info;
|
||||||
|
@ -463,7 +463,7 @@ namespace loader
|
||||||
|
|
||||||
if (proc_prx_param.magic != 0x1b434cec)
|
if (proc_prx_param.magic != 0x1b434cec)
|
||||||
{
|
{
|
||||||
LOG_ERROR(LOADER, "Bad magic! (0x%x)", proc_prx_param.magic.ToLE());
|
LOG_ERROR(LOADER, "Bad magic! (0x%x)", proc_prx_param.magic);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue