From 5d923ab5d07b6efbecdc8e6b2f6039862dfd93ee Mon Sep 17 00:00:00 2001
From: Gabe Black <gabe.black@gmail.com>
Date: Tue, 20 Oct 2020 17:37:22 -0700
Subject: [PATCH] sim: Remove the syscall gem5 op.

This is now handled by the workload "event" gem5 op.

Change-Id: Ibc195fde14a6174d1978bf280c349ca895e7fda3
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/34164
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 include/gem5/asm/generic/m5ops.h |  2 --
 include/gem5/m5ops.h             |  1 -
 src/sim/pseudo_inst.cc           | 11 -----------
 src/sim/pseudo_inst.hh           |  4 ----
 4 files changed, 18 deletions(-)

diff --git a/include/gem5/asm/generic/m5ops.h b/include/gem5/asm/generic/m5ops.h
index aad927c05..1b5f0022c 100644
--- a/include/gem5/asm/generic/m5ops.h
+++ b/include/gem5/asm/generic/m5ops.h
@@ -76,7 +76,6 @@
 #define M5OP_WORK_BEGIN         0x5a
 #define M5OP_WORK_END           0x5b
 
-#define M5OP_SE_SYSCALL         0x60
 #define M5OP_SE_PAGE_FAULT      0x61
 #define M5OP_DIST_TOGGLE_SYNC   0x62
 
@@ -108,7 +107,6 @@
     M5OP(m5_panic, M5OP_PANIC)                                  \
     M5OP(m5_work_begin, M5OP_WORK_BEGIN)                        \
     M5OP(m5_work_end, M5OP_WORK_END)                            \
-    M5OP(m5_se_syscall, M5OP_SE_SYSCALL)                        \
     M5OP(m5_se_page_fault, M5OP_SE_PAGE_FAULT)                  \
     M5OP(m5_dist_toggle_sync, M5OP_DIST_TOGGLE_SYNC)            \
     M5OP(m5_workload, M5OP_WORKLOAD)                            \
diff --git a/include/gem5/m5ops.h b/include/gem5/m5ops.h
index 1caab225e..87eae7f55 100644
--- a/include/gem5/m5ops.h
+++ b/include/gem5/m5ops.h
@@ -65,7 +65,6 @@ void m5_panic(void);
 void m5_work_begin(uint64_t workid, uint64_t threadid);
 void m5_work_end(uint64_t workid, uint64_t threadid);
 
-void m5_se_syscall();
 void m5_se_page_fault();
 
 /*
diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index 03014c0c6..058e5dd25 100644
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -471,17 +471,6 @@ switchcpu(ThreadContext *tc)
     exitSimLoop("switchcpu");
 }
 
-/*
- * This function is executed when the simulation is executing the syscall
- * handler in System Emulation mode.
- */
-void
-m5Syscall(ThreadContext *tc)
-{
-    DPRINTF(PseudoInst, "PseudoInst::m5Syscall()\n");
-    tc->getSystemPtr()->workload->syscall(tc);
-}
-
 void
 togglesync(ThreadContext *tc)
 {
diff --git a/src/sim/pseudo_inst.hh b/src/sim/pseudo_inst.hh
index e5c4fe592..fa5530324 100644
--- a/src/sim/pseudo_inst.hh
+++ b/src/sim/pseudo_inst.hh
@@ -242,10 +242,6 @@ pseudoInstWork(ThreadContext *tc, uint8_t func, uint64_t &result)
         return false;
 
       /* SE mode functions */
-      case M5OP_SE_SYSCALL:
-        invokeSimcall<ABI>(tc, m5Syscall);
-        return true;
-
       case M5OP_SE_PAGE_FAULT:
         invokeSimcall<ABI>(tc, TheISA::m5PageFault);
         return true;
-- 
2.30.2