starred/decaf-emu
1
0
Fork 0
mirror of https://github.com/decaf-emu/decaf-emu.git synced 2026-10-14 17:48:39 +00:00
Code Issues 9 Packages Projects Releases 1 Wiki Activity

Merge pull request #334 from achurch/EVENT_WRITE

Browse Source 
gpu: Remove flags from EVENT_WRITE high address word.
This commit is contained in:
James
2016-08-21 21:22:53 +01:00
committed by GitHub
parent 4b5208898f 3554721a53
commit c3ef6801fd
3 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/libdecaf/src/gpu/opengl/opengl_driver.cpp
View File

@@ -441,8 +441,7 @@ GLDriver::eventWrite(const pm4::EventWrite &data)
decaf_abort(fmt::format("Unexpected event type {}", type));
}
switch (data.addrLo.ENDIAN_SWAP())
{
switch (data.addrLo.ENDIAN_SWAP()) {
case latte::CB_ENDIAN_NONE:
break;
case latte::CB_ENDIAN_8IN64:
@@ -455,18 +454,7 @@ GLDriver::eventWrite(const pm4::EventWrite &data)
decaf_abort("Unexpected EVENT_WRITE endian swap 8IN16");
}
switch (data.addrHi.DATA_SEL()) {
case pm4::EW_DATA_DISCARD:
break;
case pm4::EW_DATA_32:
*reinterpret_cast<uint32_t *>(ptr) = static_cast<uint32_t>(value);
break;
case pm4::EW_DATA_64:
*reinterpret_cast<uint64_t *>(ptr) = value;
break;
case pm4::EW_DATA_CLOCK:
decaf_abort("Unexpected EW_DATA_CLOCK in EVENT_WRITE");
}
*reinterpret_cast<uint64_t *>(ptr) = value;
}
void
@@ -506,17 +494,17 @@ GLDriver::handlePendingEOP()
value = byte_swap(static_cast<uint32_t>(value));
break;
case latte::CB_ENDIAN_8IN16:
decaf_abort(fmt::format("Unexpected EOP event endian swap {}", mPendingEOP.addrLo.ENDIAN_SWAP()));
decaf_abort("Unexpected EVENT_WRITE_EOP endian swap 8IN16");
}
switch (mPendingEOP.addrHi.DATA_SEL()) {
case pm4::EW_DATA_DISCARD:
case pm4::EWP_DATA_DISCARD:
break;
case pm4::EW_DATA_32:
case pm4::EWP_DATA_32:
*reinterpret_cast<uint32_t *>(ptr) = static_cast<uint32_t>(value);
break;
case pm4::EW_DATA_64:
case pm4::EW_DATA_CLOCK:
case pm4::EWP_DATA_64:
case pm4::EWP_DATA_CLOCK:
*reinterpret_cast<uint64_t *>(ptr) = value;
break;
}

40
src/libdecaf/src/gpu/pm4.h
View File

@@ -790,25 +790,8 @@ BITFIELD(EW_ADDR_LO, uint32_t)
BITFIELD_ENTRY(2, 30, uint32_t, ADDR_LO);
BITFIELD_END
enum EW_DATA_SEL : uint32_t
{
EW_DATA_DISCARD = 0,
EW_DATA_32 = 1,
EW_DATA_64 = 2,
EW_DATA_CLOCK = 3,
};
enum EW_INT_SEL : uint32_t
{
EW_INT_NONE = 0,
EW_INT_ONLY = 1,
EW_INT_WRITE_CONFIRM = 2,
};
BITFIELD(EW_ADDR_HI, uint32_t)
BITFIELD_ENTRY(0, 8, uint32_t, ADDR_HI);
BITFIELD_ENTRY(24, 2, EW_INT_SEL, INT_SEL);
BITFIELD_ENTRY(29, 3, EW_DATA_SEL, DATA_SEL);
BITFIELD_END
struct EventWrite
@@ -827,12 +810,33 @@ struct EventWrite
}
};
enum EWP_DATA_SEL : uint32_t
{
EWP_DATA_DISCARD = 0,
EWP_DATA_32 = 1,
EWP_DATA_64 = 2,
EWP_DATA_CLOCK = 3,
};
enum EWP_INT_SEL : uint32_t
{
EWP_INT_NONE = 0,
EWP_INT_ONLY = 1,
EWP_INT_WRITE_CONFIRM = 2,
};
BITFIELD(EWP_ADDR_HI, uint32_t)
BITFIELD_ENTRY(0, 8, uint32_t, ADDR_HI);
BITFIELD_ENTRY(24, 2, EWP_INT_SEL, INT_SEL);
BITFIELD_ENTRY(29, 3, EWP_DATA_SEL, DATA_SEL);
BITFIELD_END
struct EventWriteEOP
{
static const auto Opcode = type3::EVENT_WRITE_EOP;
latte::VGT_EVENT_INITIATOR eventInitiator;
EW_ADDR_LO addrLo;
EW_ADDR_HI addrHi;
EWP_ADDR_HI addrHi;
uint32_t dataLo;
uint32_t dataHi;

4
src/libdecaf/src/modules/gx2/gx2_query.cpp
View File

@@ -36,8 +36,8 @@ GX2SampleBottomGPUCycle(be_val<uint64_t> *result)
.ADDR_LO(mem::untranslate(result) >> 2)
.ENDIAN_SWAP(latte::CB_ENDIAN_8IN64);
auto addrHi = pm4::EW_ADDR_HI::get(0)
.DATA_SEL(pm4::EW_DATA_CLOCK);
auto addrHi = pm4::EWP_ADDR_HI::get(0)
.DATA_SEL(pm4::EWP_DATA_CLOCK);
pm4::write(pm4::EventWriteEOP { eventInitiator, addrLo, addrHi, 0, 0 });
}