archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Clean vm::ps3 namespace use

Browse source
This commit is contained in:
Nekotekina 2018-02-09 17:49:37 +03:00
parent 76be7d40ac
commit cce0ad0c35
176 changed files with 693 additions and 698 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/Cell/MFC.cpp
View file

@ -158,7 +158,7 @@ void mfc_thread::cpu_task()
if ((cmd.cmd & ~(MFC_BARRIER_MASK | MFC_FENCE_MASK)) == MFC_PUTQLLUC_CMD) if ((cmd.cmd & ~(MFC_BARRIER_MASK | MFC_FENCE_MASK)) == MFC_PUTQLLUC_CMD)
{ {
auto& data = vm::ps3::_ref<decltype(spu.rdata)>(cmd.eal); auto& data = vm::_ref<decltype(spu.rdata)>(cmd.eal);
const auto to_write = spu._ref<decltype(spu.rdata)>(cmd.lsa & 0x3ffff); const auto to_write = spu._ref<decltype(spu.rdata)>(cmd.lsa & 0x3ffff);
cmd.size = 0; cmd.size = 0;

12
rpcs3/Emu/Cell/Modules/cellAdec.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error Codes // Error Codes
enum enum
@ -308,7 +308,7 @@ enum CellAdecChannel : s32
CELL_ADEC_CH_3_4, CELL_ADEC_CH_3_4,
CELL_ADEC_CH_3_4_LFE, CELL_ADEC_CH_3_4_LFE,
CELL_ADEC_CH_RESERVED3, CELL_ADEC_CH_RESERVED3,
}; };
// Sampling Rate // Sampling Rate
enum CellAdecSampleRate : s32 enum CellAdecSampleRate : s32
@ -532,13 +532,13 @@ struct CellAdecParamM4Aac
union union
{ {
struct struct
{ {
be_t<u32> programNumber; be_t<u32> programNumber;
} }
adifConfig; adifConfig;
struct struct
{ {
be_t<s32> samplingFreqIndex; // MPEG4AAC_SamplingFreq be_t<s32> samplingFreqIndex; // MPEG4AAC_SamplingFreq
be_t<u32> profile; // LC profile (1) be_t<u32> profile; // LC profile (1)
@ -683,10 +683,10 @@ struct CellAdecParamAc3
AC3_WordSize wordSize; AC3_WordSize wordSize;
AC3_OutputMode outputMode; AC3_OutputMode outputMode;
AC3_LFE outLfeOn; AC3_LFE outLfeOn;
be_t<float> drcCutScaleFactor; be_t<float> drcCutScaleFactor;
be_t<float> drcBoostScaleFactor; be_t<float> drcBoostScaleFactor;
AC3_CompressionMode compressionMode; AC3_CompressionMode compressionMode;
AC3_InputChannel numberOfChannels; AC3_InputChannel numberOfChannels;
AC3_StereoMode stereoMode; AC3_StereoMode stereoMode;

2
rpcs3/Emu/Cell/Modules/cellAtrac.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Return Codes // Return Codes
enum enum

2
rpcs3/Emu/Cell/Modules/cellAtracMulti.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Return Codes // Return Codes
enum enum

16
rpcs3/Emu/Cell/Modules/cellAudio.h
View file

@ -2,7 +2,7 @@
#include "Utilities/Thread.h" #include "Utilities/Thread.h"
namespace vm { using namespace ps3; }
// Error codes // Error codes
enum CellAudioError : u32 enum CellAudioError : u32
@ -32,7 +32,7 @@ enum
CELL_AUDIO_BLOCK_SAMPLES = 256, CELL_AUDIO_BLOCK_SAMPLES = 256,
CELL_AUDIO_CREATEEVENTFLAG_SPU = 0x00000001, CELL_AUDIO_CREATEEVENTFLAG_SPU = 0x00000001,
CELL_AUDIO_EVENT_HEADPHONE = 1, CELL_AUDIO_EVENT_HEADPHONE = 1,
CELL_AUDIO_EVENT_MIX = 0, CELL_AUDIO_EVENT_MIX = 0,
CELL_AUDIO_EVENTFLAG_BEFOREMIX = 0x80000000, CELL_AUDIO_EVENTFLAG_BEFOREMIX = 0x80000000,
CELL_AUDIO_EVENTFLAG_DECIMATE_2 = 0x08000000, CELL_AUDIO_EVENTFLAG_DECIMATE_2 = 0x08000000,
CELL_AUDIO_EVENTFLAG_DECIMATE_4 = 0x10000000, CELL_AUDIO_EVENTFLAG_DECIMATE_4 = 0x10000000,
@ -40,7 +40,7 @@ enum
CELL_AUDIO_EVENTFLAG_NOMIX = 0x40000000, CELL_AUDIO_EVENTFLAG_NOMIX = 0x40000000,
CELL_AUDIO_MAX_PORT = 4, CELL_AUDIO_MAX_PORT = 4,
CELL_AUDIO_MAX_PORT_2 = 8, CELL_AUDIO_MAX_PORT_2 = 8,
CELL_AUDIO_MISC_ACCVOL_ALLDEVICE = 0x0000ffffUL, CELL_AUDIO_MISC_ACCVOL_ALLDEVICE = 0x0000ffffUL,
CELL_AUDIO_PERSONAL_DEVICE_PRIMARY = 0x8000, CELL_AUDIO_PERSONAL_DEVICE_PRIMARY = 0x8000,
CELL_AUDIO_PORT_2CH = 2, CELL_AUDIO_PORT_2CH = 2,
CELL_AUDIO_PORT_8CH = 8, CELL_AUDIO_PORT_8CH = 8,
@ -51,7 +51,7 @@ enum
CELL_AUDIO_PORTATTR_OUT_PERSONAL_1 = 0x0000000002000000ULL, CELL_AUDIO_PORTATTR_OUT_PERSONAL_1 = 0x0000000002000000ULL,
CELL_AUDIO_PORTATTR_OUT_PERSONAL_2 = 0x0000000004000000ULL, CELL_AUDIO_PORTATTR_OUT_PERSONAL_2 = 0x0000000004000000ULL,
CELL_AUDIO_PORTATTR_OUT_PERSONAL_3 = 0x0000000008000000ULL, CELL_AUDIO_PORTATTR_OUT_PERSONAL_3 = 0x0000000008000000ULL,
CELL_AUDIO_PORTATTR_OUT_SECONDARY = 0x0000000000000001ULL, CELL_AUDIO_PORTATTR_OUT_SECONDARY = 0x0000000000000001ULL,
CELL_AUDIO_STATUS_CLOSE = 0x1010, CELL_AUDIO_STATUS_CLOSE = 0x1010,
CELL_AUDIO_STATUS_READY = 1, CELL_AUDIO_STATUS_READY = 1,
CELL_AUDIO_STATUS_RUN = 2, CELL_AUDIO_STATUS_RUN = 2,
@ -59,15 +59,15 @@ enum
//libaudio datatypes //libaudio datatypes
struct CellAudioPortParam struct CellAudioPortParam
{ {
be_t<u64> nChannel; be_t<u64> nChannel;
be_t<u64> nBlock; be_t<u64> nBlock;
be_t<u64> attr; be_t<u64> attr;
be_t<float> level; be_t<float> level;
}; };
struct CellAudioPortConfig struct CellAudioPortConfig
{ {
vm::bptr<u64> readIndexAddr; vm::bptr<u64> readIndexAddr;
be_t<u32> status; be_t<u32> status;
be_t<u64> nChannel; be_t<u64> nChannel;
@ -115,7 +115,7 @@ struct audio_port
float inc; float inc;
}; };
float level; float level;
atomic_t<level_set_t> level_set; atomic_t<level_set_t> level_set;
}; };

2
rpcs3/Emu/Cell/Modules/cellAudioIn.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error codes // Error codes
enum enum

2
rpcs3/Emu/Cell/Modules/cellAudioOut.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error codes // Error codes
enum enum

2
rpcs3/Emu/Cell/Modules/cellBgdl.cpp
View file

@ -4,7 +4,7 @@
#include "cellBgdl.h" #include "cellBgdl.h"
namespace vm { using namespace ps3; }
logs::channel cellBGDL("cellBGDL"); logs::channel cellBGDL("cellBGDL");

2
rpcs3/Emu/Cell/Modules/cellBgdl.h
View file

@ -30,5 +30,5 @@ struct CellBGDLInfo
be_t<u64> received_size; be_t<u64> received_size;
be_t<u64> content_size; be_t<u64> content_size;
be_t<s32> state; // CellBGDLState be_t<s32> state; // CellBGDLState
vm::ps3::bptr<void> reserved; vm::bptr<void> reserved;
}; };

2
rpcs3/Emu/Cell/Modules/cellCamera.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error Codes // Error Codes
enum enum

8
rpcs3/Emu/Cell/Modules/cellCelp8Enc.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// libCelp8Enc = 0x806140a1 - 0x806140bf // libCelp8Enc = 0x806140a1 - 0x806140bf
@ -19,9 +19,9 @@ enum
enum enum
{ {
CELL_CELP8ENC_FS_8kHz = 1, CELL_CELP8ENC_FS_8kHz = 1,
CELL_CELP8ENC_EXCITATION_MODE_MPE = 0, CELL_CELP8ENC_EXCITATION_MODE_MPE = 0,
CELL_CELP8ENC_MPE_CONFIG_0 = 0, CELL_CELP8ENC_MPE_CONFIG_0 = 0,
CELL_CELP8ENC_MPE_CONFIG_2 = 2, CELL_CELP8ENC_MPE_CONFIG_2 = 2,
CELL_CELP8ENC_MPE_CONFIG_6 = 6, CELL_CELP8ENC_MPE_CONFIG_6 = 6,
@ -32,6 +32,6 @@ enum
CELL_CELP8ENC_MPE_CONFIG_21 = 21, CELL_CELP8ENC_MPE_CONFIG_21 = 21,
CELL_CELP8ENC_MPE_CONFIG_24 = 24, CELL_CELP8ENC_MPE_CONFIG_24 = 24,
CELL_CELP8ENC_MPE_CONFIG_26 = 26, CELL_CELP8ENC_MPE_CONFIG_26 = 26,
CELL_CELP8ENC_WORD_SZ_FLOAT, CELL_CELP8ENC_WORD_SZ_FLOAT,
}; };

8
rpcs3/Emu/Cell/Modules/cellCelpEnc.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// libCelpEnc = 0x80614001 - 0x806140ff // libCelpEnc = 0x80614001 - 0x806140ff
@ -19,14 +19,14 @@ enum
enum enum
{ {
CELL_CELPENC_FS_16kHz = 2, CELL_CELPENC_FS_16kHz = 2,
CELL_CELPENC_EXCITATION_MODE_RPE = 1, CELL_CELPENC_EXCITATION_MODE_RPE = 1,
CELL_CELPENC_RPE_CONFIG_0, CELL_CELPENC_RPE_CONFIG_0,
CELL_CELPENC_RPE_CONFIG_1, CELL_CELPENC_RPE_CONFIG_1,
CELL_CELPENC_RPE_CONFIG_2, CELL_CELPENC_RPE_CONFIG_2,
CELL_CELPENC_RPE_CONFIG_3, CELL_CELPENC_RPE_CONFIG_3,
CELL_CELPENC_WORD_SZ_INI16_LE, CELL_CELPENC_WORD_SZ_INI16_LE,
CELL_CELPENC_WORD_SZ_FLOAT, CELL_CELPENC_WORD_SZ_FLOAT,
}; };

2
rpcs3/Emu/Cell/Modules/cellCrossController.cpp
View file

@ -2,7 +2,7 @@
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
namespace vm { using namespace ps3; }
logs::channel cellCrossController("cellCrossController"); logs::channel cellCrossController("cellCrossController");

