Fix compilation errors

This commit is contained in:
SimoneN64
2024-08-27 21:53:04 +02:00
parent bba5037da6
commit 86bfeec8bd
4 changed files with 10 additions and 7 deletions

View File

@@ -45,7 +45,6 @@ IncludeCategories:
- Regex: '.*' - Regex: '.*'
Priority: 3 Priority: 3
IncludeIsMainRegex: '(_test|_win|_linux|_mac|_ios|_osx|_null)?$' IncludeIsMainRegex: '(_test|_win|_linux|_mac|_ios|_osx|_null)?$'
IndentCaseLabels: false
IndentWidth: 4 IndentWidth: 4
IndentWrappedFunctionNames: false IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: false KeepEmptyLinesAtTheStartOfBlocks: false

View File

@@ -23,12 +23,14 @@ auto SI::Read(u32 addr) const -> u32 {
case 0x0480000C: case 0x0480000C:
return 0; return 0;
case 0x04800018: case 0x04800018:
u32 val = 0; {
val |= status.dmaBusy; u32 val = 0;
val |= (0 << 1); val |= status.dmaBusy;
val |= (0 << 3); val |= (0 << 1);
val |= (mem.mmio.mi.miIntr.si << 12); val |= (0 << 3);
return val; val |= (mem.mmio.mi.miIntr.si << 12);
return val;
}
default: default:
Util::panic("Unhandled SI[{:08X}] read", addr); Util::panic("Unhandled SI[{:08X}] read", addr);
} }

View File

@@ -16,6 +16,7 @@ include_directories(
../backend/core/mmio/PIF ../backend/core/mmio/PIF
../backend/core/registers ../backend/core/registers
../backend/core/rsp ../backend/core/rsp
../../external
../../external/discord_rpc/include ../../external/discord_rpc/include
../../external/xbyak ../../external/xbyak
../../external/mio/include ../../external/mio/include

View File

@@ -1,6 +1,7 @@
#pragma once #pragma once
#include <fstream> #include <fstream>
#include <log.hpp> #include <log.hpp>
#include <vector>
namespace Util { namespace Util {
FORCE_INLINE std::vector<u8> ReadFileBinary(const std::string &path) { FORCE_INLINE std::vector<u8> ReadFileBinary(const std::string &path) {