From bf7cf0ee9d9924f5cbb0a9082ad97780093719e0 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Wed, 14 Jan 2015 02:08:00 +0300 Subject: [PATCH] .ToLE() changed to .value() or removed --- Utilities/BEType.h | 2 +- Utilities/Thread.cpp | 14 +++--- rpcs3/Emu/Audio/AudioDumper.h | 2 +- rpcs3/Emu/Cell/PPUInterpreter.h | 35 +++++++-------- rpcs3/Emu/RSX/RSXThread.cpp | 2 +- rpcs3/Emu/SysCalls/Modules/cellAdec.cpp | 2 +- rpcs3/Emu/SysCalls/Modules/cellDmux.cpp | 50 +++++++++++----------- rpcs3/Emu/SysCalls/Modules/cellFont.cpp | 6 +-- rpcs3/Emu/SysCalls/Modules/cellGame.cpp | 2 +- rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp | 4 +- rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp | 6 +-- rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp | 10 ++--- rpcs3/Emu/SysCalls/Modules/cellResc.cpp | 12 +++--- rpcs3/Emu/SysCalls/Modules/cellRtc.cpp | 8 ++-- rpcs3/Emu/SysCalls/Modules/cellSail.cpp | 2 +- rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp | 18 ++++---- rpcs3/Emu/SysCalls/Modules/cellSync.cpp | 10 ++--- rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp | 7 ++- rpcs3/Gui/MainFrame.cpp | 2 +- rpcs3/Loader/ELF64.cpp | 18 ++++---- 20 files changed, 104 insertions(+), 108 deletions(-) diff --git a/Utilities/BEType.h b/Utilities/BEType.h index 37d04f517a..dbb289208e 100644 --- a/Utilities/BEType.h +++ b/Utilities/BEType.h @@ -556,7 +556,6 @@ private: return m_data; } -public: type ToLE() const { return se_t::from_be(m_data); @@ -572,6 +571,7 @@ public: m_data = se_t::to_be(value); } +public: static be_t MakeFromLE(const type& value) { stype data = se_t::to_be(value); diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp index 209ab5c01b..ed6e6025cd 100644 --- a/Utilities/Thread.cpp +++ b/Utilities/Thread.cpp @@ -184,7 +184,7 @@ void decode_x64_reg_op(const u8* code, x64_op_t& decoded_op, x64_reg_t& decoded_ } 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) { 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 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 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()); } 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) { 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 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 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()); } 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); } } diff --git a/rpcs3/Emu/Audio/AudioDumper.h b/rpcs3/Emu/Audio/AudioDumper.h index ebf0f1db25..b9734eea24 100644 --- a/rpcs3/Emu/Audio/AudioDumper.h +++ b/rpcs3/Emu/Audio/AudioDumper.h @@ -67,5 +67,5 @@ public: void WriteHeader(); size_t WriteData(const void* buffer, size_t size); void Finalize(); - const u8 GetCh() const { return (u8)m_header.FMT.NumChannels; } + const u16 GetCh() const { return m_header.FMT.NumChannels; } }; diff --git a/rpcs3/Emu/Cell/PPUInterpreter.h b/rpcs3/Emu/Cell/PPUInterpreter.h index aa9bba0244..76d7526df6 100644 --- a/rpcs3/Emu/Cell/PPUInterpreter.h +++ b/rpcs3/Emu/Cell/PPUInterpreter.h @@ -3263,7 +3263,7 @@ private: Emu.Pause(); return; } - CPU.FPR[frd] = vm::get_ref>((u32)addr).ToLE(); + CPU.FPR[frd] = vm::get_ref>((u32)addr).value(); } void SRW(u32 ra, u32 rs, u32 rb, bool rc) { @@ -3342,8 +3342,7 @@ private: Emu.Pause(); return; } - (u64&)CPU.FPR[frd] = vm::read32((u32)addr); - CPU.FPR[frd] = (float&)CPU.FPR[frd]; + CPU.FPR[frd] = vm::get_ref>((u32)addr).value(); CPU.GPR[ra] = addr; } void SYNC(u32 l) @@ -3359,7 +3358,7 @@ private: Emu.Pause(); return; } - (u64&)CPU.FPR[frd] = vm::read64((u32)addr); + CPU.FPR[frd] = vm::get_ref>((u32)addr).value(); } void LFDUX(u32 frd, u32 ra, u32 rb) { @@ -3370,7 +3369,7 @@ private: Emu.Pause(); return; } - (u64&)CPU.FPR[frd] = vm::read64((u32)addr); + CPU.FPR[frd] = vm::get_ref>((u32)addr).value(); CPU.GPR[ra] = addr; } void STVLX(u32 vs, u32 ra, u32 rb) @@ -3410,7 +3409,7 @@ private: Emu.Pause(); return; } - vm::write32((u32)addr, CPU.FPR[frs].To32()); + vm::get_ref>((u32)addr) = (float)CPU.FPR[frs]; } void STVRX(u32 vs, u32 ra, u32 rb) { @@ -3434,7 +3433,7 @@ private: Emu.Pause(); return; } - vm::write32((u32)addr, CPU.FPR[frs].To32()); + vm::get_ref>((u32)addr) = (float)CPU.FPR[frs]; CPU.GPR[ra] = addr; } void STSWI(u32 rd, u32 ra, u32 nb) @@ -3480,7 +3479,7 @@ private: Emu.Pause(); return; } - vm::write64((u32)addr, (u64&)CPU.FPR[frs]); + vm::get_ref>((u32)addr) = CPU.FPR[frs]; } void STFDUX(u32 frs, u32 ra, u32 rb) { @@ -3491,7 +3490,7 @@ private: Emu.Pause(); return; } - vm::write64((u32)addr, (u64&)CPU.FPR[frs]); + vm::get_ref>((u32)addr) = CPU.FPR[frs]; CPU.GPR[ra] = addr; } void LVLXL(u32 vd, u32 ra, u32 rb) @@ -3873,8 +3872,7 @@ private: Emu.Pause(); return; } - const u32 v = vm::read32((u32)addr); - CPU.FPR[frd] = (float&)v; + CPU.FPR[frd] = vm::get_ref>((u32)addr).value(); } void LFSU(u32 frd, u32 ra, s32 ds) { @@ -3885,8 +3883,7 @@ private: Emu.Pause(); return; } - const u32 v = vm::read32((u32)addr); - CPU.FPR[frd] = (float&)v; + CPU.FPR[frd] = vm::get_ref>((u32)addr).value(); CPU.GPR[ra] = addr; } void LFD(u32 frd, u32 ra, s32 d) @@ -3898,7 +3895,7 @@ private: Emu.Pause(); return; } - (u64&)CPU.FPR[frd] = vm::read64((u32)addr); + CPU.FPR[frd] = vm::get_ref>((u32)addr).value(); } void LFDU(u32 frd, u32 ra, s32 ds) { @@ -3909,7 +3906,7 @@ private: Emu.Pause(); return; } - (u64&)CPU.FPR[frd] = vm::read64((u32)addr); + CPU.FPR[frd] = vm::get_ref>((u32)addr).value(); CPU.GPR[ra] = addr; } void STFS(u32 frs, u32 ra, s32 d) @@ -3921,7 +3918,7 @@ private: Emu.Pause(); return; } - vm::write32((u32)addr, CPU.FPR[frs].To32()); + vm::get_ref>((u32)addr) = (float)CPU.FPR[frs]; } void STFSU(u32 frs, u32 ra, s32 d) { @@ -3932,7 +3929,7 @@ private: Emu.Pause(); return; } - vm::write32((u32)addr, CPU.FPR[frs].To32()); + vm::get_ref>((u32)addr) = (float)CPU.FPR[frs]; CPU.GPR[ra] = addr; } void STFD(u32 frs, u32 ra, s32 d) @@ -3944,7 +3941,7 @@ private: Emu.Pause(); return; } - vm::write64((u32)addr, (u64&)CPU.FPR[frs]); + vm::get_ref>((u32)addr) = CPU.FPR[frs]; } void STFDU(u32 frs, u32 ra, s32 d) { @@ -3955,7 +3952,7 @@ private: Emu.Pause(); return; } - vm::write64((u32)addr, (u64&)CPU.FPR[frs]); + vm::get_ref>((u32)addr) = CPU.FPR[frs]; CPU.GPR[ra] = addr; } void LD(u32 rd, u32 ra, s32 ds) diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index d2b2066698..28333b1e59 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -10,7 +10,7 @@ #include "Emu/SysCalls/CB_FUNC.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 u32 methodRegisters[0xffff]; diff --git a/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp b/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp index 8e91455acf..fe7c74d1a7 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp @@ -617,7 +617,7 @@ int cellAdecStartSeq(u32 handle, u32 param_addr) { auto param = vm::ptr::make(param_addr); - cellAdec->Todo("*** CellAdecParamMP3: bw_pcm=%d", param->bw_pcm.ToLE()); + cellAdec->Todo("*** CellAdecParamMP3: bw_pcm=%d", param->bw_pcm); break; } default: diff --git a/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp b/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp index ac2bd1368e..7f2c207c23 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp @@ -356,7 +356,7 @@ u32 dmuxOpen(Demuxer* dmux_ptr) continue; } - switch (code.ToLE()) + switch (code) { case PACK_START_CODE: { @@ -387,9 +387,9 @@ u32 dmuxOpen(Demuxer* dmux_ptr) stream.skip(4); 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); break; @@ -404,11 +404,11 @@ u32 dmuxOpen(Demuxer* dmux_ptr) stream.skip(4); 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); break; @@ -426,20 +426,20 @@ u32 dmuxOpen(Demuxer* dmux_ptr) stream.skip(4); 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); 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) { - 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; @@ -462,7 +462,7 @@ u32 dmuxOpen(Demuxer* dmux_ptr) 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; stream.skip(3); @@ -484,7 +484,7 @@ u32 dmuxOpen(Demuxer* dmux_ptr) if (data[0] != 0x0f || data[1] != 0xd0) { - DMUX_ERROR("ATX: 0x0fd0 header not found (ats=0x%llx)", ((be_t*)data)->ToLE()); + DMUX_ERROR("ATX: 0x0fd0 header not found (ats=0x%llx)", *(be_t*)data); } 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); - //cellDmux->Notice("ATX AU pushed (ats=0x%llx, frame_size=%d)", ((be_t*)data)->ToLE(), frame_size); + //cellDmux->Notice("ATX AU pushed (ats=0x%llx, frame_size=%d)", *(be_t*)data, frame_size); auto esMsg = vm::ptr::make(dmux.memAddr + (cb_add ^= 16)); esMsg->msgType = CELL_DMUX_ES_MSG_TYPE_AU_FOUND; @@ -505,7 +505,7 @@ u32 dmuxOpen(Demuxer* dmux_ptr) } 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); } break; @@ -521,29 +521,29 @@ u32 dmuxOpen(Demuxer* dmux_ptr) 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.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); 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) { - 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; - const u32 ch = code.ToLE() % 16; + const u32 ch = code % 16; if (esAVC[ch]) { ElementaryStream& es = *esAVC[ch]; @@ -576,13 +576,13 @@ u32 dmuxOpen(Demuxer* dmux_ptr) } // 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; es.push(stream, size); } 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); } break; @@ -590,9 +590,9 @@ u32 dmuxOpen(Demuxer* dmux_ptr) 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 @@ -1000,7 +1000,7 @@ int cellDmuxEnableEs(u32 demuxerHandle, vm::ptr esFil *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", - 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); task.es.es = id; diff --git a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp index e4435ff8ed..69199e2f2c 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp @@ -20,7 +20,7 @@ int cellFontInitializeWithRevision(u64 revisionFlags, vm::ptr co if (config->FileCache.size < 24) return CELL_FONT_ERROR_INVALID_PARAMETER; 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_size = config->FileCache.size; @@ -168,12 +168,12 @@ int cellFontOpenFontset(PPUThread& CPU, vm::ptr 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_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"; break; 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; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp index 3b4131c14c..1b8351b1d3 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp @@ -272,7 +272,7 @@ int cellGameDataCheckCreate2(PPUThread& CPU, u32 version, vm::ptr di if (cbSet->setParam) { // 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) diff --git a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp index d2a3474834..6fafce19a5 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp @@ -33,14 +33,14 @@ int cellGifDecOpen(u32 mainHandle, vm::ptr subHandle, vm::ptrsrcSelect.data()) { case se32(CELL_GIFDEC_BUFFER): - current_subHandle->fileSize = src->streamSize.ToLE(); + current_subHandle->fileSize = src->streamSize; break; case se32(CELL_GIFDEC_FILE): // Get file descriptor vm::var> fd; int ret = cellFsOpen(vm::ptr::make(src->fileName.addr()), 0, fd, vm::ptr::make(0), 0); - current_subHandle->fd = fd->ToLE(); + current_subHandle->fd = fd.value(); if (ret != CELL_OK) return CELL_GIFDEC_ERROR_OPEN_FILE; // Get size of file diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp index c397bc4785..1601720601 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp @@ -39,14 +39,14 @@ int cellJpgDecOpen(u32 mainHandle, vm::ptr subHandle, vm::ptrsrcSelect.data()) { case se32(CELL_JPGDEC_BUFFER): - current_subHandle->fileSize = src->streamSize.ToLE(); + current_subHandle->fileSize = src->streamSize; break; case se32(CELL_JPGDEC_FILE): // Get file descriptor vm::var> fd; int ret = cellFsOpen(vm::ptr::make(src->fileName.addr()), 0, fd, vm::ptr::make(0), 0); - current_subHandle->fd = fd->ToLE(); + current_subHandle->fd = fd.value(); if (ret != CELL_OK) return CELL_JPGDEC_ERROR_OPEN_FILE; // Get size of file @@ -261,7 +261,7 @@ int cellJpgDecDecodeData(u32 mainHandle, u32 subHandle, vm::ptr data, vm::pt case CELL_JPG_UPSAMPLE_ONLY: case CELL_JPG_GRAYSCALE_TO_ALPHA_RGBA: 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; default: diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp index 670d2c04ec..bbd9c24c75 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp @@ -80,14 +80,14 @@ s64 pngDecOpen( switch (src->srcSelect.data()) { case se32(CELL_PNGDEC_BUFFER): - stream->fileSize = src->streamSize.ToLE(); + stream->fileSize = src->streamSize; break; case se32(CELL_PNGDEC_FILE): // Get file descriptor vm::var> fd; int ret = cellFsOpen(vm::ptr::make(src->fileName.addr()), 0, fd, vm::ptr::make(0), 0); - stream->fd = fd->ToLE(); + stream->fd = fd.value(); if (ret != CELL_OK) return CELL_PNGDEC_ERROR_OPEN_FILE; // Get size of file @@ -223,7 +223,7 @@ s64 pngDecSetParameter( current_outParam.outputComponents = 4; break; 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; } @@ -352,11 +352,11 @@ s64 pngDecodeData( case se32(CELL_PNGDEC_GRAYSCALE): case se32(CELL_PNGDEC_PALETTE): 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; 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; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp index c6329e366d..7cf2717bea 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp @@ -970,11 +970,11 @@ int cellRescSetSrc(s32 idx, vm::ptr src) return CELL_RESC_ERROR_BAD_ARGUMENT; } - cellResc->Log(" *** format=0x%x", src->format.ToLE()); - cellResc->Log(" *** pitch=%d", src->pitch.ToLE()); - cellResc->Log(" *** width=%d", src->width.ToLE()); - cellResc->Log(" *** height=%d", src->height.ToLE()); - cellResc->Log(" *** offset=0x%x", src->offset.ToLE()); + cellResc->Log(" *** format=0x%x", src->format); + cellResc->Log(" *** pitch=%d", src->pitch); + cellResc->Log(" *** width=%d", src->width); + cellResc->Log(" *** height=%d", src->height); + cellResc->Log(" *** offset=0x%x", src->offset); s_rescInternalInstance->m_rescSrc[idx] = *src; @@ -1054,7 +1054,7 @@ int cellRescSetBufferAddress(vm::ptr colorBuffers, vm::ptr vertexArray for (int i=0; im_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 pTime, vm::ptr pTick) { 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(); return CELL_OK; @@ -315,7 +315,7 @@ int cellRtcGetDosTime(vm::ptr pDateTime, vm::ptr puiDosTim cellRtc->Log("cellRtcGetDosTime(pDateTime=0x%x, puiDosTime=0x%x)", pDateTime.addr(), puiDosTime.addr()); // 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(); return CELL_OK; @@ -326,7 +326,7 @@ int cellRtcGetTime_t(vm::ptr pDateTime, vm::ptr piTime) cellRtc->Log("cellRtcGetTime_t(pDateTime=0x%x, piTime=0x%x)", pDateTime.addr(), piTime.addr()); // 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), 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 pDateTime, vm::ptr pul cellRtc->Log("cellRtcGetWin32FileTime(pDateTime=0x%x, pulWin32FileTime=0x%x)", pDateTime.addr(), pulWin32FileTime.addr()); // 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), date_time.GetHour(rDateTime::TZ::UTC), date_time.GetDay(rDateTime::TZ::UTC), date_time.GetYear(rDateTime::TZ::UTC)); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSail.cpp b/rpcs3/Emu/SysCalls/Modules/cellSail.cpp index 14ceef7548..1e4cdc6741 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSail.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSail.cpp @@ -107,7 +107,7 @@ int cellSailDescriptorCreateDatabase(vm::ptr pSelf, vm::ptr< break; } default: - cellSail->Error("Unhandled stream type: %d", pSelf->streamType.ToLE()); + cellSail->Error("Unhandled stream type: %d", pSelf->streamType); } return CELL_OK; diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp index 8cea4ad56a..3ee777b0e2 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp @@ -32,7 +32,7 @@ s64 spursCreateLv2EventQueue(vm::ptr spurs, u32& queue_id, vm::ptr> queue; s32 res = cb_call, vm::ptr, vm::ptr, s32, u32>(GetCurrentPPUThread(), libsre + 0xB14C, libsre_rtoc, spurs, queue, port, size, vm::read32(libsre_rtoc - 0x7E2C)); - queue_id = queue->ToLE(); + queue_id = queue; return res; #endif @@ -763,7 +763,7 @@ s64 cellSpursInitializeWithAttribute(vm::ptr spurs, vm::ptrm.nSpus, attr->m.spuPriority, 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.prefixSize, attr->m.container, @@ -799,7 +799,7 @@ s64 cellSpursInitializeWithAttribute2(vm::ptr spurs, vm::ptrm.nSpus, attr->m.spuPriority, 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.prefixSize, attr->m.container, @@ -851,7 +851,7 @@ s64 cellSpursAttributeSetMemoryContainerForSpuThread(vm::ptr 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; } @@ -925,7 +925,7 @@ s64 cellSpursAttributeSetSpuThreadGroupType(vm::ptr attr, s3 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; } @@ -976,7 +976,7 @@ s64 cellSpursAttributeEnableSystemWorkload(vm::ptr attr, vm: { 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; } @@ -1442,7 +1442,7 @@ s32 spursAddWorkload( 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& v) { - const u32 mask = v.ToLE() & ~(0x80000000u >> wnum); + const u32 mask = v & ~(0x80000000u >> wnum); res_wkl = 0; for (u32 i = 0, m = 0x80000000, k = 0; i < 32; i++, m >>= 1) @@ -1685,7 +1685,7 @@ s64 _cellSpursWorkloadFlagReceiver(vm::ptr spurs, u32 wid, u32 is_set { 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; } @@ -1797,7 +1797,7 @@ s64 cellSpursReadyCountStore(vm::ptr spurs, u32 wid, u32 value) { 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; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp index 444813aaa5..fa043029ef 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp @@ -940,7 +940,7 @@ s32 syncLFQueueInitialize(vm::ptr queue, vm::ptr buffer, u3 { return CELL_SYNC_ERROR_STAT; } - old_value = old.ToLE(); + old_value = old; } else { @@ -1314,7 +1314,7 @@ s32 _cellSyncLFQueuePushBody(PPUThread& CPU, vm::ptr queue, vm: #ifdef PRX_DEBUG_XXX res = cb_call, u32, u32, u64>(CPU, libsre + 0x24B0, libsre_rtoc, queue, position_v.addr(), isBlocking, 0); - position = position_v->ToLE(); + position = position_v.value(); #else res = syncLFQueueGetPushPointer(queue, position, isBlocking, 0); #endif @@ -1324,7 +1324,7 @@ s32 _cellSyncLFQueuePushBody(PPUThread& CPU, vm::ptr queue, vm: #ifdef PRX_DEBUG res = cb_call, u32, u32, u64>(CPU, libsre + 0x3050, libsre_rtoc, queue, position_v.addr(), isBlocking, 0); - position = position_v->ToLE(); + position = position_v.value(); #else res = syncLFQueueGetPushPointer2(queue, position, isBlocking, 0); #endif @@ -1689,7 +1689,7 @@ s32 _cellSyncLFQueuePopBody(PPUThread& CPU, vm::ptr queue, vm:: #ifdef PRX_DEBUG_XXX res = cb_call, u32, u32, u64, u64>(CPU, libsre + 0x2A90, libsre_rtoc, queue, position_v.addr(), isBlocking, 0, 0); - position = position_v->ToLE(); + position = position_v.value(); #else res = syncLFQueueGetPopPointer(queue, position, isBlocking, 0, 0); #endif @@ -1699,7 +1699,7 @@ s32 _cellSyncLFQueuePopBody(PPUThread& CPU, vm::ptr queue, vm:: #ifdef PRX_DEBUG res = cb_call, u32, u32, u64>(CPU, libsre + 0x39AC, libsre_rtoc, queue, position_v.addr(), isBlocking, 0); - position = position_v->ToLE(); + position = position_v.value(); #else res = syncLFQueueGetPopPointer2(queue, position, isBlocking, 0); #endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp index ca3108aac1..906234387c 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp @@ -285,8 +285,7 @@ int cellVideoOutGetNumberOfDevice(u32 videoOut) 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)", - videoOut, resolutionId, aspect, option); + cellSysutil->Warning("cellVideoOutGetResolutionAvailability(videoOut=%d, resolutionId=0x%x, aspect=%d, option=%d)", 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 || 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 dirName, u32 errDialog, vm funcStat(result, get, set); - if (result->result.ToLE() != CELL_HDDGAME_CBRESULT_OK && - result->result.ToLE() != CELL_HDDGAME_CBRESULT_OK_CANCEL) { + if (result->result != CELL_HDDGAME_CBRESULT_OK && + result->result != CELL_HDDGAME_CBRESULT_OK_CANCEL) { return CELL_HDDGAME_ERROR_CBRESULT; } diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp index 65d98ba622..45c1a24f68 100644 --- a/rpcs3/Gui/MainFrame.cpp +++ b/rpcs3/Gui/MainFrame.cpp @@ -448,7 +448,7 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event)) 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"); diff --git a/rpcs3/Loader/ELF64.cpp b/rpcs3/Loader/ELF64.cpp index c22e582141..5c7d49b7cc 100644 --- a/rpcs3/Loader/ELF64.cpp +++ b/rpcs3/Loader/ELF64.cpp @@ -47,7 +47,7 @@ namespace loader 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; } @@ -399,7 +399,7 @@ namespace loader { for (auto &phdr : m_phdrs) { - switch (phdr.p_type.ToLE()) + switch (phdr.p_type) { case 0x00000001: //LOAD if (phdr.p_memsz) @@ -442,12 +442,12 @@ namespace loader { sys_process_param_info& info = Emu.GetInfo().GetProcParam(); /* - LOG_NOTICE(LOADER, "*** sdk version: 0x%x", info.sdk_version.ToLE()); - LOG_NOTICE(LOADER, "*** primary prio: %d", info.primary_prio.ToLE()); - LOG_NOTICE(LOADER, "*** primary stacksize: 0x%x", info.primary_stacksize.ToLE()); - LOG_NOTICE(LOADER, "*** malloc pagesize: 0x%x", info.malloc_pagesize.ToLE()); - LOG_NOTICE(LOADER, "*** ppc seg: 0x%x", info.ppc_seg.ToLE()); - //LOG_NOTICE(LOADER, "*** crash dump param addr: 0x%x", info.crash_dump_param_addr.ToLE()); + LOG_NOTICE(LOADER, "*** sdk version: 0x%x", info.sdk_version); + LOG_NOTICE(LOADER, "*** primary prio: %d", info.primary_prio); + LOG_NOTICE(LOADER, "*** primary stacksize: 0x%x", info.primary_stacksize); + LOG_NOTICE(LOADER, "*** malloc pagesize: 0x%x", info.malloc_pagesize); + LOG_NOTICE(LOADER, "*** ppc seg: 0x%x", info.ppc_seg); + //LOG_NOTICE(LOADER, "*** crash dump param addr: 0x%x", info.crash_dump_param_addr); */ info = proc_param.info; @@ -463,7 +463,7 @@ namespace loader 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; }