early-access version 2839
This commit is contained in:
parent
8f0f296c7c
commit
b866bff3f2
@ -1,7 +1,7 @@
|
|||||||
yuzu emulator early access
|
yuzu emulator early access
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This is the source code for early-access 2838.
|
This is the source code for early-access 2839.
|
||||||
|
|
||||||
## Legal Notice
|
## Legal Notice
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ public:
|
|||||||
if (!memory.IsValidVirtualAddressRange(vaddr, sizeof(u32))) {
|
if (!memory.IsValidVirtualAddressRange(vaddr, sizeof(u32))) {
|
||||||
return std::nullopt;
|
return std::nullopt;
|
||||||
}
|
}
|
||||||
return MemoryRead32(vaddr);
|
return memory.Read32(vaddr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MemoryWrite8(u32 vaddr, u8 value) override {
|
void MemoryWrite8(u32 vaddr, u8 value) override {
|
||||||
@ -97,7 +97,7 @@ public:
|
|||||||
parent.LogBacktrace();
|
parent.LogBacktrace();
|
||||||
LOG_ERROR(Core_ARM,
|
LOG_ERROR(Core_ARM,
|
||||||
"Unimplemented instruction @ 0x{:X} for {} instructions (instr = {:08X})", pc,
|
"Unimplemented instruction @ 0x{:X} for {} instructions (instr = {:08X})", pc,
|
||||||
num_instructions, MemoryRead32(pc));
|
num_instructions, memory.Read32(pc));
|
||||||
}
|
}
|
||||||
|
|
||||||
void ExceptionRaised(u32 pc, Dynarmic::A32::Exception exception) override {
|
void ExceptionRaised(u32 pc, Dynarmic::A32::Exception exception) override {
|
||||||
@ -115,7 +115,7 @@ public:
|
|||||||
parent.LogBacktrace();
|
parent.LogBacktrace();
|
||||||
LOG_CRITICAL(Core_ARM,
|
LOG_CRITICAL(Core_ARM,
|
||||||
"ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X}, thumb = {})",
|
"ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X}, thumb = {})",
|
||||||
exception, pc, MemoryRead32(pc), parent.IsInThumbMode());
|
exception, pc, memory.Read32(pc), parent.IsInThumbMode());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ public:
|
|||||||
if (!memory.IsValidVirtualAddressRange(vaddr, sizeof(u32))) {
|
if (!memory.IsValidVirtualAddressRange(vaddr, sizeof(u32))) {
|
||||||
return std::nullopt;
|
return std::nullopt;
|
||||||
}
|
}
|
||||||
return MemoryRead32(vaddr);
|
return memory.Read32(vaddr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MemoryWrite8(u64 vaddr, u8 value) override {
|
void MemoryWrite8(u64 vaddr, u8 value) override {
|
||||||
@ -111,7 +111,7 @@ public:
|
|||||||
parent.LogBacktrace();
|
parent.LogBacktrace();
|
||||||
LOG_ERROR(Core_ARM,
|
LOG_ERROR(Core_ARM,
|
||||||
"Unimplemented instruction @ 0x{:X} for {} instructions (instr = {:08X})", pc,
|
"Unimplemented instruction @ 0x{:X} for {} instructions (instr = {:08X})", pc,
|
||||||
num_instructions, MemoryRead32(pc));
|
num_instructions, memory.Read32(pc));
|
||||||
}
|
}
|
||||||
|
|
||||||
void InstructionCacheOperationRaised(Dynarmic::A64::InstructionCacheOperation op,
|
void InstructionCacheOperationRaised(Dynarmic::A64::InstructionCacheOperation op,
|
||||||
@ -156,7 +156,7 @@ public:
|
|||||||
|
|
||||||
parent.LogBacktrace();
|
parent.LogBacktrace();
|
||||||
LOG_CRITICAL(Core_ARM, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})",
|
LOG_CRITICAL(Core_ARM, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})",
|
||||||
static_cast<std::size_t>(exception), pc, MemoryRead32(pc));
|
static_cast<std::size_t>(exception), pc, memory.Read32(pc));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -299,7 +299,10 @@ s64 NVFlinger::GetNextTicks() const {
|
|||||||
speed_scale = 0.01f;
|
speed_scale = 0.01f;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return static_cast<s64>(((1000000000 * (1LL << swap_interval)) / max_hertz) * speed_scale);
|
|
||||||
|
const auto next_ticks = ((1000000000 * (1LL << swap_interval)) / max_hertz);
|
||||||
|
|
||||||
|
return static_cast<s64>(speed_scale * static_cast<float>(next_ticks));
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Service::NVFlinger
|
} // namespace Service::NVFlinger
|
||||||
|
Loading…
Reference in New Issue
Block a user