derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch-riscv,sim: simplify templates for GuestAddr

Browse Source 
Simplify templates in argument handling for ABI=RicsvISA::RegABI32 and
Arg=GuestAddr.

Change-Id: I6af2e6fe1b77b1367136a8e8621053069bf3c3f0
This commit is contained in:
Robert Hauser
2024-03-16 09:05:30 +00:00
parent e3fd3d7775
commit f7da70bd10
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/arch/riscv/reg_abi.hh
View File

@@ -77,22 +77,20 @@ struct Argument<ABI, Arg,
}
};
// This method will be used for Riscv 32 pointers.
template <typename ABI, typename Arg>
struct Argument<ABI, Arg,
typename std::enable_if_t<
std::is_base_of_v<RiscvISA::RegABI32, ABI> &&
std::is_same<Arg,GuestAddr>::value &&
ABI::template IsWideV<Arg>>>
// This method will be used for RV32 pointers.
template <>
struct Argument<RiscvISA::RegABI32, GuestAddr>
{
static Arg
using ABI = RiscvISA::RegABI32;
static GuestAddr
get(ThreadContext *tc, typename ABI::State &state)
{
panic_if(state >= ABI::ArgumentRegs.size(),
"Ran out of syscall argument registers.");
auto arg = bits(tc->getReg(ABI::ArgumentRegs[state++]), 31, 0);
return *reinterpret_cast<Arg*>(&arg);
return *reinterpret_cast<GuestAddr*>(&arg);
}
};