archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 15:01:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some things simplified

Browse source
This commit is contained in:
Nekotekina 2014-10-23 02:53:44 +04:00
parent 5d1cafdebc
commit 7777be6fc1
7 changed files with 33 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/Emu/Cell/SPURecompiler.h
View file

@ -631,7 +631,7 @@ private:
} }
LOG_OPCODE(); LOG_OPCODE();
} }
void ROTH(u32 rt, u32 ra, u32 rb) void ROTH(u32 rt, u32 ra, u32 rb) //nf
{ {
XmmInvalidate(rt); XmmInvalidate(rt);
for (u32 i = 0; i < 8; i++) for (u32 i = 0; i < 8; i++)
@ -3472,6 +3472,16 @@ private:
} }
WRAPPER_END(rc, rt, ra, rb);*/ WRAPPER_END(rc, rt, ra, rb);*/
// hypothetical AVX-512 implementation:
// VPXORD mask, rc, [byte:0x0f] // 15 - rc (only for index bits)
// VPSHUFB res {k0}, ra, mask
// VPTESTMB k1 {k0}, rc, [byte:0x10]
// VPSHUFB res {k1}, rb, mask
// VPCMPNLTUB k1 {k0}, mask, [byte:0xc0]
// VPADDB res {k1}, res, [byte:0xff]
// VPCMPNLTUB k1 {k1}, mask, [byte:0xe0]
// VPSUBB res {k1}, res, [byte:0x7f]
const XmmLink& v0 = XmmGet(rc); // v0 = mask const XmmLink& v0 = XmmGet(rc); // v0 = mask
const XmmLink& v1 = XmmAlloc(); const XmmLink& v1 = XmmAlloc();
const XmmLink& v2 = XmmCopy(v0); // v2 = mask const XmmLink& v2 = XmmCopy(v0); // v2 = mask

7
rpcs3/Emu/SysCalls/Modules/cellAdec.cpp
View file

@ -27,7 +27,6 @@ AudioDecoder::AudioDecoder(AudioCodecType type, u32 addr, u32 size, vm::ptr<Cell
, cbFunc(func) , cbFunc(func)
, cbArg(arg) , cbArg(arg)
, adecCb(nullptr) , adecCb(nullptr)
, is_running(false)
, is_closed(false) , is_closed(false)
, is_finished(false) , is_finished(false)
, just_started(false) , just_started(false)
@ -296,7 +295,6 @@ u32 adecOpen(AudioDecoder* data)
if (adec.reader.rem) free(adec.reader.rem); if (adec.reader.rem) free(adec.reader.rem);
adec.reader.rem = nullptr; adec.reader.rem = nullptr;
adec.reader.rem_size = 0; adec.reader.rem_size = 0;
adec.is_running = true;
adec.just_started = true; adec.just_started = true;
} }
break; break;
@ -307,7 +305,6 @@ u32 adecOpen(AudioDecoder* data)
cellAdec->Warning("adecEndSeq:"); cellAdec->Warning("adecEndSeq:");
adec.cbFunc.call(*adec.adecCb, adec.id, CELL_ADEC_MSG_TYPE_SEQDONE, CELL_OK, adec.cbArg); adec.cbFunc.call(*adec.adecCb, adec.id, CELL_ADEC_MSG_TYPE_SEQDONE, CELL_OK, adec.cbArg);
adec.is_running = false;
adec.just_finished = true; adec.just_finished = true;
} }
break; break;
@ -722,7 +719,7 @@ int cellAdecGetPcm(u32 handle, vm::ptr<float> outBuffer)
AdecFrame af; AdecFrame af;
if (!adec->frames.Pop(af, &sq_no_wait)) if (!adec->frames.Pop(af, &sq_no_wait))
{ {
std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack //std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack
return CELL_ADEC_ERROR_EMPTY; return CELL_ADEC_ERROR_EMPTY;
} }
@ -765,7 +762,7 @@ int cellAdecGetPcmItem(u32 handle, vm::ptr<u32> pcmItem_ptr)
AdecFrame af; AdecFrame af;
if (!adec->frames.Peek(af, &sq_no_wait)) if (!adec->frames.Peek(af, &sq_no_wait))
{ {
std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack //std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack
return CELL_ADEC_ERROR_EMPTY; return CELL_ADEC_ERROR_EMPTY;
} }

1
rpcs3/Emu/SysCalls/Modules/cellAdec.h
View file

@ -1073,7 +1073,6 @@ class AudioDecoder
public: public:
SQueue<AdecTask> job; SQueue<AdecTask> job;
u32 id; u32 id;
volatile bool is_running;
volatile bool is_closed; volatile bool is_closed;
volatile bool is_finished; volatile bool is_finished;
bool just_started; bool just_started;

