forked from ShuriZma/suyu
apply replay logic to all writes. remove replay from MacroInterpreter::Send (@fincs)
This commit is contained in:
parent
f66743cd0c
commit
fc37672f26
|
@ -162,14 +162,17 @@ void Maxwell3D::CallMethod(const GPU::MethodCall& method_call) {
|
||||||
ASSERT_MSG(method < Regs::NUM_REGS,
|
ASSERT_MSG(method < Regs::NUM_REGS,
|
||||||
"Invalid Maxwell3D register, increase the size of the Regs structure");
|
"Invalid Maxwell3D register, increase the size of the Regs structure");
|
||||||
|
|
||||||
|
u32 arg = method_call.argument;
|
||||||
// Keep track of the register value in shadow_state when requested.
|
// Keep track of the register value in shadow_state when requested.
|
||||||
if (shadow_state.shadow_ram_control == Regs::ShadowRamControl::Track ||
|
if (shadow_state.shadow_ram_control == Regs::ShadowRamControl::Track ||
|
||||||
shadow_state.shadow_ram_control == Regs::ShadowRamControl::TrackWithFilter) {
|
shadow_state.shadow_ram_control == Regs::ShadowRamControl::TrackWithFilter) {
|
||||||
shadow_state.reg_array[method] = method_call.argument;
|
shadow_state.reg_array[method] = arg;
|
||||||
|
} else if (shadow_state.shadow_ram_control == Regs::ShadowRamControl::Replay) {
|
||||||
|
arg = shadow_state.reg_array[method];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (regs.reg_array[method] != method_call.argument) {
|
if (regs.reg_array[method] != arg) {
|
||||||
regs.reg_array[method] = method_call.argument;
|
regs.reg_array[method] = arg;
|
||||||
|
|
||||||
for (const auto& table : dirty.tables) {
|
for (const auto& table : dirty.tables) {
|
||||||
dirty.flags[table[method]] = true;
|
dirty.flags[table[method]] = true;
|
||||||
|
@ -182,11 +185,11 @@ void Maxwell3D::CallMethod(const GPU::MethodCall& method_call) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case MAXWELL3D_REG_INDEX(macros.data): {
|
case MAXWELL3D_REG_INDEX(macros.data): {
|
||||||
ProcessMacroUpload(method_call.argument);
|
ProcessMacroUpload(arg);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case MAXWELL3D_REG_INDEX(macros.bind): {
|
case MAXWELL3D_REG_INDEX(macros.bind): {
|
||||||
ProcessMacroBind(method_call.argument);
|
ProcessMacroBind(arg);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case MAXWELL3D_REG_INDEX(firmware[4]): {
|
case MAXWELL3D_REG_INDEX(firmware[4]): {
|
||||||
|
@ -262,7 +265,7 @@ void Maxwell3D::CallMethod(const GPU::MethodCall& method_call) {
|
||||||
}
|
}
|
||||||
case MAXWELL3D_REG_INDEX(data_upload): {
|
case MAXWELL3D_REG_INDEX(data_upload): {
|
||||||
const bool is_last_call = method_call.IsLastCall();
|
const bool is_last_call = method_call.IsLastCall();
|
||||||
upload_state.ProcessData(method_call.argument, is_last_call);
|
upload_state.ProcessData(arg, is_last_call);
|
||||||
if (is_last_call) {
|
if (is_last_call) {
|
||||||
OnMemoryWrite();
|
OnMemoryWrite();
|
||||||
}
|
}
|
||||||
|
|
|
@ -328,12 +328,6 @@ void MacroInterpreter::SetMethodAddress(u32 address) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void MacroInterpreter::Send(u32 value) {
|
void MacroInterpreter::Send(u32 value) {
|
||||||
// Use the tracked value in shadow_state when requested.
|
|
||||||
if (method_address.address < Engines::Maxwell3D::Regs::NUM_REGS &&
|
|
||||||
maxwell3d.shadow_state.shadow_ram_control ==
|
|
||||||
Engines::Maxwell3D::Regs::ShadowRamControl::Replay) {
|
|
||||||
value = maxwell3d.shadow_state.reg_array[method_address.address];
|
|
||||||
}
|
|
||||||
maxwell3d.CallMethodFromMME({method_address.address, value});
|
maxwell3d.CallMethodFromMME({method_address.address, value});
|
||||||
// Increment the method address by the method increment.
|
// Increment the method address by the method increment.
|
||||||
method_address.address.Assign(method_address.address.Value() +
|
method_address.address.Assign(method_address.address.Value() +
|
||||||
|
|
Loading…
Reference in New Issue