frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-05-15 19:23:20 +02:00 committed by Marge Bot
parent 0a0731721f
commit 229a6953ad
3 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/xfree86/x86emu/decode.c
View File

@ -39,15 +39,6 @@
#include <stdlib.h> #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" #include "x86emu/x86emui.h"
/*----------------------------- Implementation ----------------------------*/ /*----------------------------- Implementation ----------------------------*/

23
hw/xfree86/x86emu/x86emu/regs.h
View File

@ -114,17 +114,8 @@ struct i386_special_regs {
* CS, DS, ES, SS. * 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 { 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 */ /* 8 bit registers */
@ -166,12 +157,12 @@ struct i386_segment_regs {
#define R_EFLG spc.FLAGS #define R_EFLG spc.FLAGS
/* segment registers */ /* segment registers */
#define R_CS seg.CS #define R_CS seg.reg_cs
#define R_DS seg.DS #define R_DS seg.reg_ds
#define R_SS seg.SS #define R_SS seg.reg_ss
#define R_ES seg.ES #define R_ES seg.reg_es
#define R_FS seg.FS #define R_FS seg.reg_fs
#define R_GS seg.GS #define R_GS seg.reg_gs
/* flag conditions */ /* flag conditions */
#define FB_CF 0x0001 /* CARRY flag */ #define FB_CF 0x0001 /* CARRY flag */

9
hw/xfree86/x86emu/x86emu/x86emui.h
View File

@ -73,15 +73,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.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 */ #endif /* NO_SYS_HEADERS */
/*--------------------------- Inline Functions ----------------------------*/ /*--------------------------- Inline Functions ----------------------------*/