From c63a00d65737a2f556637945a548a0bbaeb61b39 Mon Sep 17 00:00:00 2001 From: Brandon Potter Date: Sun, 1 Dec 2019 14:23:22 -0500 Subject: [PATCH] cpu,sim-se: move error checks in syscall methods There is a check on a global flag denoting that the simulator has been configured to run in fullsystem mode. The check is conducted at runtime during calls to syscall methods. The high-level models are checking the flag when the check could be conducted further down the call chain (nearer to the actual Process invocation). Moving the checks should result in less copy-pasta as new models are developed. It might be argued that the checks should stay in place since an error would detected earlier; that may be true, but the error would be the same and the simulation should fail in either case. This arrangement requires fewer lines of code. The changeset also changes the check into a fatal error instead of a panic since usage (in fs mode) should result in immediate corruption. Change-Id: If387e27f166ac1374f3fe8b7befe3546e69adba7 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23240 Reviewed-by: Giacomo Travaglini Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- src/cpu/minor/exec_context.hh | 3 --- src/cpu/o3/dyn_inst_impl.hh | 4 ---- src/cpu/o3/thread_state.hh | 1 + src/cpu/simple/exec_context.hh | 3 --- src/cpu/simple_thread.hh | 2 ++ 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/cpu/minor/exec_context.hh b/src/cpu/minor/exec_context.hh index 87787f011..66e313eb3 100644 --- a/src/cpu/minor/exec_context.hh +++ b/src/cpu/minor/exec_context.hh @@ -389,9 +389,6 @@ class ExecContext : public ::ExecContext void syscall(int64_t callnum, Fault *fault) override { - if (FullSystem) - panic("Syscall emulation isn't available in FS mode.\n"); - thread.syscall(callnum, fault); } diff --git a/src/cpu/o3/dyn_inst_impl.hh b/src/cpu/o3/dyn_inst_impl.hh index fbeb3c291..22d89ec0b 100644 --- a/src/cpu/o3/dyn_inst_impl.hh +++ b/src/cpu/o3/dyn_inst_impl.hh @@ -45,7 +45,6 @@ #include "base/cp_annotate.hh" #include "cpu/o3/dyn_inst.hh" -#include "sim/full_system.hh" #include "debug/O3PipeView.hh" template @@ -195,9 +194,6 @@ template void BaseO3DynInst::syscall(int64_t callnum, Fault *fault) { - if (FullSystem) - panic("Syscall emulation isn't available in FS mode.\n"); - // HACK: check CPU's nextPC before and after syscall. If it // changes, update this instruction's nextPC because the syscall // must have changed the nextPC. diff --git a/src/cpu/o3/thread_state.hh b/src/cpu/o3/thread_state.hh index a4a12330f..a0c3a8171 100644 --- a/src/cpu/o3/thread_state.hh +++ b/src/cpu/o3/thread_state.hh @@ -150,6 +150,7 @@ struct O3ThreadState : public ThreadState { /** Handles the syscall. */ void syscall(int64_t callnum, Fault *fault) { + fatal_if(FullSystem, "System call emulation is unavailable!"); process->syscall(callnum, tc, fault); } diff --git a/src/cpu/simple/exec_context.hh b/src/cpu/simple/exec_context.hh index 91f7ec526..4d26dfe2a 100644 --- a/src/cpu/simple/exec_context.hh +++ b/src/cpu/simple/exec_context.hh @@ -499,9 +499,6 @@ class SimpleExecContext : public ExecContext { void syscall(int64_t callnum, Fault *fault) override { - if (FullSystem) - panic("Syscall emulation isn't available in FS mode."); - thread->syscall(callnum, fault); } diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh index f25e62249..387e74546 100644 --- a/src/cpu/simple_thread.hh +++ b/src/cpu/simple_thread.hh @@ -66,6 +66,7 @@ #include "mem/request.hh" #include "sim/byteswap.hh" #include "sim/eventq.hh" +#include "sim/full_system.hh" #include "sim/process.hh" #include "sim/serialize.hh" #include "sim/system.hh" @@ -610,6 +611,7 @@ class SimpleThread : public ThreadState, public ThreadContext void syscall(int64_t callnum, Fault *fault) override { + fatal_if(FullSystem, "System call emulation is unavailable!"); process->syscall(callnum, this, fault); } -- 2.30.2