Fix compilation on Linux + minor nits
This commit is contained in:
@@ -18,15 +18,15 @@ struct Disassembler {
|
||||
return ret;
|
||||
}
|
||||
|
||||
DisassemblyResult Disassemble(const u32 address, const u32 instruction) {
|
||||
[[nodiscard]] DisassemblyResult Disassemble(const u32 address, const u32 instruction) const {
|
||||
return details ? DisassembleDetailed(address, instruction) : DisassembleSimple(address, instruction);
|
||||
}
|
||||
|
||||
~Disassembler() { cs_close(&handle); }
|
||||
|
||||
private:
|
||||
DisassemblyResult DisassembleDetailed(u32 address, u32 instruction) const;
|
||||
DisassemblyResult DisassembleSimple(u32 address, u32 instruction) const;
|
||||
[[nodiscard]] DisassemblyResult DisassembleDetailed(u32 address, u32 instruction) const;
|
||||
[[nodiscard]] DisassemblyResult DisassembleSimple(u32 address, u32 instruction) const;
|
||||
|
||||
explicit Disassembler(const bool rsp) : rsp(rsp) {
|
||||
if (cs_open(CS_ARCH_MIPS, static_cast<cs_mode>((rsp ? CS_MODE_32 : CS_MODE_64) | CS_MODE_BIG_ENDIAN), &handle) !=
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#include <Core.hpp>
|
||||
#include <Scheduler.hpp>
|
||||
#include <cmath>
|
||||
#include <core/mmio/PI.hpp>
|
||||
#include <log.hpp>
|
||||
|
||||
@@ -341,7 +342,7 @@ void PI::BusWrite<u32, true>(u32 addr, u32 val) {
|
||||
template <>
|
||||
auto PI::BusRead<u64, false>(u32 addr) -> u64 {
|
||||
if (!ReadLatch()) [[unlikely]] {
|
||||
return (u64)latch << 32;
|
||||
return static_cast<u64>(latch) << 32;
|
||||
}
|
||||
|
||||
switch (addr) {
|
||||
@@ -477,7 +478,7 @@ u32 PI::AccessTiming(const u8 domain, const u32 length) const {
|
||||
panic("Unknown PI domain: {}\n", domain);
|
||||
}
|
||||
|
||||
const uint32_t pages = ceil((double)length / page_size);
|
||||
const uint32_t pages = ceil(static_cast<double>(length) / page_size);
|
||||
|
||||
cycles += (14 + latency) * pages;
|
||||
cycles += (pulse_width + release) * (length / 2);
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
#include <cstring>
|
||||
#include <PIF/MupenMovie.hpp>
|
||||
#include <log.hpp>
|
||||
#include "File.hpp"
|
||||
#include "PIF.hpp"
|
||||
#include <File.hpp>
|
||||
#include <PIF.hpp>
|
||||
|
||||
|
||||
union TASMovieControllerData {
|
||||
struct {
|
||||
@@ -36,7 +37,7 @@ bool MupenMovie::Load(const fs::path &path) {
|
||||
return false;
|
||||
}
|
||||
|
||||
memcpy(&loadedTasMovieHeader, loadedTasMovie.data(), sizeof(TASMovieHeader));
|
||||
std::memcpy(&loadedTasMovieHeader, loadedTasMovie.data(), sizeof(TASMovieHeader));
|
||||
|
||||
if (loadedTasMovieHeader.signature[0] != 0x4D || loadedTasMovieHeader.signature[1] != 0x36 ||
|
||||
loadedTasMovieHeader.signature[2] != 0x34 || loadedTasMovieHeader.signature[3] != 0x1A) {
|
||||
|
||||
Reference in New Issue
Block a user