sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc: Replace offsetof with constexpr-friendly OFFSETOF

Browse Source 
Fixes build with clang-18.
This commit is contained in:
Stenzek
2024-04-28 14:25:34 +10:00
parent dc84c58c7c
commit 295081fe62
14 changed files with 144 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/cpu_newrec_compiler_aarch32.cpp
View File

@ -325,7 +325,7 @@ void CPU::NewRec::AArch32Compiler::GenerateICacheCheckAndUpdate()
continue;
const u32 line = GetICacheLine(current_pc);
const u32 offset = offsetof(State, icache_tags) + (line * sizeof(u32));
const u32 offset = OFFSETOF(State, icache_tags) + (line * sizeof(u32));
Label cache_hit;
armAsm->ldr(existing_tag_reg, MemOperand(RSTATE, offset));
@ -654,7 +654,7 @@ void CPU::NewRec::AArch32Compiler::Flush(u32 flags)
// TODO: make it a function?
armAsm->ldrb(RARG1, PTR(&g_state.load_delay_reg));
armAsm->ldr(RARG2, PTR(&g_state.load_delay_value));
EmitMov(RSCRATCH, offsetof(CPU::State, regs.r[0]));
EmitMov(RSCRATCH, OFFSETOF(CPU::State, regs.r[0]));
armAsm->add(RARG1, RSCRATCH, vixl::aarch32::Operand(RARG1, LSL, 2));
armAsm->str(RARG2, MemOperand(RSTATE, RARG1));
EmitMov(RSCRATCH, static_cast<u8>(Reg::count));