Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Switch invalid-offset diagnostic pragma to gcc #1761

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build: Switch invalid-offset diagnostic pragma to gcc #1761

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ares/n64/cpu/recompiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ auto CPU::Recompiler::block(u64 vaddr, u32 address, bool singleInstruction) -> B
#define IpuReg(r) sreg(1), offsetof(IPU, r) - IpuBase
#define PipelineReg(x) mem(sreg(0), offsetof(CPU, pipeline) + offsetof(Pipeline, x))

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Winvalid-offsetof"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Winvalid-offsetof"
auto CPU::Recompiler::emit(u64 vaddr, u32 address, bool singleInstruction) -> Block* {
if(unlikely(allocator.available() < 1_MiB)) {
print("CPU allocator flush\n");
Expand Down Expand Up @@ -96,7 +96,7 @@ auto CPU::Recompiler::emit(u64 vaddr, u32 address, bool singleInstruction) -> Bl
//print(hex(PC, 8L), " ", instructions, " ", size(), "\n");
return block;
}
#pragma clang diagnostic pop
#pragma GCC diagnostic pop

#define Sa (instruction >> 6 & 31)
#define Rdn (instruction >> 11 & 31)
Expand Down
Loading