20
rpcs3/Emu/Cell/Modules/cellDaisy.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// libDaisy = 0x80410501 - 0x804105ff // libDaisy = 0x80410501 - 0x804105ff
@ -35,7 +35,7 @@ enum
CELL_DAISY_MIN_ENTRY_SIZE = 16, CELL_DAISY_MIN_ENTRY_SIZE = 16,
CELL_DAISY_MAX_ENTRY_SIZE = (16*1024), CELL_DAISY_MAX_ENTRY_SIZE = (16*1024),
CELL_DAISY_MAX_DMA_TAG = 31, CELL_DAISY_MAX_DMA_TAG = 31,
// CELL_DAISY_ENTRY_SIZE(x) // CELL_DAISY_ENTRY_SIZE(x)
// CELL_DAISY_EA_ATOMIC(x) // CELL_DAISY_EA_ATOMIC(x)
// CELL_DAISY_EA_DMA(x) // CELL_DAISY_EA_DMA(x)
@ -48,35 +48,35 @@ enum
// Queue IO // Queue IO
DAISY_OUTPUT, DAISY_OUTPUT,
DAISY_INPUT, DAISY_INPUT,
// Block Mode // Block Mode
DAISY_NOT_STALL = 0, DAISY_NOT_STALL = 0,
DAISY_STALL = 1, DAISY_STALL = 1,
// Queue Status // Queue Status
DAISY_PTR_UNAVAILABLE = 0x40000001, DAISY_PTR_UNAVAILABLE = 0x40000001,
DAISY_PTR_TERMINATED = 0x40000002, DAISY_PTR_TERMINATED = 0x40000002,
// Buffer Mode // Buffer Mode
DAISY_COPY = 0, DAISY_COPY = 0,
DAISY_REFERENCE = 1, DAISY_REFERENCE = 1,
// Constructor Mode // Constructor Mode
DAISY_NO_PARAMETER = 0, DAISY_NO_PARAMETER = 0,
DAISY_PARAMETER = 1, DAISY_PARAMETER = 1,
// Glue Mode // Glue Mode
DAISY_ONE_PORT = 1, DAISY_ONE_PORT = 1,
DAISY_TWO_PORT = 2, DAISY_TWO_PORT = 2,
// Queue Mode // Queue Mode
DAISY_IN_ORDER, DAISY_IN_ORDER,
DAISY_OUT_OF_ORDER, DAISY_OUT_OF_ORDER,
// Buffer Type // Buffer Type
DAISY_BUFFER_TYPE_REMOTE = 1, DAISY_BUFFER_TYPE_REMOTE = 1,
DAISY_BUFFER_TYPE_LOCAL = 2, DAISY_BUFFER_TYPE_LOCAL = 2,
// Queue Control Type // Queue Control Type
DAISY_QCTL_TYPE_ATOMIC = 1, DAISY_QCTL_TYPE_ATOMIC = 1,
DAISY_QCTL_TYPE_LOCAL = 2, DAISY_QCTL_TYPE_LOCAL = 2,

