From 229a6953ad57adf72d4e23fc0ee6873404e85bf7 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 15 May 2024 19:23:20 +0200
Subject: [PATCH] xfree86: x86emu: rename segment register fields

Instead of keeping lots of special hacks for Solaris, just rename the
field of struct i386_segment_regs, so we don't need special care anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1548>
---
 hw/xfree86/x86emu/decode.c         |  9 ---------
 hw/xfree86/x86emu/x86emu/regs.h    | 23 +++++++----------------
 hw/xfree86/x86emu/x86emu/x86emui.h |  9 ---------
 3 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/hw/xfree86/x86emu/decode.c b/hw/xfree86/x86emu/decode.c
index 261d67b21..6e4013ecc 100644
--- a/hw/xfree86/x86emu/decode.c
+++ b/hw/xfree86/x86emu/decode.c
@@ -39,15 +39,6 @@
 
 #include <stdlib.h>
 
-#if defined(__sun) && defined(CS) /* avoid conflicts with Solaris sys/regset.h */
-# undef CS
-# undef DS
-# undef SS
-# undef ES
-# undef FS
-# undef GS
-#endif
-
 #include "x86emu/x86emui.h"
 
 /*----------------------------- Implementation ----------------------------*/
diff --git a/hw/xfree86/x86emu/x86emu/regs.h b/hw/xfree86/x86emu/x86emu/regs.h
index edf9be324..7c649755e 100644
--- a/hw/xfree86/x86emu/x86emu/regs.h
+++ b/hw/xfree86/x86emu/x86emu/regs.h
@@ -114,17 +114,8 @@ struct i386_special_regs {
  * CS, DS, ES, SS.
  */
 
-#if defined(__sun) && defined(CS) /* avoid conflicts with Solaris sys/regset.h */
-# undef CS
-# undef DS
-# undef SS
-# undef ES
-# undef FS
-# undef GS
-#endif
-
 struct i386_segment_regs {
-    u16 CS, DS, SS, ES, FS, GS;
+    u16 reg_cs, reg_ds, reg_ss, reg_es, reg_fs, reg_gs;
 };
 
 /* 8 bit registers */
@@ -166,12 +157,12 @@ struct i386_segment_regs {
 #define R_EFLG spc.FLAGS
 
 /* segment registers */
-#define R_CS  seg.CS
-#define R_DS  seg.DS
-#define R_SS  seg.SS
-#define R_ES  seg.ES
-#define R_FS  seg.FS
-#define R_GS  seg.GS
+#define R_CS  seg.reg_cs
+#define R_DS  seg.reg_ds
+#define R_SS  seg.reg_ss
+#define R_ES  seg.reg_es
+#define R_FS  seg.reg_fs
+#define R_GS  seg.reg_gs
 
 /* flag conditions   */
 #define FB_CF 0x0001            /* CARRY flag  */
diff --git a/hw/xfree86/x86emu/x86emu/x86emui.h b/hw/xfree86/x86emu/x86emu/x86emui.h
index aa2074a87..1d1decc4c 100644
--- a/hw/xfree86/x86emu/x86emu/x86emui.h
+++ b/hw/xfree86/x86emu/x86emu/x86emui.h
@@ -73,15 +73,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-/* avoid conflicts with Solaris sys/regset.h */
-# if defined(__sun) && defined(CS)
-#  undef CS
-#  undef DS
-#  undef SS
-#  undef ES
-#  undef FS
-#  undef GS
-# endif
 #endif /* NO_SYS_HEADERS */
 
 /*--------------------------- Inline Functions ----------------------------*/