86
rpcs3/Emu/SysCalls/Modules/cellDmux.cpp
View file

@ -326,7 +326,7 @@ u32 dmuxOpen(Demuxer* data)
cellDmux->Notice("Demuxer thread started (mem=0x%x, size=0x%x, cb=0x%x, arg=0x%x)", dmux.memAddr, dmux.memSize, dmux.cbFunc, dmux.cbArg); cellDmux->Notice("Demuxer thread started (mem=0x%x, size=0x%x, cb=0x%x, arg=0x%x)", dmux.memAddr, dmux.memSize, dmux.cbFunc, dmux.cbArg);
DemuxerTask task; DemuxerTask task;
DemuxerStream stream; DemuxerStream stream = {};
ElementaryStream* esALL[192]; memset(esALL, 0, sizeof(esALL)); ElementaryStream* esALL[192]; memset(esALL, 0, sizeof(esALL));
ElementaryStream** esAVC = &esALL[0]; // AVC (max 16) ElementaryStream** esAVC = &esALL[0]; // AVC (max 16)
ElementaryStream** esM2V = &esALL[16]; // MPEG-2 (max 16) ElementaryStream** esM2V = &esALL[16]; // MPEG-2 (max 16)
@ -337,9 +337,6 @@ u32 dmuxOpen(Demuxer* data)
u32 cb_add = 0; u32 cb_add = 0;
u32 updates_count = 0;
u32 updates_signaled = 0;
while (true) while (true)
{ {
if (Emu.IsStopped() || dmux.is_closed) if (Emu.IsStopped() || dmux.is_closed)
@ -347,7 +344,7 @@ u32 dmuxOpen(Demuxer* data)
break; break;
} }
if (!dmux.job.Peek(task, &sq_no_wait) && dmux.is_running) if (!dmux.job.Peek(task, &sq_no_wait) && dmux.is_running && stream.addr)
{ {
// default task (demuxing) (if there is no other work) // default task (demuxing) (if there is no other work)
be_t<u32> code; be_t<u32> code;
@ -356,14 +353,13 @@ u32 dmuxOpen(Demuxer* data)
if (!stream.peek(code)) if (!stream.peek(code))
{ {
dmux.is_running = false;
// demuxing finished // demuxing finished
auto dmuxMsg = vm::ptr<CellDmuxMsg>::make(a128(dmux.memAddr) + (cb_add ^= 16)); auto dmuxMsg = vm::ptr<CellDmuxMsg>::make(a128(dmux.memAddr) + (cb_add ^= 16));
dmuxMsg->msgType = CELL_DMUX_MSG_TYPE_DEMUX_DONE; dmuxMsg->msgType = CELL_DMUX_MSG_TYPE_DEMUX_DONE;
dmuxMsg->supplementalInfo = stream.userdata; dmuxMsg->supplementalInfo = stream.userdata;
dmux.cbFunc.call(*dmux.dmuxCb, dmux.id, dmuxMsg, dmux.cbArg); dmux.cbFunc.call(*dmux.dmuxCb, dmux.id, dmuxMsg, dmux.cbArg);
updates_signaled++; dmux.is_running = false;
} }
else switch (code.ToLE()) else switch (code.ToLE())
{ {
@ -425,13 +421,6 @@ u32 dmuxOpen(Demuxer* data)
continue; continue;
} }
/*if (es.hasunseen()) // hack, probably useless
{
stream = backup;
std::this_thread::sleep_for(std::chrono::milliseconds(1));
continue;
}*/
stream.skip(4); stream.skip(4);
len -= 4; len -= 4;
@ -480,12 +469,6 @@ u32 dmuxOpen(Demuxer* data)
if (pes.new_au && es.hasdata()) // new AU detected if (pes.new_au && es.hasdata()) // new AU detected
{ {
/*if (es.hasunseen()) // hack, probably useless
{
stream = backup;
std::this_thread::sleep_for(std::chrono::milliseconds(1));
continue;
}*/
es.finish(stream); es.finish(stream);
// callback // callback
auto esMsg = vm::ptr<CellDmuxEsMsg>::make(a128(dmux.memAddr) + (cb_add ^= 16)); auto esMsg = vm::ptr<CellDmuxEsMsg>::make(a128(dmux.memAddr) + (cb_add ^= 16));
@ -572,24 +555,11 @@ u32 dmuxOpen(Demuxer* data)
esALL[i]->reset(); esALL[i]->reset();
} }
} }
updates_count = 0;
updates_signaled = 0;
} }
if (updates_count != updates_signaled)
{
cellDmux->Error("dmuxSetStream: stream update inconsistency (input=%d, signaled=%d)", updates_count, updates_signaled);
Emu.Pause();
return;
}
updates_count++;
stream = task.stream; stream = task.stream;
//LOG_NOTICE(HLE, "*** stream updated(addr=0x%x, size=0x%x, discont=%d, userdata=0x%llx)", //LOG_NOTICE(HLE, "*** stream updated(addr=0x%x, size=0x%x, discont=%d, userdata=0x%llx)",
//stream.addr, stream.size, stream.discontinuity, stream.userdata); //stream.addr, stream.size, stream.discontinuity, stream.userdata);
dmux.is_running = true;
dmux.fbSetStream.Push(task.stream.addr, &dmux.is_closed); // feedback
} }
break; break;
@ -601,12 +571,11 @@ u32 dmuxOpen(Demuxer* data)
dmuxMsg->supplementalInfo = stream.userdata; dmuxMsg->supplementalInfo = stream.userdata;
dmux.cbFunc.call(*dmux.dmuxCb, dmux.id, dmuxMsg, dmux.cbArg); dmux.cbFunc.call(*dmux.dmuxCb, dmux.id, dmuxMsg, dmux.cbArg);
updates_signaled++; stream = {};
dmux.is_running = false; dmux.is_running = false;
if (task.type == dmuxResetStreamAndWaitDone) //if (task.type == dmuxResetStreamAndWaitDone)
{ //{
dmux.fbSetStream.Push(0, &dmux.is_closed); //}
}
} }
break; break;
@ -825,14 +794,9 @@ int cellDmuxSetStream(u32 demuxerHandle, const u32 streamAddress, u32 streamSize
return CELL_DMUX_ERROR_ARG; return CELL_DMUX_ERROR_ARG;
} }
if (dmux->is_running) if (dmux->is_running.exchange(true))
{ {
if (Emu.IsStopped()) //std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack
{
cellDmux->Warning("cellDmuxSetStream(%d) aborted (waiting)", demuxerHandle);
return CELL_OK;
}
std::this_thread::sleep_for(std::chrono::milliseconds(1));
return CELL_DMUX_ERROR_BUSY; return CELL_DMUX_ERROR_BUSY;
} }
@ -844,18 +808,6 @@ int cellDmuxSetStream(u32 demuxerHandle, const u32 streamAddress, u32 streamSize
info.userdata = userData; info.userdata = userData;
dmux->job.Push(task, &dmux->is_closed); dmux->job.Push(task, &dmux->is_closed);
u32 addr;
if (!dmux->fbSetStream.Pop(addr, &dmux->is_closed))
{
cellDmux->Warning("cellDmuxSetStream(%d) aborted (fbSetStream.Pop())", demuxerHandle);
return CELL_OK;
}
if (addr != info.addr)
{
cellDmux->Error("cellDmuxSetStream(%d): wrong stream queued (right=0x%x, queued=0x%x)", demuxerHandle, info.addr, addr);
Emu.Pause();
}
return CELL_OK; return CELL_OK;
} }
@ -870,7 +822,6 @@ int cellDmuxResetStream(u32 demuxerHandle)
} }
dmux->job.Push(DemuxerTask(dmuxResetStream), &dmux->is_closed); dmux->job.Push(DemuxerTask(dmuxResetStream), &dmux->is_closed);
return CELL_OK; return CELL_OK;
} }
@ -885,17 +836,14 @@ int cellDmuxResetStreamAndWaitDone(u32 demuxerHandle)
} }
dmux->job.Push(DemuxerTask(dmuxResetStreamAndWaitDone), &dmux->is_closed); dmux->job.Push(DemuxerTask(dmuxResetStreamAndWaitDone), &dmux->is_closed);
while (dmux->is_running && !dmux->is_closed) // TODO: ensure that it is safe
u32 addr;
if (!dmux->fbSetStream.Pop(addr, &dmux->is_closed))
{ {
cellDmux->Warning("cellDmuxResetStreamAndWaitDone(%d) aborted (fbSetStream.Pop())", demuxerHandle); if (Emu.IsStopped())
return CELL_OK; {
} cellDmux->Warning("cellDmuxResetStreamAndWaitDone(%d) aborted", demuxerHandle);
if (addr != 0) return CELL_OK;
{ }
cellDmux->Error("cellDmuxResetStreamAndWaitDone(%d): wrong stream queued (0x%x)", demuxerHandle, addr); std::this_thread::sleep_for(std::chrono::milliseconds(1));
Emu.Pause();
} }
return CELL_OK; return CELL_OK;
} }
@ -912,7 +860,6 @@ int cellDmuxQueryEsAttr(vm::ptr<const CellDmuxType> demuxerType, vm::ptr<const C
} }
// TODO: check esFilterId and esSpecificInfo correctly // TODO: check esFilterId and esSpecificInfo correctly
dmuxQueryEsAttr(0, esFilterId, esSpecificInfo_addr, esAttr); dmuxQueryEsAttr(0, esFilterId, esSpecificInfo_addr, esAttr);
return CELL_OK; return CELL_OK;
} }
@ -929,7 +876,6 @@ int cellDmuxQueryEsAttr2(vm::ptr<const CellDmuxType2> demuxerType2, vm::ptr<cons
} }
// TODO: check demuxerType2, esFilterId and esSpecificInfo correctly // TODO: check demuxerType2, esFilterId and esSpecificInfo correctly
dmuxQueryEsAttr(demuxerType2->streamSpecificInfo_addr, esFilterId, esSpecificInfo_addr, esAttr); dmuxQueryEsAttr(demuxerType2->streamSpecificInfo_addr, esFilterId, esSpecificInfo_addr, esAttr);
return CELL_OK; return CELL_OK;
} }