6
rpcs3/Emu/Cell/Modules/cellDmux.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error Codes // Error Codes
enum enum
@ -156,7 +156,7 @@ struct CellDmuxEsMsg
be_t<u64> supplementalInfo; be_t<u64> supplementalInfo;
}; };
struct CellDmuxType struct CellDmuxType
{ {
be_t<s32> streamType; // CellDmuxStreamType be_t<s32> streamType; // CellDmuxStreamType
be_t<u32> reserved[2]; be_t<u32> reserved[2];
@ -223,7 +223,7 @@ using CellDmuxCbMsg = u32(u32 demuxerHandle, vm::ptr<CellDmuxMsg> demuxerMsg, u3
struct CellDmuxCb struct CellDmuxCb
{ {
vm::bptr<CellDmuxCbMsg> cbMsgFunc; vm::bptr<CellDmuxCbMsg> cbMsgFunc;
be_t<u32> cbArg; be_t<u32> cbArg;
}; };

2
rpcs3/Emu/Cell/Modules/cellFiber.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Return Codes // Return Codes
enum CellFiberError : u32 enum CellFiberError : u32

2
rpcs3/Emu/Cell/Modules/cellFont.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error codes // Error codes
enum enum

2
rpcs3/Emu/Cell/Modules/cellFontFT.h
View file

@ -2,7 +2,7 @@
#include "cellFont.h" #include "cellFont.h"
namespace vm { using namespace ps3; }
struct CellFontLibraryConfigFT struct CellFontLibraryConfigFT
{ {

24
rpcs3/Emu/Cell/Modules/cellFs.cpp
View file

@ -11,7 +11,7 @@
#include <mutex> #include <mutex>
namespace vm { using namespace ps3; }
logs::channel cellFs("cellFs"); logs::channel cellFs("cellFs");
@ -417,7 +417,7 @@ error_code cellFsGetDirectoryEntries(u32 fd, vm::ptr<CellFsDirectoryEntry> entri
return CellError(+op->arg._code); return CellError(+op->arg._code);
} }
return not_an_error(rc); return not_an_error(rc);
} }
error_code cellFsReadWithOffset(u32 fd, u64 offset, vm::ptr<void> buf, u64 buffer_size, vm::ptr<u64> nread) error_code cellFsReadWithOffset(u32 fd, u64 offset, vm::ptr<void> buf, u64 buffer_size, vm::ptr<u64> nread)
@ -433,7 +433,7 @@ error_code cellFsReadWithOffset(u32 fd, u64 offset, vm::ptr<void> buf, u64 buffe
vm::var<lv2_file_op_rw> arg; vm::var<lv2_file_op_rw> arg;
arg->_vtable = vm::cast(0xfa8a0000); // Intentionally wrong (provide correct vtable if necessary) arg->_vtable = vm::cast(0xfa8a0000); // Intentionally wrong (provide correct vtable if necessary)
arg->op = 0x8000000a; arg->op = 0x8000000a;
arg->fd = fd; arg->fd = fd;
arg->buf = buf; arg->buf = buf;
@ -447,7 +447,7 @@ error_code cellFsReadWithOffset(u32 fd, u64 offset, vm::ptr<void> buf, u64 buffe
{ {
*nread = rc && rc != CELL_EFSSPECIFIC ? 0 : arg->out_size.value(); *nread = rc && rc != CELL_EFSSPECIFIC ? 0 : arg->out_size.value();
} }
if (!rc && arg->out_code) if (!rc && arg->out_code)
{ {
return CellError(+arg->out_code); return CellError(+arg->out_code);
@ -475,7 +475,7 @@ error_code cellFsWriteWithOffset(u32 fd, u64 offset, vm::cptr<void> buf, u64 dat
vm::var<lv2_file_op_rw> arg; vm::var<lv2_file_op_rw> arg;
arg->_vtable = vm::cast(0xfa8b0000); // Intentionally wrong (provide correct vtable if necessary) arg->_vtable = vm::cast(0xfa8b0000); // Intentionally wrong (provide correct vtable if necessary)
arg->op = 0x8000000b; arg->op = 0x8000000b;
arg->fd = fd; arg->fd = fd;
arg->buf = vm::const_ptr_cast<void>(buf); arg->buf = vm::const_ptr_cast<void>(buf);
@ -623,7 +623,7 @@ error_code cellFsAllocateFileAreaWithoutZeroFill(vm::cptr<char> path, u64 size)
{ {
return CellError(rc); return CellError(rc);
} }
return CELL_OK; return CELL_OK;
} }
@ -670,7 +670,7 @@ s32 cellFsStReadInit(u32 fd, vm::cptr<CellFsRingBuffer> ringbuf)
{ {
return CELL_EBADF; return CELL_EBADF;
} }
if (file->flags & CELL_FS_O_WRONLY) if (file->flags & CELL_FS_O_WRONLY)
{ {
return CELL_EPERM; return CELL_EPERM;
@ -780,7 +780,7 @@ s32 cellFsStReadStop(u32 fd)
s32 cellFsStRead(u32 fd, vm::ptr<u8> buf, u64 size, vm::ptr<u64> rsize) s32 cellFsStRead(u32 fd, vm::ptr<u8> buf, u64 size, vm::ptr<u64> rsize)
{ {
cellFs.todo("cellFsStRead(fd=%d, buf=*0x%x, size=0x%llx, rsize=*0x%x)", fd, buf, size, rsize); cellFs.todo("cellFsStRead(fd=%d, buf=*0x%x, size=0x%llx, rsize=*0x%x)", fd, buf, size, rsize);
const auto file = idm::get<lv2_fs_object, lv2_file>(fd); const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
if (!file) if (!file)
@ -812,7 +812,7 @@ s32 cellFsStReadGetCurrentAddr(u32 fd, vm::ptr<u32> addr, vm::ptr<u64> size)
s32 cellFsStReadPutCurrentAddr(u32 fd, vm::ptr<u8> addr, u64 size) s32 cellFsStReadPutCurrentAddr(u32 fd, vm::ptr<u8> addr, u64 size)
{ {
cellFs.todo("cellFsStReadPutCurrentAddr(fd=%d, addr=*0x%x, size=0x%llx)", fd, addr, size); cellFs.todo("cellFsStReadPutCurrentAddr(fd=%d, addr=*0x%x, size=0x%llx)", fd, addr, size);
const auto file = idm::get<lv2_fs_object, lv2_file>(fd); const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
if (!file) if (!file)
@ -828,7 +828,7 @@ s32 cellFsStReadPutCurrentAddr(u32 fd, vm::ptr<u8> addr, u64 size)
s32 cellFsStReadWait(u32 fd, u64 size) s32 cellFsStReadWait(u32 fd, u64 size)
{ {
cellFs.todo("cellFsStReadWait(fd=%d, size=0x%llx)", fd, size); cellFs.todo("cellFsStReadWait(fd=%d, size=0x%llx)", fd, size);
const auto file = idm::get<lv2_fs_object, lv2_file>(fd); const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
if (!file) if (!file)
@ -837,7 +837,7 @@ s32 cellFsStReadWait(u32 fd, u64 size)
} }
// TODO // TODO
return CELL_OK; return CELL_OK;
} }
@ -853,7 +853,7 @@ s32 cellFsStReadWaitCallback(u32 fd, u64 size, vm::ptr<void(s32 xfd, u64 xsize)>
} }
// TODO // TODO
return CELL_OK; return CELL_OK;
} }

2
rpcs3/Emu/Cell/Modules/cellGame.h
View file

@ -2,7 +2,7 @@
#include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/ErrorCodes.h"
namespace vm { using namespace ps3; }
// Return Codes // Return Codes
enum enum

2
rpcs3/Emu/Cell/Modules/cellGcmSys.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
#include "Emu/RSX/GCM.h" #include "Emu/RSX/GCM.h"

2
rpcs3/Emu/Cell/Modules/cellGem.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
static const float CELL_GEM_SPHERE_RADIUS_MM = 22.5f; static const float CELL_GEM_SPHERE_RADIUS_MM = 22.5f;

2
rpcs3/Emu/Cell/Modules/cellGifDec.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Return Codes // Return Codes
enum enum

14
rpcs3/Emu/Cell/Modules/cellHttp.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// libHttp = 0x80710001 - 0x80710fff // libHttp = 0x80710001 - 0x80710fff
// libHttps = 0x80710a01 - 0x80710aff // libHttps = 0x80710a01 - 0x80710aff
@ -10,10 +10,10 @@ enum
{ {
CELL_HTTP_NET_ERROR_TYPE_MASK = 0xffffff00, CELL_HTTP_NET_ERROR_TYPE_MASK = 0xffffff00,
CELL_HTTP_NET_ERROR_MASK = 0xff, CELL_HTTP_NET_ERROR_MASK = 0xff,
// CELL_HTTP_NET_ERROR // CELL_HTTP_NET_ERROR
// CELL_HTTP_IS_NET_RESOLVER_ERROR // CELL_HTTP_IS_NET_RESOLVER_ERROR
CELL_HTTP_ERROR_ALREADY_INITIALIZED = 0x80710001, CELL_HTTP_ERROR_ALREADY_INITIALIZED = 0x80710001,
CELL_HTTP_ERROR_NOT_INITIALIZED = 0x80710002, CELL_HTTP_ERROR_NOT_INITIALIZED = 0x80710002,
CELL_HTTP_ERROR_NO_MEMORY = 0x80710003, CELL_HTTP_ERROR_NO_MEMORY = 0x80710003,
@ -48,7 +48,7 @@ enum
CELL_HTTP_ERROR_CACHE_NOT_INITIALIZED = 0x80710044, CELL_HTTP_ERROR_CACHE_NOT_INITIALIZED = 0x80710044,
CELL_HTTP_ERROR_LINE_EXCEEDS_MAX = 0x80710045, CELL_HTTP_ERROR_LINE_EXCEEDS_MAX = 0x80710045,
CELL_HTTP_ERROR_REQUIRES_BASIC_AUTH = 0x80710046, CELL_HTTP_ERROR_REQUIRES_BASIC_AUTH = 0x80710046,
CELL_HTTP_ERROR_UNKNOWN = 0x80710051, CELL_HTTP_ERROR_UNKNOWN = 0x80710051,
CELL_HTTP_ERROR_INTERNAL = 0x80710052, CELL_HTTP_ERROR_INTERNAL = 0x80710052,
CELL_HTTP_ERROR_NONREMOVABLE = 0x80710053, CELL_HTTP_ERROR_NONREMOVABLE = 0x80710053,
@ -62,7 +62,7 @@ enum
CELL_HTTP_ERROR_DECODE_SETUP = 0x8071005b, CELL_HTTP_ERROR_DECODE_SETUP = 0x8071005b,
CELL_HTTP_ERROR_DECODE_STREAM = 0x8071005c, CELL_HTTP_ERROR_DECODE_STREAM = 0x8071005c,
CELL_HTTP_ERROR_BROKEN_DECODE_STREAM = 0x8071005d, CELL_HTTP_ERROR_BROKEN_DECODE_STREAM = 0x8071005d,
CELL_HTTP_ERROR_INVALID_DCACHE_PATH = 0x80710060, CELL_HTTP_ERROR_INVALID_DCACHE_PATH = 0x80710060,
CELL_HTTP_ERROR_DCACHE_ALREADY_INITIALIZED = 0x80710061, CELL_HTTP_ERROR_DCACHE_ALREADY_INITIALIZED = 0x80710061,
CELL_HTTP_ERROR_DCACHE_NOT_INITIALIZED = 0x80710062, CELL_HTTP_ERROR_DCACHE_NOT_INITIALIZED = 0x80710062,
@ -94,12 +94,12 @@ enum
CELL_HTTP_ERROR_DCACHE_ABORTED = 0x80710082, CELL_HTTP_ERROR_DCACHE_ABORTED = 0x80710082,
CELL_HTTP_ERROR_DCACHE_INDEX_IS_CLOSING = 0x80710083, CELL_HTTP_ERROR_DCACHE_INDEX_IS_CLOSING = 0x80710083,
CELL_HTTP_ERROR_DCACHE_UNKNOWN_INDEX_STATE = 0x80710084, CELL_HTTP_ERROR_DCACHE_UNKNOWN_INDEX_STATE = 0x80710084,
CELL_HTTP_ERROR_NET_FIN = 0x80710091, CELL_HTTP_ERROR_NET_FIN = 0x80710091,
CELL_HTTP_ERROR_NET_CONNECT_TIMEOUT = 0x80710092, CELL_HTTP_ERROR_NET_CONNECT_TIMEOUT = 0x80710092,
CELL_HTTP_ERROR_NET_SELECT_TIMEOUT = 0x80710093, CELL_HTTP_ERROR_NET_SELECT_TIMEOUT = 0x80710093,
CELL_HTTP_ERROR_NET_SEND_TIMEOUT = 0x80710094, CELL_HTTP_ERROR_NET_SEND_TIMEOUT = 0x80710094,
CELL_HTTP_ERROR_NET_RESOLVER = 0x80710100, CELL_HTTP_ERROR_NET_RESOLVER = 0x80710100,
CELL_HTTP_ERROR_NET_ABORT = 0x80710200, CELL_HTTP_ERROR_NET_ABORT = 0x80710200,
CELL_HTTP_ERROR_NET_OPTION = 0x80710300, CELL_HTTP_ERROR_NET_OPTION = 0x80710300,

2
rpcs3/Emu/Cell/Modules/cellHttpUtil.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// libHttp_Util: 0x80711001 - 0x807110ff // libHttp_Util: 0x80711001 - 0x807110ff

6
rpcs3/Emu/Cell/Modules/cellImeJp.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
typedef vm::ptr<void> CellImeJpHandle; typedef vm::ptr<void> CellImeJpHandle;
@ -17,11 +17,9 @@ enum {
CELL_IMEJP_MOVE_CLAUSE_GAP = 8, CELL_IMEJP_MOVE_CLAUSE_GAP = 8,
}; };
//cellImeJpEnterChar, returning values pointed in pOutputStatus. //cellImeJpEnterChar, returning values pointed in pOutputStatus.
enum { enum {
CELL_IMEJP_RET_NONE = 0, CELL_IMEJP_RET_NONE = 0,
CELL_IMEJP_RET_THROUGH = 1, CELL_IMEJP_RET_THROUGH = 1,
CELL_IMEJP_RET_CONFIRMED = 2, CELL_IMEJP_RET_CONFIRMED = 2,
}; };

2
rpcs3/Emu/Cell/Modules/cellJpgDec.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
//Return Codes //Return Codes
enum enum

12
rpcs3/Emu/Cell/Modules/cellJpgEnc.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error Codes // Error Codes
enum enum
@ -11,7 +11,7 @@ enum
CELL_JPGENC_ERROR_EMPTY = 0x80611194, CELL_JPGENC_ERROR_EMPTY = 0x80611194,
CELL_JPGENC_ERROR_RESET = 0x80611195, CELL_JPGENC_ERROR_RESET = 0x80611195,
CELL_JPGENC_ERROR_FATAL = 0x80611196, CELL_JPGENC_ERROR_FATAL = 0x80611196,
CELL_JPGENC_ERROR_STREAM_ABORT = 0x806111A1, CELL_JPGENC_ERROR_STREAM_ABORT = 0x806111A1,
CELL_JPGENC_ERROR_STREAM_SKIP = 0x806111A2, CELL_JPGENC_ERROR_STREAM_SKIP = 0x806111A2,
CELL_JPGENC_ERROR_STREAM_OVERFLOW = 0x806111A3, CELL_JPGENC_ERROR_STREAM_OVERFLOW = 0x806111A3,
@ -26,19 +26,19 @@ enum
CELL_JPGENC_COLOR_SPACE_YCbCr = 3, CELL_JPGENC_COLOR_SPACE_YCbCr = 3,
CELL_JPGENC_COLOR_SPACE_RGBA = 10, CELL_JPGENC_COLOR_SPACE_RGBA = 10,
CELL_JPGENC_COLOR_SPACE_ARGB = 20, CELL_JPGENC_COLOR_SPACE_ARGB = 20,
CELL_JPGENC_SAMPLING_FMT_YCbCr444, CELL_JPGENC_SAMPLING_FMT_YCbCr444,
CELL_JPGENC_SAMPLING_FMT_YCbCr422, CELL_JPGENC_SAMPLING_FMT_YCbCr422,
CELL_JPGENC_SAMPLING_FMT_YCbCr420, CELL_JPGENC_SAMPLING_FMT_YCbCr420,
CELL_JPGENC_SAMPLING_FMT_YCbCr411, CELL_JPGENC_SAMPLING_FMT_YCbCr411,
CELL_JPGENC_SAMPLING_FMT_FULL, CELL_JPGENC_SAMPLING_FMT_FULL,
CELL_JPGENC_DCT_METHOD_QUALITY = 0, CELL_JPGENC_DCT_METHOD_QUALITY = 0,
CELL_JPGENC_DCT_METHOD_FAST = 5, CELL_JPGENC_DCT_METHOD_FAST = 5,
CELL_JPGENC_COMPR_MODE_CONSTANT_QUALITY, CELL_JPGENC_COMPR_MODE_CONSTANT_QUALITY,
CELL_JPGENC_COMPR_MODE_STREAM_SIZE_LIMIT, CELL_JPGENC_COMPR_MODE_STREAM_SIZE_LIMIT,
CELL_JPGENC_LOCATION_FILE, CELL_JPGENC_LOCATION_FILE,
CELL_JPGENC_LOCATION_BUFFER, CELL_JPGENC_LOCATION_BUFFER,
}; };

6
rpcs3/Emu/Cell/Modules/cellKb.cpp
View file

@ -6,7 +6,7 @@
#include "Emu/Io/KeyboardHandler.h" #include "Emu/Io/KeyboardHandler.h"
#include "cellKb.h" #include "cellKb.h"
namespace vm { using namespace ps3; }
extern logs::channel sys_io; extern logs::channel sys_io;
@ -95,8 +95,8 @@ u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode)
// ASCII // ASCII
if (rawcode >= 0x04 && rawcode <= 0x1D) // 'A' - 'Z' if (rawcode >= 0x04 && rawcode <= 0x1D) // 'A' - 'Z'
{ {
rawcode -= rawcode -=
(mkey&(CELL_KB_MKEY_L_SHIFT|CELL_KB_MKEY_R_SHIFT)) ? (mkey&(CELL_KB_MKEY_L_SHIFT|CELL_KB_MKEY_R_SHIFT)) ?
((led&(CELL_KB_LED_CAPS_LOCK)) ? 0 : 0x20) : ((led&(CELL_KB_LED_CAPS_LOCK)) ? 0 : 0x20) :
((led&(CELL_KB_LED_CAPS_LOCK)) ? 0x20 : 0); ((led&(CELL_KB_LED_CAPS_LOCK)) ? 0x20 : 0);
return rawcode + 0x5D; return rawcode + 0x5D;

2
rpcs3/Emu/Cell/Modules/cellKey2char.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
namespace vm { using namespace ps3; }
logs::channel cellKey2char("cellKey2char"); logs::channel cellKey2char("cellKey2char");

2
rpcs3/Emu/Cell/Modules/cellL10n.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// L10nResult // L10nResult
enum enum

2
rpcs3/Emu/Cell/Modules/cellMic.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error Codes // Error Codes
enum enum

2
rpcs3/Emu/Cell/Modules/cellMouse.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
enum enum
{ {

2
rpcs3/Emu/Cell/Modules/cellMsgDialog.h
View file

@ -2,7 +2,7 @@
#include "Utilities/BitField.h" #include "Utilities/BitField.h"
namespace vm { using namespace ps3; }
enum enum
{ {

44
rpcs3/Emu/Cell/Modules/cellMusic.cpp
View file

@ -6,7 +6,7 @@
#include "cellMusic.h" #include "cellMusic.h"
#include "cellSysutil.h" #include "cellSysutil.h"
namespace vm { using namespace ps3; }
logs::channel cellMusic("cellMusic"); logs::channel cellMusic("cellMusic");
@ -18,115 +18,115 @@ struct music2_t
s32 cellMusicGetSelectionContext() s32 cellMusicGetSelectionContext()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicSetSelectionContext2() s32 cellMusicSetSelectionContext2()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicSetVolume2() s32 cellMusicSetVolume2()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicGetContentsId() s32 cellMusicGetContentsId()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicSetSelectionContext() s32 cellMusicSetSelectionContext()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicInitialize2SystemWorkload() s32 cellMusicInitialize2SystemWorkload()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicGetPlaybackStatus2() s32 cellMusicGetPlaybackStatus2()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicGetContentsId2() s32 cellMusicGetContentsId2()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicFinalize() s32 cellMusicFinalize()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicInitializeSystemWorkload() s32 cellMusicInitializeSystemWorkload()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicInitialize() s32 cellMusicInitialize()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicFinalize2() s32 cellMusicFinalize2()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicGetSelectionContext2() s32 cellMusicGetSelectionContext2()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicGetVolume() s32 cellMusicGetVolume()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicGetPlaybackStatus() s32 cellMusicGetPlaybackStatus()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicSetPlaybackCommand2() s32 cellMusicSetPlaybackCommand2()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicSetPlaybackCommand() s32 cellMusicSetPlaybackCommand()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicSelectContents2() s32 cellMusicSelectContents2()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicSelectContents() s32 cellMusicSelectContents()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
@ -155,13 +155,13 @@ s32 cellMusicInitialize2(s32 mode, s32 spuPriority, vm::ptr<CellMusic2Callback>
s32 cellMusicSetVolume() s32 cellMusicSetVolume()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }
s32 cellMusicGetVolume2() s32 cellMusicGetVolume2()
{ {
UNIMPLEMENTED_FUNC(cellMusic); UNIMPLEMENTED_FUNC(cellMusic);
return CELL_OK; return CELL_OK;
} }

4
rpcs3/Emu/Cell/Modules/cellMusic.h
View file

@ -120,8 +120,8 @@ enum
CELL_MUSIC_SELECTION_CONTEXT_SIZE = 2048, CELL_MUSIC_SELECTION_CONTEXT_SIZE = 2048,
}; };
using CellMusicCallback = void(u32 event, vm::ps3::ptr<void> param, vm::ps3::ptr<void> userData); using CellMusicCallback = void(u32 event, vm::ptr<void> param, vm::ptr<void> userData);
using CellMusic2Callback = void(u32 event, vm::ps3::ptr<void> param, vm::ps3::ptr<void> userData); using CellMusic2Callback = void(u32 event, vm::ptr<void> param, vm::ptr<void> userData);
struct CellMusicSelectionContext struct CellMusicSelectionContext
{ {

2
rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
namespace vm { using namespace ps3; }
logs::channel cellMusicDecode("cellMusicDecode"); logs::channel cellMusicDecode("cellMusicDecode");

2
rpcs3/Emu/Cell/Modules/cellMusicExport.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
namespace vm { using namespace ps3; }
logs::channel cellMusicExport("cellMusicExport"); logs::channel cellMusicExport("cellMusicExport");

2
rpcs3/Emu/Cell/Modules/cellNetCtl.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error Codes // Error Codes
enum CellNetCtlError : u32 enum CellNetCtlError : u32

4
rpcs3/Emu/Cell/Modules/cellOskDialog.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
//error codes //error codes
enum enum
@ -92,7 +92,7 @@ enum CellOskDialogType
CELL_OSKDIALOG_TYPE_SEPARATE_CANDIDATE_WINDOW = 8, CELL_OSKDIALOG_TYPE_SEPARATE_CANDIDATE_WINDOW = 8,
}; };
enum enum
{ {
CELL_OSKDIALOG_STRING_SIZE = 512, //Theroretical maxium for osk input, games can specify a lower limit CELL_OSKDIALOG_STRING_SIZE = 512, //Theroretical maxium for osk input, games can specify a lower limit
}; };

2
rpcs3/Emu/Cell/Modules/cellOvis.cpp
View file

@ -2,7 +2,7 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/lv2/sys_spu.h" #include "Emu/Cell/lv2/sys_spu.h"
namespace vm { using namespace ps3; }
logs::channel cellOvis("cellOvis"); logs::channel cellOvis("cellOvis");

2
rpcs3/Emu/Cell/Modules/cellPad.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
enum enum
{ {

8
rpcs3/Emu/Cell/Modules/cellPamf.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error Codes // Error Codes
enum enum
@ -38,7 +38,7 @@ enum
CELL_PAMF_FS_48kHz = 1, CELL_PAMF_FS_48kHz = 1,
}; };
enum enum
{ {
CELL_PAMF_BIT_LENGTH_16 = 1, CELL_PAMF_BIT_LENGTH_16 = 1,
CELL_PAMF_BIT_LENGTH_24 = 3, CELL_PAMF_BIT_LENGTH_24 = 3,
@ -60,7 +60,7 @@ enum
CELL_PAMF_AVC_LEVEL_4P2 = 42, CELL_PAMF_AVC_LEVEL_4P2 = 42,
}; };
enum enum
{ {
CELL_PAMF_AVC_FRC_24000DIV1001 = 0, CELL_PAMF_AVC_FRC_24000DIV1001 = 0,
CELL_PAMF_AVC_FRC_24 = 1, CELL_PAMF_AVC_FRC_24 = 1,
@ -263,7 +263,7 @@ struct PamfStreamHeader
u8 unknown2; u8 unknown2;
be_t<u32> ep_offset; // offset of EP section in header be_t<u32> ep_offset; // offset of EP section in header
be_t<u32> ep_num; // count of EPs be_t<u32> ep_num; // count of EPs
union union
{ {
u8 data[32]; // specific info u8 data[32]; // specific info

6
rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
namespace vm { using namespace ps3; }
logs::channel cellPhotoDecode("cellPhotoDecode"); logs::channel cellPhotoDecode("cellPhotoDecode");
@ -18,14 +18,14 @@ enum
// Datatypes // Datatypes
struct CellPhotoDecodeSetParam struct CellPhotoDecodeSetParam
{ {
u32 dstBuffer_addr; u32 dstBuffer_addr;
u16 width; u16 width;
u16 height; u16 height;
}; };
struct CellPhotoDecodeReturnParam struct CellPhotoDecodeReturnParam
{ {
u16 width; u16 width;
u16 height; u16 height;
}; };

2
rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp
View file

@ -2,7 +2,7 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "cellSysutil.h" #include "cellSysutil.h"
namespace vm { using namespace ps3; }
logs::channel cellPhotoExport("cellPhotoExport"); logs::channel cellPhotoExport("cellPhotoExport");

24
rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
namespace vm { using namespace ps3; }
logs::channel cellPhotoImportUtil("cellPhotoImportUtil"); logs::channel cellPhotoImportUtil("cellPhotoImportUtil");
@ -18,24 +18,24 @@ enum
// Datatypes // Datatypes
struct CellPhotoImportFileDataSub struct CellPhotoImportFileDataSub
{ {
int width; int width;
int height; int height;
//CellPhotoImportFormatType format; //CellPhotoImportFormatType format;
//CellPhotoImportTexRot rotate; //CellPhotoImportTexRot rotate;
}; };
struct CellPhotoImportFileData struct CellPhotoImportFileData
{ {
char dstFileName; //[CELL_FS_MAX_FS_FILE_NAME_LENGTH]; char dstFileName; //[CELL_FS_MAX_FS_FILE_NAME_LENGTH];
char photo_title; //[CELL_PHOTO_IMPORT_PHOTO_TITLE_MAX_LENGTH*3]; char photo_title; //[CELL_PHOTO_IMPORT_PHOTO_TITLE_MAX_LENGTH*3];
char game_title; //[CELL_PHOTO_IMPORT_GAME_TITLE_MAX_SIZE]; char game_title; //[CELL_PHOTO_IMPORT_GAME_TITLE_MAX_SIZE];
char game_comment; //[CELL_PHOTO_IMPORT_GAME_COMMENT_MAX_SIZE]; char game_comment; //[CELL_PHOTO_IMPORT_GAME_COMMENT_MAX_SIZE];
CellPhotoImportFileDataSub* data_sub; CellPhotoImportFileDataSub* data_sub;
}; };
struct CellPhotoImportSetParam struct CellPhotoImportSetParam
{ {
unsigned int fileSizeMax; unsigned int fileSizeMax;
}; };

2
rpcs3/Emu/Cell/Modules/cellPng.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
enum CellPngTxtType : s32 enum CellPngTxtType : s32
{ {

4
rpcs3/Emu/Cell/Modules/cellPngDec.h
View file

@ -1,5 +1,5 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
#include "cellPng.h" #include "cellPng.h"
@ -328,7 +328,7 @@ static s32 getPngDecColourType(u8 type)
static bool cellPngColorSpaceHasAlpha(u32 colorspace) static bool cellPngColorSpaceHasAlpha(u32 colorspace)
{ {
switch (colorspace) switch (colorspace)
{ {
case CELL_PNGDEC_RGBA: case CELL_PNGDEC_RGBA:
case CELL_PNGDEC_ARGB: case CELL_PNGDEC_ARGB:

2
rpcs3/Emu/Cell/Modules/cellRec.cpp
View file

@ -3,7 +3,7 @@
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "cellSysutil.h" #include "cellSysutil.h"
namespace vm { using namespace ps3; }
logs::channel cellRec("cellRec"); logs::channel cellRec("cellRec");

48
rpcs3/Emu/Cell/Modules/cellResc.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
enum enum
{ {
@ -27,33 +27,33 @@ enum
enum CellRescBufferMode enum CellRescBufferMode
{ {
CELL_RESC_720x480 = 0x1, CELL_RESC_720x480 = 0x1,
CELL_RESC_720x576 = 0x2, CELL_RESC_720x576 = 0x2,
CELL_RESC_1280x720 = 0x4, CELL_RESC_1280x720 = 0x4,
CELL_RESC_1920x1080 = 0x8, CELL_RESC_1920x1080 = 0x8,
}; };
enum CellRescPalTemporalMode enum CellRescPalTemporalMode
{ {
CELL_RESC_PAL_50 = 0, CELL_RESC_PAL_50 = 0,
CELL_RESC_PAL_60_DROP = 1, CELL_RESC_PAL_60_DROP = 1,
CELL_RESC_PAL_60_INTERPOLATE = 2, CELL_RESC_PAL_60_INTERPOLATE = 2,
CELL_RESC_PAL_60_INTERPOLATE_30_DROP = 3, CELL_RESC_PAL_60_INTERPOLATE_30_DROP = 3,
CELL_RESC_PAL_60_INTERPOLATE_DROP_FLEXIBLE = 4, CELL_RESC_PAL_60_INTERPOLATE_DROP_FLEXIBLE = 4,
CELL_RESC_PAL_60_FOR_HSYNC = 5, CELL_RESC_PAL_60_FOR_HSYNC = 5,
}; };
enum CellRescRatioConvertMode enum CellRescRatioConvertMode
{ {
CELL_RESC_FULLSCREEN = 0, CELL_RESC_FULLSCREEN = 0,
CELL_RESC_LETTERBOX = 1, CELL_RESC_LETTERBOX = 1,
CELL_RESC_PANSCAN = 2, CELL_RESC_PANSCAN = 2,
}; };
enum CellRescFlipMode enum CellRescFlipMode
{ {
CELL_RESC_DISPLAY_VSYNC = 0, CELL_RESC_DISPLAY_VSYNC = 0,
CELL_RESC_DISPLAY_HSYNC = 1, CELL_RESC_DISPLAY_HSYNC = 1,
}; };
enum CellRescDstFormat enum CellRescDstFormat
@ -64,18 +64,18 @@ enum CellRescDstFormat
enum CellRescResourcePolicy enum CellRescResourcePolicy
{ {
CELL_RESC_CONSTANT_VRAM = 0x0, CELL_RESC_CONSTANT_VRAM = 0x0,
CELL_RESC_MINIMUM_VRAM = 0x1, CELL_RESC_MINIMUM_VRAM = 0x1,
CELL_RESC_MINIMUM_GPU_LOAD = 0x2, CELL_RESC_MINIMUM_GPU_LOAD = 0x2,
}; };
enum CellRescConvolutionFilterMode enum CellRescConvolutionFilterMode
{ {
CELL_RESC_NORMAL_BILINEAR = 0, CELL_RESC_NORMAL_BILINEAR = 0,
CELL_RESC_INTERLACE_FILTER = 1, CELL_RESC_INTERLACE_FILTER = 1,
CELL_RESC_3X3_GAUSSIAN = 2, CELL_RESC_3X3_GAUSSIAN = 2,
CELL_RESC_2X3_QUINCUNX = 3, CELL_RESC_2X3_QUINCUNX = 3,
CELL_RESC_2X3_QUINCUNX_ALT = 4, CELL_RESC_2X3_QUINCUNX_ALT = 4,
}; };
struct CellRescDsts struct CellRescDsts

2
rpcs3/Emu/Cell/Modules/cellRtc.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Return Codes // Return Codes
enum enum

2
rpcs3/Emu/Cell/Modules/cellRudp.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Return Codes // Return Codes
enum enum

10
rpcs3/Emu/Cell/Modules/cellSail.h
View file

@ -2,7 +2,7 @@
#include "cellVpost.h" #include "cellVpost.h"
namespace vm { using namespace ps3; }
// Error Codes // Error Codes
enum enum
@ -157,8 +157,8 @@ enum
_CELL_SAIL_PARAMETER_TYPE_NUM_OF_ELEMENTS = 36, // Should be never used _CELL_SAIL_PARAMETER_TYPE_NUM_OF_ELEMENTS = 36, // Should be never used
CELL_SAIL_PARAMETER_SOURCE_PPU_THREAD_PRIORITY = CELL_SAIL_PARAMETER_IO_PPU_THREAD_PRIORITY, CELL_SAIL_PARAMETER_SOURCE_PPU_THREAD_PRIORITY = CELL_SAIL_PARAMETER_IO_PPU_THREAD_PRIORITY,
CELL_SAIL_PARAMETER_DMUX_SPURS_TASK_PRIORITY = CELL_SAIL_PARAMETER_DMUX_SPURS_TASK_PRIORITIES, // Deprecated CELL_SAIL_PARAMETER_DMUX_SPURS_TASK_PRIORITY = CELL_SAIL_PARAMETER_DMUX_SPURS_TASK_PRIORITIES, // Deprecated
CELL_SAIL_PARAMETER_VDEC_SPURS_TASK_PRIORITY = CELL_SAIL_PARAMETER_VDEC_SPURS_TASK_PRIORITIES, // Deprecated CELL_SAIL_PARAMETER_VDEC_SPURS_TASK_PRIORITY = CELL_SAIL_PARAMETER_VDEC_SPURS_TASK_PRIORITIES, // Deprecated
CELL_SAIL_PARAMETER_ADEC_SPURS_TASK_PRIORITY = CELL_SAIL_PARAMETER_ADEC_SPURS_TASK_PRIORITIES, // Deprecated CELL_SAIL_PARAMETER_ADEC_SPURS_TASK_PRIORITY = CELL_SAIL_PARAMETER_ADEC_SPURS_TASK_PRIORITIES, // Deprecated
CELL_SAIL_PARAMETER_VPOST_SPURS_TASK_PRIORITY = CELL_SAIL_PARAMETER_VPOST_SPURS_TASK_PRIORITIES, // Deprecated CELL_SAIL_PARAMETER_VPOST_SPURS_TASK_PRIORITY = CELL_SAIL_PARAMETER_VPOST_SPURS_TASK_PRIORITIES, // Deprecated
}; };
@ -367,7 +367,7 @@ enum
// 5. Back Right // 5. Back Right
// 6. Back Center // 6. Back Center
// 7. LFE // 7. LFE
// (for at3plus) // (for at3plus)
CELL_SAIL_AUDIO_CH_LAYOUT_7CH_LCRxycE = 10, CELL_SAIL_AUDIO_CH_LAYOUT_7CH_LCRxycE = 10,
// 1. Front Left // 1. Front Left
@ -1035,7 +1035,7 @@ struct CellSailAviMediaType
union u { union u {
struct audio { struct audio {
be_t<u16> formatTag; be_t<u16> formatTag;
be_t<u16> reserved; // Specify 0 be_t<u16> reserved; // Specify 0
union u { union u {
struct mpeg { struct mpeg {
be_t<u16> headLayer; // Specify 0 be_t<u16> headLayer; // Specify 0

78
rpcs3/Emu/Cell/Modules/cellSaveData.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Return codes // Return codes
enum enum
@ -16,7 +16,7 @@ enum
CELL_SAVEDATA_ERROR_NOUSER = 0x8002b409, CELL_SAVEDATA_ERROR_NOUSER = 0x8002b409,
CELL_SAVEDATA_ERROR_SIZEOVER = 0x8002b40a, CELL_SAVEDATA_ERROR_SIZEOVER = 0x8002b40a,
CELL_SAVEDATA_ERROR_NODATA = 0x8002b40b, CELL_SAVEDATA_ERROR_NODATA = 0x8002b40b,
CELL_SAVEDATA_ERROR_NOTSUPPORTED = 0x8002b40c, CELL_SAVEDATA_ERROR_NOTSUPPORTED = 0x8002b40c,
}; };
// Callback return codes // Callback return codes
@ -97,7 +97,7 @@ enum
// Datatypes // Datatypes
struct CellSaveDataSetList struct CellSaveDataSetList
{ {
be_t<u32> sortType; be_t<u32> sortType;
be_t<u32> sortOrder; be_t<u32> sortOrder;
vm::bptr<char> dirNamePrefix; vm::bptr<char> dirNamePrefix;
@ -105,7 +105,7 @@ struct CellSaveDataSetList
}; };
struct CellSaveDataSetBuf struct CellSaveDataSetBuf
{ {
be_t<u32> dirListMax; be_t<u32> dirListMax;
be_t<u32> fileListMax; be_t<u32> fileListMax;
be_t<u32> reserved[6]; be_t<u32> reserved[6];
@ -113,16 +113,16 @@ struct CellSaveDataSetBuf
vm::bptr<void> buf; vm::bptr<void> buf;
}; };
struct CellSaveDataNewDataIcon struct CellSaveDataNewDataIcon
{ {
vm::bptr<char> title; vm::bptr<char> title;
be_t<u32> iconBufSize; be_t<u32> iconBufSize;
vm::bptr<void> iconBuf; vm::bptr<void> iconBuf;
vm::bptr<void> reserved; vm::bptr<void> reserved;
}; };
struct CellSaveDataListNewData struct CellSaveDataListNewData
{ {
be_t<u32> iconPosition; be_t<u32> iconPosition;
vm::bptr<char> dirName; vm::bptr<char> dirName;
vm::bptr<CellSaveDataNewDataIcon> icon; vm::bptr<CellSaveDataNewDataIcon> icon;
@ -130,14 +130,14 @@ struct CellSaveDataListNewData
}; };
struct CellSaveDataDirList struct CellSaveDataDirList
{ {
char dirName[CELL_SAVEDATA_DIRNAME_SIZE]; char dirName[CELL_SAVEDATA_DIRNAME_SIZE];
char listParam[CELL_SAVEDATA_SYSP_LPARAM_SIZE]; char listParam[CELL_SAVEDATA_SYSP_LPARAM_SIZE];
char reserved[8]; char reserved[8];
}; };
struct CellSaveDataListGet struct CellSaveDataListGet
{ {
be_t<u32> dirNum; be_t<u32> dirNum;
be_t<u32> dirListNum; be_t<u32> dirListNum;
vm::bptr<CellSaveDataDirList> dirList; vm::bptr<CellSaveDataDirList> dirList;
@ -145,7 +145,7 @@ struct CellSaveDataListGet
}; };
struct CellSaveDataListSet struct CellSaveDataListSet
{ {
be_t<u32> focusPosition; be_t<u32> focusPosition;
vm::bptr<char> focusDirName; vm::bptr<char> focusDirName;
be_t<u32> fixedListNum; be_t<u32> fixedListNum;
@ -155,45 +155,45 @@ struct CellSaveDataListSet
}; };
struct CellSaveDataFixedSet struct CellSaveDataFixedSet
{ {
vm::bptr<char> dirName; vm::bptr<char> dirName;
vm::bptr<CellSaveDataNewDataIcon> newIcon; vm::bptr<CellSaveDataNewDataIcon> newIcon;
be_t<u32> option; be_t<u32> option;
}; };
struct CellSaveDataSystemFileParam struct CellSaveDataSystemFileParam
{ {
char title[CELL_SAVEDATA_SYSP_TITLE_SIZE]; char title[CELL_SAVEDATA_SYSP_TITLE_SIZE];
char subTitle[CELL_SAVEDATA_SYSP_SUBTITLE_SIZE]; char subTitle[CELL_SAVEDATA_SYSP_SUBTITLE_SIZE];
char detail[CELL_SAVEDATA_SYSP_DETAIL_SIZE]; char detail[CELL_SAVEDATA_SYSP_DETAIL_SIZE];
be_t<u32> attribute; be_t<u32> attribute;
char reserved2[4]; char reserved2[4];
char listParam[CELL_SAVEDATA_SYSP_LPARAM_SIZE]; char listParam[CELL_SAVEDATA_SYSP_LPARAM_SIZE];
char reserved[256]; char reserved[256];
}; };
struct CellSaveDataDirStat struct CellSaveDataDirStat
{ {
be_t<s64> atime; be_t<s64> atime;
be_t<s64> mtime; be_t<s64> mtime;
be_t<s64> ctime; be_t<s64> ctime;
char dirName[CELL_SAVEDATA_DIRNAME_SIZE]; char dirName[CELL_SAVEDATA_DIRNAME_SIZE];
}; };
struct CellSaveDataFileStat struct CellSaveDataFileStat
{ {
be_t<u32> fileType; be_t<u32> fileType;
char reserved1[4]; char reserved1[4];
be_t<u64> size; be_t<u64> size;
be_t<s64> atime; be_t<s64> atime;
be_t<s64> mtime; be_t<s64> mtime;
be_t<s64> ctime; be_t<s64> ctime;
char fileName[CELL_SAVEDATA_FILENAME_SIZE]; char fileName[CELL_SAVEDATA_FILENAME_SIZE];
char reserved2[3]; char reserved2[3];
}; };
struct CellSaveDataStatGet struct CellSaveDataStatGet
{ {
be_t<s32> hddFreeSizeKB; be_t<s32> hddFreeSizeKB;
be_t<u32> isNewData; be_t<u32> isNewData;
CellSaveDataDirStat dir; CellSaveDataDirStat dir;
@ -208,7 +208,7 @@ struct CellSaveDataStatGet
}; };
struct CellSaveDataAutoIndicator struct CellSaveDataAutoIndicator
{ {
be_t<u32> dispPosition; be_t<u32> dispPosition;
be_t<u32> dispMode; be_t<u32> dispMode;
vm::bptr<char> dispMsg; vm::bptr<char> dispMsg;
@ -217,25 +217,25 @@ struct CellSaveDataAutoIndicator
vm::bptr<void> reserved; vm::bptr<void> reserved;
}; };
struct CellSaveDataStatSet struct CellSaveDataStatSet
{ {
vm::bptr<CellSaveDataSystemFileParam> setParam; vm::bptr<CellSaveDataSystemFileParam> setParam;
be_t<u32> reCreateMode; be_t<u32> reCreateMode;
vm::bptr<CellSaveDataAutoIndicator> indicator; vm::bptr<CellSaveDataAutoIndicator> indicator;
}; };
struct CellSaveDataFileGet struct CellSaveDataFileGet
{ {
be_t<u32> excSize; be_t<u32> excSize;
char reserved[64]; char reserved[64];
}; };
struct CellSaveDataFileSet struct CellSaveDataFileSet
{ {
be_t<u32> fileOperation; be_t<u32> fileOperation;
vm::bptr<void> reserved; vm::bptr<void> reserved;
be_t<u32> fileType; be_t<u32> fileType;
u8 secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE]; u8 secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE];
vm::bptr<char> fileName; vm::bptr<char> fileName;
be_t<u32> fileOffset; be_t<u32> fileOffset;
be_t<u32> fileSize; be_t<u32> fileSize;
@ -243,8 +243,8 @@ struct CellSaveDataFileSet
vm::bptr<void> fileBuf; vm::bptr<void> fileBuf;
}; };
struct CellSaveDataCBResult struct CellSaveDataCBResult
{ {
be_t<s32> result; be_t<s32> result;
be_t<u32> progressBarInc; be_t<u32> progressBarInc;
be_t<s32> errNeedSizeKB; be_t<s32> errNeedSizeKB;
@ -253,9 +253,9 @@ struct CellSaveDataCBResult
}; };
struct CellSaveDataDoneGet struct CellSaveDataDoneGet
{ {
be_t<s32> excResult; be_t<s32> excResult;
char dirName[CELL_SAVEDATA_DIRNAME_SIZE]; char dirName[CELL_SAVEDATA_DIRNAME_SIZE];
be_t<s32> sizeKB; be_t<s32> sizeKB;
be_t<s32> hddFreeSizeKB; be_t<s32> hddFreeSizeKB;
char reserved[64]; char reserved[64];

2
rpcs3/Emu/Cell/Modules/cellScreenshot.cpp
View file

@ -4,7 +4,7 @@
#include "cellScreenshot.h" #include "cellScreenshot.h"
namespace vm { using namespace ps3; }
logs::channel cellScreenshot("cellScreenshot"); logs::channel cellScreenshot("cellScreenshot");

6
rpcs3/Emu/Cell/Modules/cellScreenshot.h
View file

@ -12,7 +12,7 @@ enum
struct CellScreenShotSetParam struct CellScreenShotSetParam
{ {
vm::ps3::bcptr<char> photo_title; vm::bcptr<char> photo_title;
vm::ps3::bcptr<char> game_title; vm::bcptr<char> game_title;
vm::ps3::bcptr<char> game_comment; vm::bcptr<char> game_comment;
}; };

2
rpcs3/Emu/Cell/Modules/cellSearch.h
View file

@ -226,7 +226,7 @@ enum CellSearchSharableType : s32
}; };
using CellSearchId = s32; using CellSearchId = s32;
using CellSearchSystemCallback = void(CellSearchEvent event, s32 result, vm::ps3::cptr<void> param, vm::ps3::ptr<void> userData); using CellSearchSystemCallback = void(CellSearchEvent event, s32 result, vm::cptr<void> param, vm::ptr<void> userData);
struct CellSearchContentId struct CellSearchContentId
{ {

2
rpcs3/Emu/Cell/Modules/cellSpudll.cpp
View file

@ -3,7 +3,7 @@
#include "cellSpudll.h" #include "cellSpudll.h"
namespace vm { using namespace ps3; }
logs::channel cellSpudll("cellSpudll"); logs::channel cellSpudll("cellSpudll");

6
rpcs3/Emu/Cell/Modules/cellSpudll.h
View file

@ -17,8 +17,8 @@ struct CellSpudllHandleConfig
be_t<u32> dmaTag; be_t<u32> dmaTag;
be_t<u32> numMaxReferred; be_t<u32> numMaxReferred;
be_t<u32> numMaxDepend; be_t<u32> numMaxDepend;
vm::ps3::bptr<void> unresolvedSymbolValueForFunc; vm::bptr<void> unresolvedSymbolValueForFunc;
vm::ps3::bptr<void> unresolvedSymbolValueForObject; vm::bptr<void> unresolvedSymbolValueForObject;
vm::ps3::bptr<void> unresolvedSymbolValueForOther; vm::bptr<void> unresolvedSymbolValueForOther;
be_t<u32> __reserved__[9]; be_t<u32> __reserved__[9];
}; };

4
rpcs3/Emu/Cell/Modules/cellSpurs.h
View file

@ -2,7 +2,7 @@
#include "cellSync.h" #include "cellSync.h"
namespace vm { using namespace ps3; }
struct CellSpurs; struct CellSpurs;
struct CellSpursTaskset; struct CellSpursTaskset;
@ -671,7 +671,7 @@ struct alignas(16) CellSpursTaskAttribute2
be_t<u64> eaContext; be_t<u64> eaContext;
CellSpursTaskLsPattern lsPattern; CellSpursTaskLsPattern lsPattern;
vm::bcptr<char> name; vm::bcptr<char> name;
u8 reserved[220]; u8 reserved[220];
}; };

2
rpcs3/Emu/Cell/Modules/cellSpursJq.h
View file

@ -1,3 +1 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }

2
rpcs3/Emu/Cell/Modules/cellSsl.cpp
View file

@ -9,7 +9,7 @@
logs::channel cellSsl("cellSsl"); logs::channel cellSsl("cellSsl");
namespace vm { using namespace ps3; }
enum SpecialCerts { BaltimoreCert = 6, Class3G2V2Cert = 13, ClassSSV4Cert = 15, EntrustNetCert = 18, GTECyberTrustGlobalCert = 23 }; enum SpecialCerts { BaltimoreCert = 6, Class3G2V2Cert = 13, ClassSSV4Cert = 15, EntrustNetCert = 18, GTECyberTrustGlobalCert = 23 };

2
rpcs3/Emu/Cell/Modules/cellStorage.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
namespace vm { using namespace ps3; }
extern logs::channel cellSysutil; extern logs::channel cellSysutil;

2
rpcs3/Emu/Cell/Modules/cellSubDisplay.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Return Codes // Return Codes
enum CellSubDisplayError : u32 enum CellSubDisplayError : u32

2
rpcs3/Emu/Cell/Modules/cellSync.h
View file

@ -2,7 +2,7 @@
#include "Utilities/BitField.h" #include "Utilities/BitField.h"
namespace vm { using namespace ps3; }
// Return Codes // Return Codes
enum CellSyncError : u32 enum CellSyncError : u32

2
rpcs3/Emu/Cell/Modules/cellSync2.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Return Codes // Return Codes
enum enum

2
rpcs3/Emu/Cell/Modules/cellSysconf.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
typedef void(CellSysconfCallback)(s32 result, vm::ptr<void> userdata); typedef void(CellSysconfCallback)(s32 result, vm::ptr<void> userdata);

6
rpcs3/Emu/Cell/Modules/cellSysutil.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
enum enum
{ {
@ -141,9 +141,9 @@ enum
enum enum
{ {
CELL_SYSCACHE_RET_OK_CLEARED = 0, CELL_SYSCACHE_RET_OK_CLEARED = 0,
CELL_SYSCACHE_RET_OK_RELAYED = 1, CELL_SYSCACHE_RET_OK_RELAYED = 1,
CELL_SYSCACHE_ID_SIZE = 32, CELL_SYSCACHE_ID_SIZE = 32,
CELL_SYSCACHE_PATH_MAX = 1055, CELL_SYSCACHE_PATH_MAX = 1055,
CELL_SYSCACHE_ERROR_ACCESS_ERROR = 0x8002bc01, // I don't think we need this CELL_SYSCACHE_ERROR_ACCESS_ERROR = 0x8002bc01, // I don't think we need this

2
rpcs3/Emu/Cell/Modules/cellSysutilAp.cpp
View file

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
namespace vm { using namespace ps3; }
logs::channel cellSysutilAp("cellSysutilAp"); logs::channel cellSysutilAp("cellSysutilAp");

2
rpcs3/Emu/Cell/Modules/cellSysutilAvc2.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error codes // Error codes
enum CellSysutilAvc2Error : u32 enum CellSysutilAvc2Error : u32

2
rpcs3/Emu/Cell/Modules/cellUsbd.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Return Codes // Return Codes
enum enum

2
rpcs3/Emu/Cell/Modules/cellUserInfo.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error Codes // Error Codes
enum CellUserInfoError : u32 enum CellUserInfoError : u32

4
rpcs3/Emu/Cell/Modules/cellVdec.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error Codes // Error Codes
enum enum
@ -129,7 +129,7 @@ struct CellVdecResourceEx
}; };
// Access Unit Information // Access Unit Information
struct CellVdecAuInfo struct CellVdecAuInfo
{ {
be_t<u32> startAddr; be_t<u32> startAddr;
be_t<u32> size; be_t<u32> size;

2
rpcs3/Emu/Cell/Modules/cellVideoExport.cpp
View file

@ -3,7 +3,7 @@
#include "cellSysutil.h" #include "cellSysutil.h"
namespace vm { using namespace ps3; }
logs::channel cellVideoExport("cellVideoExport"); logs::channel cellVideoExport("cellVideoExport");

2
rpcs3/Emu/Cell/Modules/cellVideoOut.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
#include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/ErrorCodes.h"

20
rpcs3/Emu/Cell/Modules/cellVideoUpload.h
View file

@ -9,27 +9,27 @@ struct CellVideoUploadOption
struct CellVideoUploadParam struct CellVideoUploadParam
{ {
be_t<s32> siteID; be_t<s32> siteID;
vm::ps3::bcptr<char> pFilePath; vm::bcptr<char> pFilePath;
union union
{ {
struct struct
{ {
vm::ps3::bcptr<char> pClientId; vm::bcptr<char> pClientId;
vm::ps3::bcptr<char> pDeveloperKey; vm::bcptr<char> pDeveloperKey;
vm::ps3::bcptr<char> pTitle_UTF8; vm::bcptr<char> pTitle_UTF8;
vm::ps3::bcptr<char> pDescription_UTF8; vm::bcptr<char> pDescription_UTF8;
vm::ps3::bcptr<char> pKeyword_1_UTF8; vm::bcptr<char> pKeyword_1_UTF8;
vm::ps3::bcptr<char> pKeyword_2_UTF8; vm::bcptr<char> pKeyword_2_UTF8;
vm::ps3::bcptr<char> pKeyword_3_UTF8; vm::bcptr<char> pKeyword_3_UTF8;
u8 isPrivate; u8 isPrivate;
u8 rating; u8 rating;
} youtube; } youtube;
} u; } u;
be_t<s32> numOfOption; be_t<s32> numOfOption;
vm::ps3::bptr<CellVideoUploadOption> pOption; vm::bptr<CellVideoUploadOption> pOption;
}; };
using CellVideoUploadCallback = void(s32 status, s32 errorCode, vm::ps3::cptr<char> pResultURL, vm::ps3::ptr<void> userdata); using CellVideoUploadCallback = void(s32 status, s32 errorCode, vm::cptr<char> pResultURL, vm::ptr<void> userdata);
enum enum
{ {

18
rpcs3/Emu/Cell/Modules/cellVoice.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// libvoice = 0x80310801 - 0x803108ff // libvoice = 0x80310801 - 0x803108ff
// libvoice version 100 // libvoice version 100
@ -37,7 +37,7 @@ enum
CELLVOICE_GAME_1MB_MAX_OUT_VOICE_PORT = 2, CELLVOICE_GAME_1MB_MAX_OUT_VOICE_PORT = 2,
CELLVOICE_MAX_PORT = 128, CELLVOICE_MAX_PORT = 128,
CELLVOICE_INVALID_PORT_ID = 0xff, CELLVOICE_INVALID_PORT_ID = 0xff,
CELLVOICE_PORTTYPE_NULL = -1, CELLVOICE_PORTTYPE_NULL = -1,
CELLVOICE_PORTTYPE_IN_MIC = 0, CELLVOICE_PORTTYPE_IN_MIC = 0,
CELLVOICE_PORTTYPE_IN_PCMAUDIO = 1, CELLVOICE_PORTTYPE_IN_PCMAUDIO = 1,
@ -45,13 +45,13 @@ enum
CELLVOICE_PORTTYPE_OUT_PCMAUDIO = 3, CELLVOICE_PORTTYPE_OUT_PCMAUDIO = 3,
CELLVOICE_PORTTYPE_OUT_VOICE = 4, CELLVOICE_PORTTYPE_OUT_VOICE = 4,
CELLVOICE_PORTTYPE_OUT_SECONDARY = 5, CELLVOICE_PORTTYPE_OUT_SECONDARY = 5,
CELLVOICE_PORTSTATE_NULL = -1, CELLVOICE_PORTSTATE_NULL = -1,
CELLVOICE_PORTSTATE_IDLE = 0, CELLVOICE_PORTSTATE_IDLE = 0,
CELLVOICE_PORTSTATE_READY = 1, CELLVOICE_PORTSTATE_READY = 1,
CELLVOICE_PORTSTATE_BUFFERING = 2, CELLVOICE_PORTSTATE_BUFFERING = 2,
CELLVOICE_PORTSTATE_RUNNING = 3, CELLVOICE_PORTSTATE_RUNNING = 3,
CELLVOICE_BITRATE_NULL = -1, CELLVOICE_BITRATE_NULL = -1,
CELLVOICE_BITRATE_3850 = 3850, CELLVOICE_BITRATE_3850 = 3850,
CELLVOICE_BITRATE_4650 = 4650, CELLVOICE_BITRATE_4650 = 4650,
@ -60,10 +60,10 @@ enum
CELLVOICE_BITRATE_14400 = 14400, CELLVOICE_BITRATE_14400 = 14400,
CELLVOICE_BITRATE_16000 = 16000, CELLVOICE_BITRATE_16000 = 16000,
CELLVOICE_BITRATE_22533 = 22533, CELLVOICE_BITRATE_22533 = 22533,
CELLVOICE_SAMPLINGRATE_NULL = -1, CELLVOICE_SAMPLINGRATE_NULL = -1,
CELLVOICE_SAMPLINGRATE_16000 = 16000, CELLVOICE_SAMPLINGRATE_16000 = 16000,
CELLVOICE_EVENT_DATA_ERROR = 1 << 0, CELLVOICE_EVENT_DATA_ERROR = 1 << 0,
CELLVOICE_EVENT_PORT_ATTACHED = 1 << 1, CELLVOICE_EVENT_PORT_ATTACHED = 1 << 1,
CELLVOICE_EVENT_PORT_DETACHED = 1 << 2, CELLVOICE_EVENT_PORT_DETACHED = 1 << 2,
@ -71,7 +71,7 @@ enum
CELLVOICE_EVENT_SERVICE_DETACHED = 1 << 4, CELLVOICE_EVENT_SERVICE_DETACHED = 1 << 4,
CELLVOICE_EVENT_PORT_WEAK_ATTACHED = 1 << 5, CELLVOICE_EVENT_PORT_WEAK_ATTACHED = 1 << 5,
CELLVOICE_EVENT_PORT_WEAK_DETACHED = 1 << 6, CELLVOICE_EVENT_PORT_WEAK_DETACHED = 1 << 6,
CELLVOICE_PCM_NULL = -1, CELLVOICE_PCM_NULL = -1,
CELLVOICE_PCM_FLOAT = 0, CELLVOICE_PCM_FLOAT = 0,
CELLVOICE_PCM_FLOAT_LITTLE_ENDIAN = 1, CELLVOICE_PCM_FLOAT_LITTLE_ENDIAN = 1,
@ -79,13 +79,13 @@ enum
CELLVOICE_PCM_SHORT_LITTLE_ENDIAN = 3, CELLVOICE_PCM_SHORT_LITTLE_ENDIAN = 3,
CELLVOICE_PCM_INTEGER = 4, CELLVOICE_PCM_INTEGER = 4,
CELLVOICE_PCM_INTEGER_LITTLE_ENDIAN = 5, CELLVOICE_PCM_INTEGER_LITTLE_ENDIAN = 5,
CELLVOICE_ATTR_ENERGY_LEVEL = 1000, CELLVOICE_ATTR_ENERGY_LEVEL = 1000,
CELLVOICE_ATTR_VAD = 1001, CELLVOICE_ATTR_VAD = 1001,
CELLVOICE_ATTR_DTX = 1002, CELLVOICE_ATTR_DTX = 1002,
CELLVOICE_ATTR_AUTO_RESAMPLE = 1003, CELLVOICE_ATTR_AUTO_RESAMPLE = 1003,
CELLVOICE_ATTR_LATENCY = 1004, CELLVOICE_ATTR_LATENCY = 1004,
CELLVOICE_ATTR_SILENCE_THRESHOLD = 1005, CELLVOICE_ATTR_SILENCE_THRESHOLD = 1005,
CELLVOICE_APPTYPE_GAME_1MB = 1 << 29 CELLVOICE_APPTYPE_GAME_1MB = 1 << 29
}; };

2
rpcs3/Emu/Cell/Modules/cellVpost.h
View file

@ -5,7 +5,7 @@ extern "C"
#include "libswscale/swscale.h" #include "libswscale/swscale.h"
} }
namespace vm { using namespace ps3; }
// Error Codes // Error Codes
enum enum

28
rpcs3/Emu/Cell/Modules/libmixer.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error Codes // Error Codes
enum enum
@ -118,10 +118,10 @@ struct CellSSPlayerConfig
{ {
be_t<u32> channels; be_t<u32> channels;
be_t<u32> outputMode; be_t<u32> outputMode;
}; };
struct CellSSPlayerWaveParam struct CellSSPlayerWaveParam
{ {
be_t<u32> addr; be_t<u32> addr;
be_t<s32> format; be_t<s32> format;
be_t<u32> samples; be_t<u32> samples;
@ -129,28 +129,28 @@ struct CellSSPlayerWaveParam
be_t<u32> startOffset; be_t<u32> startOffset;
}; };
struct CellSSPlayerCommonParam struct CellSSPlayerCommonParam
{ {
be_t<u32> loopMode; be_t<u32> loopMode;
be_t<u32> attackMode; be_t<u32> attackMode;
}; };
struct CellSurMixerPosition struct CellSurMixerPosition
{ {
be_t<float> x; be_t<float> x;
be_t<float> y; be_t<float> y;
be_t<float> z; be_t<float> z;
}; };
struct CellSSPlayerRuntimeInfo struct CellSSPlayerRuntimeInfo
{ {
be_t<float> level; be_t<float> level;
be_t<float> speed; be_t<float> speed;
CellSurMixerPosition position; CellSurMixerPosition position;
}; };
struct CellSurMixerConfig struct CellSurMixerConfig
{ {
be_t<s32> priority; be_t<s32> priority;
be_t<u32> chStrips1; be_t<u32> chStrips1;
be_t<u32> chStrips2; be_t<u32> chStrips2;
@ -158,8 +158,8 @@ struct CellSurMixerConfig
be_t<u32> chStrips8; be_t<u32> chStrips8;
}; };
struct CellSurMixerChStripParam struct CellSurMixerChStripParam
{ {
be_t<u32> param; be_t<u32> param;
be_t<u32> attribute_addr; be_t<u32> attribute_addr;
be_t<s32> dBSwitch; be_t<s32> dBSwitch;

2
rpcs3/Emu/Cell/Modules/libsnd3.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error Codes // Error Codes
enum enum

2
rpcs3/Emu/Cell/Modules/libsynth2.cpp
View file

@ -3,7 +3,7 @@
#include "libsynth2.h" #include "libsynth2.h"
namespace vm { using namespace ps3; }
logs::channel libsynth2("libsynth2"); logs::channel libsynth2("libsynth2");

2
rpcs3/Emu/Cell/Modules/sceNp.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
#include "cellRtc.h" #include "cellRtc.h"

2
rpcs3/Emu/Cell/Modules/sceNp2.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error codes // Error codes
enum enum

2
rpcs3/Emu/Cell/Modules/sceNpClans.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Return codes // Return codes
enum enum

2
rpcs3/Emu/Cell/Modules/sceNpCommerce2.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
#include "cellRtc.h" #include "cellRtc.h"

2
rpcs3/Emu/Cell/Modules/sceNpMatchingInt.cpp
View file

@ -2,7 +2,7 @@
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
namespace vm { using namespace ps3; }
logs::channel sceNpMatchingInt("sceNpMatchingInt"); logs::channel sceNpMatchingInt("sceNpMatchingInt");

2
rpcs3/Emu/Cell/Modules/sceNpSns.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Return codes // Return codes
enum sceNpSnsError : u32 enum sceNpSnsError : u32

2
rpcs3/Emu/Cell/Modules/sceNpTrophy.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
// Error codes // Error codes
enum SceNpTrophyError : u32 enum SceNpTrophyError : u32

2
rpcs3/Emu/Cell/Modules/sceNpTus.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
#include "cellRtc.h" #include "cellRtc.h"

2
rpcs3/Emu/Cell/Modules/sysPrxForUser.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
namespace vm { using namespace ps3; }
using spu_printf_cb_t = vm::ptr<s32(u32 arg)>; using spu_printf_cb_t = vm::ptr<s32(u32 arg)>;

2
rpcs3/Emu/Cell/Modules/sys_libc.cpp
View file

@ -3,7 +3,7 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/PPUOpcodes.h" #include "Emu/Cell/PPUOpcodes.h"
namespace vm { using namespace ps3; }
logs::channel sys_libc("sys_libc"); logs::channel sys_libc("sys_libc");

8
rpcs3/Emu/Cell/Modules/sys_libc_.cpp
View file

@ -4,7 +4,7 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
namespace vm { using namespace ps3; }
extern logs::channel sysPrxForUser; extern logs::channel sysPrxForUser;
@ -37,7 +37,7 @@ struct ps3_fmt_src
std::size_t fmt_string(std::string& out, std::size_t extra) const std::size_t fmt_string(std::string& out, std::size_t extra) const
{ {
const std::size_t start = out.size(); const std::size_t start = out.size();
out += vm::ps3::_ptr<const char>(get<u32>(extra)); out += vm::_ptr<const char>(get<u32>(extra));
return out.size() - start; return out.size() - start;
} }
@ -339,7 +339,7 @@ vm::ptr<char> _sys_strncpy(vm::ptr<char> dst, vm::cptr<char> src, s32 len)
s32 _sys_strncasecmp(vm::cptr<char> str1, vm::cptr<char> str2, u32 n) s32 _sys_strncasecmp(vm::cptr<char> str1, vm::cptr<char> str2, u32 n)
{ {
sysPrxForUser.trace("_sys_strncasecmp(str1=%s, str2=%s, n=%d)", str1, str2, n); sysPrxForUser.trace("_sys_strncasecmp(str1=%s, str2=%s, n=%d)", str1, str2, n);
for (u32 i = 0; i < n; i++) for (u32 i = 0; i < n; i++)
{ {
const int ch1 = _sys_tolower(str1[i]), ch2 = _sys_tolower(str2[i]); const int ch1 = _sys_tolower(str1[i]), ch2 = _sys_tolower(str2[i]);
@ -356,7 +356,7 @@ s32 _sys_strncasecmp(vm::cptr<char> str1, vm::cptr<char> str2, u32 n)
vm::cptr<char> _sys_strrchr(vm::cptr<char> str, char ch) vm::cptr<char> _sys_strrchr(vm::cptr<char> str, char ch)
{ {
sysPrxForUser.trace("_sys_strrchr(str=%s, ch=%d)", str, ch); sysPrxForUser.trace("_sys_strrchr(str=%s, ch=%d)", str, ch);
vm::cptr<char> res = vm::null; vm::cptr<char> res = vm::null;
for (u32 i = 0;; i++) for (u32 i = 0;; i++)

2
rpcs3/Emu/Cell/Modules/sys_lv2dbg.h
View file

@ -9,7 +9,7 @@
#include "Emu/Cell/lv2/sys_lwcond.h" #include "Emu/Cell/lv2/sys_lwcond.h"
#include "Emu/Cell/lv2/sys_event_flag.h" #include "Emu/Cell/lv2/sys_event_flag.h"
namespace vm { using namespace ps3; }
// Error Codes // Error Codes
enum enum

2
rpcs3/Emu/Cell/Modules/sys_mmapper_.cpp
View file

@ -2,7 +2,7 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/lv2/sys_mmapper.h" #include "Emu/Cell/lv2/sys_mmapper.h"
namespace vm { using namespace ps3; }
extern logs::channel sysPrxForUser; extern logs::channel sysPrxForUser;

8
rpcs3/Emu/Cell/Modules/sys_net_.cpp
View file

@ -4,7 +4,7 @@
#include "sys_net_.h" #include "sys_net_.h"
namespace vm { using namespace ps3; }
logs::channel libnet("libnet"); logs::channel libnet("libnet");
@ -690,7 +690,7 @@ DECLARE(ppu_module_manager::sys_net)("sys_net", []()
REG_FUNC(sys_net, _sys_net_h_errno_loc); REG_FUNC(sys_net, _sys_net_h_errno_loc);
REG_FUNC(sys_net, sys_net_set_netemu_test_param); REG_FUNC(sys_net, sys_net_set_netemu_test_param);
REG_FUNC(sys_net, sys_net_free_thread_context); REG_FUNC(sys_net, sys_net_free_thread_context);
REG_FUNC(sys_net, _sys_net_lib_abort); REG_FUNC(sys_net, _sys_net_lib_abort);
REG_FUNC(sys_net, _sys_net_lib_bnet_control); REG_FUNC(sys_net, _sys_net_lib_bnet_control);
REG_FUNC(sys_net, __sys_net_lib_calloc); REG_FUNC(sys_net, __sys_net_lib_calloc);
@ -703,7 +703,7 @@ DECLARE(ppu_module_manager::sys_net)("sys_net", []()
REG_FUNC(sys_net, __sys_net_lib_realloc); REG_FUNC(sys_net, __sys_net_lib_realloc);
REG_FUNC(sys_net, _sys_net_lib_reset_libnetctl_queue); REG_FUNC(sys_net, _sys_net_lib_reset_libnetctl_queue);
REG_FUNC(sys_net, _sys_net_lib_set_libnetctl_queue); REG_FUNC(sys_net, _sys_net_lib_set_libnetctl_queue);
REG_FUNC(sys_net, _sys_net_lib_thread_create); REG_FUNC(sys_net, _sys_net_lib_thread_create);
REG_FUNC(sys_net, _sys_net_lib_thread_exit); REG_FUNC(sys_net, _sys_net_lib_thread_exit);
REG_FUNC(sys_net, _sys_net_lib_thread_join); REG_FUNC(sys_net, _sys_net_lib_thread_join);
@ -716,7 +716,7 @@ DECLARE(ppu_module_manager::sys_net)("sys_net", []()
REG_FUNC(sys_net, _sys_net_lib_sysctl); REG_FUNC(sys_net, _sys_net_lib_sysctl);
REG_FUNC(sys_net, _sys_net_lib_usleep); REG_FUNC(sys_net, _sys_net_lib_usleep);
REG_FUNC(sys_net, sys_netset_abort); REG_FUNC(sys_net, sys_netset_abort);
REG_FUNC(sys_net, sys_netset_close); REG_FUNC(sys_net, sys_netset_close);
REG_FUNC(sys_net, sys_netset_get_if_id); REG_FUNC(sys_net, sys_netset_get_if_id);

2
rpcs3/Emu/Cell/Modules/sys_net_.h
View file

@ -35,7 +35,7 @@ struct sys_net_sockinfo_ex_t
struct sys_net_initialize_parameter_t struct sys_net_initialize_parameter_t
{ {
vm::ps3::bptr<void> memory; vm::bptr<void> memory;
be_t<s32> memory_size; be_t<s32> memory_size;
be_t<s32> flags; be_t<s32> flags;
}; };

14
rpcs3/Emu/Cell/PPUAnalyser.cpp
View file

@ -7,7 +7,7 @@
#include "yaml-cpp/yaml.h" #include "yaml-cpp/yaml.h"
namespace vm { using namespace ps3; }
const ppu_decoder<ppu_itype> s_ppu_itype; const ppu_decoder<ppu_itype> s_ppu_itype;
@ -876,7 +876,7 @@ void ppu_module::analyse(u32 lib_toc, u32 entry)
func.attr += ppu_attr::no_return; func.attr += ppu_attr::no_return;
continue; continue;
} }
if (target >= start && target < end) if (target >= start && target < end)
{ {
auto& new_func = add_func(target, func.toc, func.addr); auto& new_func = add_func(target, func.toc, func.addr);
@ -1122,7 +1122,7 @@ void ppu_module::analyse(u32 lib_toc, u32 entry)
block_queue.clear(); block_queue.clear();
break; break;
} }
// Add next block if necessary // Add next block if necessary
if ((is_call && !test(pfunc->attr, ppu_attr::no_return)) || (type == ppu_itype::BC && (op.bo & 0x14) != 0x14)) if ((is_call && !test(pfunc->attr, ppu_attr::no_return)) || (type == ppu_itype::BC && (op.bo & 0x14) != 0x14))
{ {
@ -1241,7 +1241,7 @@ void ppu_module::analyse(u32 lib_toc, u32 entry)
func_queue.emplace_back(func); func_queue.emplace_back(func);
continue; continue;
} }
// Finalization: determine function size // Finalization: determine function size
if (!test(func.attr, ppu_attr::known_size)) if (!test(func.attr, ppu_attr::known_size))
{ {
@ -1400,7 +1400,7 @@ void ppu_module::analyse(u32 lib_toc, u32 entry)
{ {
_ptr.set(next); _ptr.set(next);
} }
if (_ptr.addr() >= next) if (_ptr.addr() >= next)
{ {
LOG_WARNING(PPU, "Function gap: [0x%x] 0x%x bytes at 0x%x", func.addr, next - start, start); LOG_WARNING(PPU, "Function gap: [0x%x] 0x%x bytes at 0x%x", func.addr, next - start, start);
@ -1422,7 +1422,7 @@ void ppu_module::analyse(u32 lib_toc, u32 entry)
} }
} }
} }
// Convert map to vector (destructive) // Convert map to vector (destructive)
for (auto&& pair : fmap) for (auto&& pair : fmap)
{ {
@ -3384,6 +3384,6 @@ const bool s_tes = []()
r1 = ppu_acontext::spec_gpr::range(0x13311, 0x1fe22); r1 = ppu_acontext::spec_gpr::range(0x13311, 0x1fe22);
r1 = r1 ^ ppu_acontext::spec_gpr::approx(0x000, 0xf00); r1 = r1 ^ ppu_acontext::spec_gpr::approx(0x000, 0xf00);
LOG_SUCCESS(PPU, "0x%x..0x%x", r1.imin, r1.imax); LOG_SUCCESS(PPU, "0x%x..0x%x", r1.imin, r1.imax);
return true; return true;
}(); }();

8
rpcs3/Emu/Cell/PPUCallback.h
View file

@ -26,7 +26,7 @@ namespace ppu_cb_detail
static_assert(!std::is_pointer<T>::value, "Invalid callback argument type (pointer)"); static_assert(!std::is_pointer<T>::value, "Invalid callback argument type (pointer)");
static_assert(!std::is_reference<T>::value, "Invalid callback argument type (reference)"); static_assert(!std::is_reference<T>::value, "Invalid callback argument type (reference)");
static_assert(sizeof(T) <= 8, "Invalid callback argument type for ARG_GENERAL"); static_assert(sizeof(T) <= 8, "Invalid callback argument type for ARG_GENERAL");
static inline void set_value(ppu_thread& CPU, const T& arg) static inline void set_value(ppu_thread& CPU, const T& arg)
{ {
CPU.gpr[g_count + 2] = ppu_gpr_cast(arg); CPU.gpr[g_count + 2] = ppu_gpr_cast(arg);
@ -64,7 +64,7 @@ namespace ppu_cb_detail
{ {
const s64 stack_pos = (g_count - 1) * 0x8 + 0x30 - FIXED_STACK_FRAME_SIZE; const s64 stack_pos = (g_count - 1) * 0x8 + 0x30 - FIXED_STACK_FRAME_SIZE;
static_assert(stack_pos < 0, "TODO: Increase FIXED_STACK_FRAME_SIZE (arg count limit broken)"); static_assert(stack_pos < 0, "TODO: Increase FIXED_STACK_FRAME_SIZE (arg count limit broken)");
vm::ps3::write64(CPU.gpr[1] + stack_pos, ppu_gpr_cast(arg)); // TODO vm::write64(CPU.gpr[1] + stack_pos, ppu_gpr_cast(arg)); // TODO
} }
}; };
@ -103,7 +103,7 @@ namespace ppu_cb_detail
const u32 g = g_count + (is_general || is_float ? 1 : is_vector ? ::align(g_count, 2) + 2 : 0); const u32 g = g_count + (is_general || is_float ? 1 : is_vector ? ::align(g_count, 2) + 2 : 0);
const u32 f = f_count + is_float; const u32 f = f_count + is_float;
const u32 v = v_count + is_vector; const u32 v = v_count + is_vector;
_func_arg<T1, t, g, f, v>::set_value(CPU, arg1); _func_arg<T1, t, g, f, v>::set_value(CPU, arg1);
// return true if stack was used // return true if stack was used
@ -179,7 +179,7 @@ namespace vm
template<typename AT, typename RT, typename... T> template<typename AT, typename RT, typename... T>
FORCE_INLINE RT _ptr_base<RT(T...), AT>::operator()(ppu_thread& CPU, T... args) const FORCE_INLINE RT _ptr_base<RT(T...), AT>::operator()(ppu_thread& CPU, T... args) const
{ {
const auto data = vm::ps3::_ptr<u32>(vm::cast(m_addr, HERE)); const auto data = vm::_ptr<u32>(vm::cast(m_addr, HERE));
const u32 pc = data[0]; const u32 pc = data[0];
const u32 rtoc = data[1]; const u32 rtoc = data[1];

2
rpcs3/Emu/Cell/PPUInterpreter.cpp
View file

@ -303,7 +303,7 @@ extern u64 ppu_ldarx(ppu_thread& ppu, u32 addr);
extern bool ppu_stwcx(ppu_thread& ppu, u32 addr, u32 reg_value); extern bool ppu_stwcx(ppu_thread& ppu, u32 addr, u32 reg_value);
extern bool ppu_stdcx(ppu_thread& ppu, u32 addr, u64 reg_value); extern bool ppu_stdcx(ppu_thread& ppu, u32 addr, u64 reg_value);
namespace vm { using namespace ps3; }
class ppu_scale_table_t class ppu_scale_table_t
{ {

8
rpcs3/Emu/Cell/PPUModule.cpp
View file

@ -17,7 +17,7 @@
#include <set> #include <set>
#include <algorithm> #include <algorithm>
namespace vm { using namespace ps3; }
extern void ppu_initialize_syscalls(); extern void ppu_initialize_syscalls();
extern std::string ppu_get_function_name(const std::string& module, u32 fnid); extern std::string ppu_get_function_name(const std::string& module, u32 fnid);
@ -269,8 +269,8 @@ static void ppu_initialize_modules(const std::shared_ptr<ppu_linkage_info>& link
for (u32 addr = ppu_function_manager::addr, index = 0; index < hle_funcs.size(); addr += 8, index++) for (u32 addr = ppu_function_manager::addr, index = 0; index < hle_funcs.size(); addr += 8, index++)
{ {
// Function address = current address, RTOC = BLR instruction for the interpreter // Function address = current address, RTOC = BLR instruction for the interpreter
vm::ps3::write32(addr + 0, addr); vm::write32(addr + 0, addr);
vm::ps3::write32(addr + 4, ppu_instructions::BLR()); vm::write32(addr + 4, ppu_instructions::BLR());
// Register the HLE function directly // Register the HLE function directly
ppu_register_function_at(addr + 0, 4, hle_funcs[index]); ppu_register_function_at(addr + 0, 4, hle_funcs[index]);
@ -1129,7 +1129,7 @@ void ppu_load_exec(const ppu_exec_object& elf)
//be_t<u32> crash_dump_param_addr; //be_t<u32> crash_dump_param_addr;
}; };
const auto& info = vm::ps3::_ref<process_param_t>(vm::cast(prog.p_vaddr, HERE)); const auto& info = vm::_ref<process_param_t>(vm::cast(prog.p_vaddr, HERE));
if (info.size < sizeof(process_param_t)) if (info.size < sizeof(process_param_t))
{ {

Some files were not shown because too many files have changed in this diff Show more