aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Bobek <jan.bobek@gmail.com>2019-05-23 16:44:00 -0400
committerPeter Maydell <peter.maydell@linaro.org>2019-06-07 14:28:22 +0100
commit4cbf157b9b3646dadbb856667372696f7a39b37a (patch)
tree2a0e5878f428e3e1007edfc85627ae64b38c4d6b
parent974046c2c1b055c64b1590f8a7f52e1eea288384 (diff)
risu_i386: move reginfo_t and related defines to risu_reginfo_i386.h
In order to build risu successfully for i386, we need files risu_reginfo_i386.{h,c}; this patch adds the former by extracting the relevant code from risu_i386.c. This patch is pure code motion; no functional changes were made. Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Jan Bobek <jan.bobek@gmail.com> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--risu_i386.c23
-rw-r--r--risu_reginfo_i386.h37
2 files changed, 38 insertions, 22 deletions
diff --git a/risu_i386.c b/risu_i386.c
index 5e7e01d..6798a78 100644
--- a/risu_i386.c
+++ b/risu_i386.c
@@ -14,28 +14,7 @@
#include <string.h>
#include "risu.h"
-
-/* This is the data structure we pass over the socket.
- * It is a simplified and reduced subset of what can
- * be obtained with a ucontext_t*
- */
-struct reginfo {
- uint32_t faulting_insn;
- gregset_t gregs;
-};
-
-#ifndef REG_GS
-/* Assume that either we get all these defines or none */
-#define REG_GS 0
-#define REG_FS 1
-#define REG_ES 2
-#define REG_DS 3
-#define REG_ESP 7
-#define REG_TRAPNO 12
-#define REG_EIP 14
-#define REG_EFL 16
-#define REG_UESP 17
-#endif
+#include "risu_reginfo_i386.h"
struct reginfo master_ri, apprentice_ri;
diff --git a/risu_reginfo_i386.h b/risu_reginfo_i386.h
new file mode 100644
index 0000000..5bba439
--- /dev/null
+++ b/risu_reginfo_i386.h
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Linaro Limited
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Peter Maydell (Linaro) - initial implementation
+ ******************************************************************************/
+
+#ifndef RISU_REGINFO_I386_H
+#define RISU_REGINFO_I386_H
+
+/* This is the data structure we pass over the socket.
+ * It is a simplified and reduced subset of what can
+ * be obtained with a ucontext_t*
+ */
+struct reginfo {
+ uint32_t faulting_insn;
+ gregset_t gregs;
+};
+
+#ifndef REG_GS
+/* Assume that either we get all these defines or none */
+# define REG_GS 0
+# define REG_FS 1
+# define REG_ES 2
+# define REG_DS 3
+# define REG_ESP 7
+# define REG_TRAPNO 12
+# define REG_EIP 14
+# define REG_EFL 16
+# define REG_UESP 17
+#endif /* !defined(REG_GS) */
+
+#endif /* RISU_REGINFO_I386_H */