3
rpcs3/Emu/SysCalls/Modules/cellDmux.h
View file

@ -408,7 +408,6 @@ class Demuxer
{ {
public: public:
SQueue<DemuxerTask, 32> job; SQueue<DemuxerTask, 32> job;
SQueue<u32, 16> fbSetStream;
const u32 memAddr; const u32 memAddr;
const u32 memSize; const u32 memSize;
const vm::ptr<CellDmuxCbMsg> cbFunc; const vm::ptr<CellDmuxCbMsg> cbFunc;
@ -416,7 +415,7 @@ public:
u32 id; u32 id;
volatile bool is_finished; volatile bool is_finished;
volatile bool is_closed; volatile bool is_closed;
volatile bool is_running; std::atomic<bool> is_running;
PPUThread* dmuxCb; PPUThread* dmuxCb;

10
rpcs3/Emu/SysCalls/Modules/cellVdec.cpp
View file

@ -29,7 +29,6 @@ VideoDecoder::VideoDecoder(CellVdecCodecType type, u32 profile, u32 addr, u32 si
, cbArg(arg) , cbArg(arg)
, is_finished(false) , is_finished(false)
, is_closed(false) , is_closed(false)
, is_running(false)
, just_started(false) , just_started(false)
, just_finished(false) , just_finished(false)
, ctx(nullptr) , ctx(nullptr)
@ -225,9 +224,7 @@ u32 vdecOpen(VideoDecoder* data)
// TODO: reset data // TODO: reset data
cellVdec->Warning("vdecStartSeq:"); cellVdec->Warning("vdecStartSeq:");
vdec.reader.addr = 0; vdec.reader = {};
vdec.reader.size = 0;
vdec.is_running = true;
vdec.just_started = true; vdec.just_started = true;
} }
break; break;
@ -239,7 +236,6 @@ u32 vdecOpen(VideoDecoder* data)
vdec.cbFunc.call(*vdec.vdecCb, vdec.id, CELL_VDEC_MSG_TYPE_SEQDONE, CELL_OK, vdec.cbArg); vdec.cbFunc.call(*vdec.vdecCb, vdec.id, CELL_VDEC_MSG_TYPE_SEQDONE, CELL_OK, vdec.cbArg);
vdec.is_running = false;
vdec.just_finished = true; vdec.just_finished = true;
} }
break; break;
@ -595,7 +591,7 @@ int cellVdecGetPicture(u32 handle, vm::ptr<const CellVdecPicFormat> format, vm::
VdecFrame vf; VdecFrame vf;
if (!vdec->frames.Pop(vf, &sq_no_wait)) if (!vdec->frames.Pop(vf, &sq_no_wait))
{ {
std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack //std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack
return CELL_VDEC_ERROR_EMPTY; return CELL_VDEC_ERROR_EMPTY;
} }
@ -651,7 +647,7 @@ int cellVdecGetPicItem(u32 handle, vm::ptr<u32> picItem_ptr)
VdecFrame vf; VdecFrame vf;
if (!vdec->frames.Peek(vf, &sq_no_wait)) if (!vdec->frames.Peek(vf, &sq_no_wait))
{ {
std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack //std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack
return CELL_VDEC_ERROR_EMPTY; return CELL_VDEC_ERROR_EMPTY;
} }

1
rpcs3/Emu/SysCalls/Modules/cellVdec.h
View file

@ -694,7 +694,6 @@ class VideoDecoder
public: public:
SQueue<VdecTask> job; SQueue<VdecTask> job;
u32 id; u32 id;
volatile bool is_running;
volatile bool is_closed; volatile bool is_closed;
volatile bool is_finished; volatile bool is_finished;
bool just_started; bool just_started;