From d81ea82a23a1f8fe3f7ef2f76b4cf7ee73fed0bf Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Fri, 22 Nov 2019 16:00:51 -0800 Subject: [PATCH] arch: Use ignoreWarnOnceFunc instead of the WarnOnce flag. Jira Issue: https://gem5.atlassian.net/browse/GEM5-187 Change-Id: I9bbffcc74ec4f3df4effa5c50f0a4a688c5b6016 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23169 Tested-by: kokoro Reviewed-by: Giacomo Travaglini Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/arch/arm/linux/process.cc | 12 +++++----- src/arch/riscv/linux/process.cc | 42 ++++++++++++++++----------------- src/arch/x86/linux/process.cc | 6 ++--- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/arch/arm/linux/process.cc b/src/arch/arm/linux/process.cc index ca8e00c71..d3d0e85be 100644 --- a/src/arch/arm/linux/process.cc +++ b/src/arch/arm/linux/process.cc @@ -291,7 +291,7 @@ static SyscallDesc syscallDescs32[] = { /* 123 */ SyscallDesc("unused#123", unimplementedFunc), /* 124 */ SyscallDesc("adjtimex", unimplementedFunc), /* 125 */ SyscallDesc("mprotect", ignoreFunc), - /* 126 */ SyscallDesc("sigprocmask", ignoreFunc, SyscallDesc::WarnOnce), + /* 126 */ SyscallDesc("sigprocmask", ignoreWarnOnceFunc), /* 127 */ SyscallDesc("unused#127", unimplementedFunc), /* 128 */ SyscallDesc("init_module", unimplementedFunc), /* 129 */ SyscallDesc("delete_module", unimplementedFunc), @@ -331,7 +331,7 @@ static SyscallDesc syscallDescs32[] = { /* 159 */ SyscallDesc("sched_get_priority_max", unimplementedFunc), /* 160 */ SyscallDesc("sched_get_priority_min", unimplementedFunc), /* 161 */ SyscallDesc("sched_rr_get_interval", unimplementedFunc), - /* 162 */ SyscallDesc("nanosleep", ignoreFunc, SyscallDesc::WarnOnce), + /* 162 */ SyscallDesc("nanosleep", ignoreWarnOnceFunc), /* 163 */ SyscallDesc("mremap", mremapFunc), // ARM-specific /* 164 */ SyscallDesc("setresuid", unimplementedFunc), /* 165 */ SyscallDesc("getresuid", unimplementedFunc), @@ -343,8 +343,8 @@ static SyscallDesc syscallDescs32[] = { /* 171 */ SyscallDesc("getresgid", unimplementedFunc), /* 172 */ SyscallDesc("prctl", unimplementedFunc), /* 173 */ SyscallDesc("rt_sigreturn", unimplementedFunc), - /* 174 */ SyscallDesc("rt_sigaction", ignoreFunc, SyscallDesc::WarnOnce), - /* 175 */ SyscallDesc("rt_sigprocmask", ignoreFunc, SyscallDesc::WarnOnce), + /* 174 */ SyscallDesc("rt_sigaction", ignoreWarnOnceFunc), + /* 175 */ SyscallDesc("rt_sigprocmask", ignoreWarnOnceFunc), /* 176 */ SyscallDesc("rt_sigpending", unimplementedFunc), /* 177 */ SyscallDesc("rt_sigtimedwait", unimplementedFunc), /* 178 */ SyscallDesc("rt_sigqueueinfo", ignoreFunc), @@ -647,7 +647,7 @@ static SyscallDesc syscallDescs64[] = { /* 98 */ SyscallDesc("futex", futexFunc), /* 99 */ SyscallDesc("set_robust_list", ignoreFunc), /* 100 */ SyscallDesc("get_robust_list", unimplementedFunc), - /* 101 */ SyscallDesc("nanosleep", ignoreFunc, SyscallDesc::WarnOnce), + /* 101 */ SyscallDesc("nanosleep", ignoreWarnOnceFunc), /* 102 */ SyscallDesc("getitimer", unimplementedFunc), /* 103 */ SyscallDesc("setitimer", unimplementedFunc), /* 104 */ SyscallDesc("kexec_load", unimplementedFunc), @@ -681,7 +681,7 @@ static SyscallDesc syscallDescs64[] = { /* 132 */ SyscallDesc("sigaltstack", unimplementedFunc), /* 133 */ SyscallDesc("rt_sigsuspend", unimplementedFunc), /* 134 */ SyscallDesc("rt_sigaction", ignoreFunc), - /* 135 */ SyscallDesc("rt_sigprocmask", ignoreFunc, SyscallDesc::WarnOnce), + /* 135 */ SyscallDesc("rt_sigprocmask", ignoreWarnOnceFunc), /* 136 */ SyscallDesc("rt_sigpending", unimplementedFunc), /* 137 */ SyscallDesc("rt_sigtimedwait", unimplementedFunc), /* 138 */ SyscallDesc("rt_sigqueueinfo", ignoreFunc), diff --git a/src/arch/riscv/linux/process.cc b/src/arch/riscv/linux/process.cc index 4a16f77f7..d6a41e240 100644 --- a/src/arch/riscv/linux/process.cc +++ b/src/arch/riscv/linux/process.cc @@ -221,9 +221,9 @@ std::map RiscvLinuxProcess64::syscallDescs = { {96, SyscallDesc("set_tid_address", setTidAddressFunc)}, {97, SyscallDesc("unshare")}, {98, SyscallDesc("futex", futexFunc)}, - {99, SyscallDesc("set_robust_list", ignoreFunc, SyscallDesc::WarnOnce)}, - {100, SyscallDesc("get_robust_list", ignoreFunc, SyscallDesc::WarnOnce)}, - {101, SyscallDesc("nanosleep", ignoreFunc, SyscallDesc::WarnOnce)}, + {99, SyscallDesc("set_robust_list", ignoreWarnOnceFunc)}, + {100, SyscallDesc("get_robust_list", ignoreWarnOnceFunc)}, + {101, SyscallDesc("nanosleep", ignoreWarnOnceFunc)}, {102, SyscallDesc("getitimer")}, {103, SyscallDesc("setitimer")}, {104, SyscallDesc("kexec_load")}, @@ -246,7 +246,7 @@ std::map RiscvLinuxProcess64::syscallDescs = { {121, SyscallDesc("sched_getparam")}, {122, SyscallDesc("sched_setaffinity")}, {123, SyscallDesc("sched_getaffinity")}, - {124, SyscallDesc("sched_yield", ignoreFunc, SyscallDesc::WarnOnce)}, + {124, SyscallDesc("sched_yield", ignoreWarnOnceFunc)}, {125, SyscallDesc("sched_get_priority_max")}, {126, SyscallDesc("sched_get_priority_min")}, {127, SyscallDesc("scheD_rr_get_interval")}, @@ -255,13 +255,13 @@ std::map RiscvLinuxProcess64::syscallDescs = { {130, SyscallDesc("tkill")}, {131, SyscallDesc("tgkill", tgkillFunc)}, {132, SyscallDesc("sigaltstack")}, - {133, SyscallDesc("rt_sigsuspend", ignoreFunc, SyscallDesc::WarnOnce)}, - {134, SyscallDesc("rt_sigaction", ignoreFunc, SyscallDesc::WarnOnce)}, - {135, SyscallDesc("rt_sigprocmask", ignoreFunc, SyscallDesc::WarnOnce)}, - {136, SyscallDesc("rt_sigpending", ignoreFunc, SyscallDesc::WarnOnce)}, - {137, SyscallDesc("rt_sigtimedwait", ignoreFunc,SyscallDesc::WarnOnce)}, - {138, SyscallDesc("rt_sigqueueinfo", ignoreFunc,SyscallDesc::WarnOnce)}, - {139, SyscallDesc("rt_sigreturn", ignoreFunc, SyscallDesc::WarnOnce)}, + {133, SyscallDesc("rt_sigsuspend", ignoreWarnOnceFunc)}, + {134, SyscallDesc("rt_sigaction", ignoreWarnOnceFunc)}, + {135, SyscallDesc("rt_sigprocmask", ignoreWarnOnceFunc)}, + {136, SyscallDesc("rt_sigpending", ignoreWarnOnceFunc)}, + {137, SyscallDesc("rt_sigtimedwait", ignoreWarnOnceFunc)}, + {138, SyscallDesc("rt_sigqueueinfo", ignoreWarnOnceFunc)}, + {139, SyscallDesc("rt_sigreturn", ignoreWarnOnceFunc)}, {140, SyscallDesc("setpriority")}, {141, SyscallDesc("getpriority")}, {142, SyscallDesc("reboot")}, @@ -552,8 +552,8 @@ std::map RiscvLinuxProcess32::syscallDescs = { {96, SyscallDesc("set_tid_address", setTidAddressFunc)}, {97, SyscallDesc("unshare")}, {98, SyscallDesc("futex", futexFunc)}, - {99, SyscallDesc("set_robust_list", ignoreFunc, SyscallDesc::WarnOnce)}, - {100, SyscallDesc("get_robust_list", ignoreFunc, SyscallDesc::WarnOnce)}, + {99, SyscallDesc("set_robust_list", ignoreWarnOnceFunc)}, + {100, SyscallDesc("get_robust_list", ignoreWarnOnceFunc)}, {101, SyscallDesc("nanosleep")}, {102, SyscallDesc("getitimer")}, {103, SyscallDesc("setitimer")}, @@ -577,7 +577,7 @@ std::map RiscvLinuxProcess32::syscallDescs = { {121, SyscallDesc("sched_getparam")}, {122, SyscallDesc("sched_setaffinity")}, {123, SyscallDesc("sched_getaffinity")}, - {124, SyscallDesc("sched_yield", ignoreFunc, SyscallDesc::WarnOnce)}, + {124, SyscallDesc("sched_yield", ignoreWarnOnceFunc)}, {125, SyscallDesc("sched_get_priority_max")}, {126, SyscallDesc("sched_get_priority_min")}, {127, SyscallDesc("scheD_rr_get_interval")}, @@ -586,13 +586,13 @@ std::map RiscvLinuxProcess32::syscallDescs = { {130, SyscallDesc("tkill")}, {131, SyscallDesc("tgkill", tgkillFunc)}, {132, SyscallDesc("sigaltstack")}, - {133, SyscallDesc("rt_sigsuspend", ignoreFunc, SyscallDesc::WarnOnce)}, - {134, SyscallDesc("rt_sigaction", ignoreFunc, SyscallDesc::WarnOnce)}, - {135, SyscallDesc("rt_sigprocmask", ignoreFunc, SyscallDesc::WarnOnce)}, - {136, SyscallDesc("rt_sigpending", ignoreFunc, SyscallDesc::WarnOnce)}, - {137, SyscallDesc("rt_sigtimedwait", ignoreFunc,SyscallDesc::WarnOnce)}, - {138, SyscallDesc("rt_sigqueueinfo", ignoreFunc,SyscallDesc::WarnOnce)}, - {139, SyscallDesc("rt_sigreturn", ignoreFunc, SyscallDesc::WarnOnce)}, + {133, SyscallDesc("rt_sigsuspend", ignoreWarnOnceFunc)}, + {134, SyscallDesc("rt_sigaction", ignoreWarnOnceFunc)}, + {135, SyscallDesc("rt_sigprocmask", ignoreWarnOnceFunc)}, + {136, SyscallDesc("rt_sigpending", ignoreWarnOnceFunc)}, + {137, SyscallDesc("rt_sigtimedwait", ignoreWarnOnceFunc)}, + {138, SyscallDesc("rt_sigqueueinfo", ignoreWarnOnceFunc)}, + {139, SyscallDesc("rt_sigreturn", ignoreWarnOnceFunc)}, {140, SyscallDesc("setpriority")}, {141, SyscallDesc("getpriority")}, {142, SyscallDesc("reboot")}, diff --git a/src/arch/x86/linux/process.cc b/src/arch/x86/linux/process.cc index dfb1c42f8..6befafde4 100644 --- a/src/arch/x86/linux/process.cc +++ b/src/arch/x86/linux/process.cc @@ -271,8 +271,8 @@ static SyscallDesc syscallDescs64[] = { /* 10 */ SyscallDesc("mprotect", ignoreFunc), /* 11 */ SyscallDesc("munmap", munmapFunc), /* 12 */ SyscallDesc("brk", brkFunc), - /* 13 */ SyscallDesc("rt_sigaction", ignoreFunc, SyscallDesc::WarnOnce), - /* 14 */ SyscallDesc("rt_sigprocmask", ignoreFunc, SyscallDesc::WarnOnce), + /* 13 */ SyscallDesc("rt_sigaction", ignoreWarnOnceFunc), + /* 14 */ SyscallDesc("rt_sigprocmask", ignoreWarnOnceFunc), /* 15 */ SyscallDesc("rt_sigreturn", unimplementedFunc), /* 16 */ SyscallDesc("ioctl", ioctlFunc), /* 17 */ SyscallDesc("pread64", unimplementedFunc), @@ -293,7 +293,7 @@ static SyscallDesc syscallDescs64[] = { /* 32 */ SyscallDesc("dup", dupFunc), /* 33 */ SyscallDesc("dup2", dup2Func), /* 34 */ SyscallDesc("pause", unimplementedFunc), - /* 35 */ SyscallDesc("nanosleep", ignoreFunc, SyscallDesc::WarnOnce), + /* 35 */ SyscallDesc("nanosleep", ignoreWarnOnceFunc), /* 36 */ SyscallDesc("getitimer", unimplementedFunc), /* 37 */ SyscallDesc("alarm", unimplementedFunc), /* 38 */ SyscallDesc("setitimer", unimplementedFunc), -- 2.30.2