Move SyscallEntryOrExit to replay_syscall.cc

rr-debugger · Mar 18, 2015 · 81e5ba8 · 81e5ba8
1 parent a980a00
commit 81e5ba8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 23 deletions.
diff --git a/src/Event.cc b/src/Event.cc
@@ -342,19 +342,6 @@ std::string Event::type_name() const {
   }
 }
 
-const char* state_name(SyscallEntryOrExit state) {
-  switch (state) {
-#define CASE(_id)                                                              \
-  case _id:                                                                    \
-    return #_id
-    CASE(SYSCALL_ENTRY);
-    CASE(SYSCALL_EXIT);
-#undef CASE
-    default:
-      return "???state";
-  }
-}
-
 const char* state_name(SyscallState state) {
   switch (state) {
 #define CASE(_id)                                                              \

diff --git a/src/Event.h b/src/Event.h
@@ -60,11 +60,6 @@ enum EventType {
   EV_LAST
 };
 
-enum SyscallEntryOrExit {
-  SYSCALL_ENTRY,
-  SYSCALL_EXIT
-};
-
 enum HasExecInfo {
   NO_EXEC_INFO,
   HAS_EXEC_INFO
@@ -365,11 +360,6 @@ inline static std::ostream& operator<<(std::ostream& o,
   return o << Event(ev);
 }
 
-/**
- * Return the symbolic name of |state|, or "???state" if unknown.
- */
-const char* state_name(SyscallEntryOrExit state);
-
 const char* state_name(SyscallState state);
 
 #endif // EVENT_H_
diff --git a/src/replay_syscall.cc b/src/replay_syscall.cc
@@ -84,6 +84,27 @@ template <typename Arch> struct syscall_defs {
 
 #endif // CHECK_SYSCALL_NUMBERS
 
+enum SyscallEntryOrExit {
+  SYSCALL_ENTRY,
+  SYSCALL_EXIT
+};
+
+/**
+ * Return the symbolic name of |state|, or "???state" if unknown.
+ */
+static const char* state_name(SyscallEntryOrExit state) {
+  switch (state) {
+#define CASE(_id)                                                              \
+  case _id:                                                                    \
+    return #_id
+    CASE(SYSCALL_ENTRY);
+    CASE(SYSCALL_EXIT);
+#undef CASE
+    default:
+      return "???state";
+  }
+}
+
 /**
  * Proceeds until the next system call, which is not executed.
  */