From: Alec Roelke Date: Thu, 4 Jan 2018 19:17:13 +0000 (-0500) Subject: arch-riscv: Remove "magic" syscall number constant X-Git-Tag: v19.0.0.0~2407 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0d9f83789bada086ef0901ac30ec31954e905ede;p=gem5.git arch-riscv: Remove "magic" syscall number constant getSyscallArg() in RISC-V has an explicit check to make sure that the register index is within the bounds of the system call register indices vector. This patch fixes it so that it uses SyscallArgumentRegs.size() rather than a "magic" constant that has to be updated every time SyscallArgumentRegs is changed. Change-Id: I2935d811177dc8028cb3df64b250ba997bc970d8 Reviewed-on: https://gem5-review.googlesource.com/7061 Reviewed-by: Jason Lowe-Power Maintainer: Alec Roelke --- diff --git a/src/arch/riscv/process.cc b/src/arch/riscv/process.cc index 6fe935c13..b4fe1eefc 100644 --- a/src/arch/riscv/process.cc +++ b/src/arch/riscv/process.cc @@ -215,10 +215,10 @@ RiscvProcess::argsInit(int pageSize) RiscvISA::IntReg RiscvProcess::getSyscallArg(ThreadContext *tc, int &i) { - // RISC-V only has four system call argument registers by convention, so - // if a larger index is requested return 0 + // If a larger index is requested than there are syscall argument + // registers, return 0 RiscvISA::IntReg retval = 0; - if (i < 4) + if (i < SyscallArgumentRegs.size()) retval = tc->readIntReg(SyscallArgumentRegs[i]); i++; return retval;