xserver: Branch 'master' - 5 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Apr 18 01:07:41 UTC 2024
hw/xfree86/modes/xf86Cursors.c | 6 ------
hw/xfree86/os-support/bsd/bsd_init.c | 1 -
hw/xfree86/x86emu/prim_ops.c | 4 ++--
hw/xfree86/x86emu/sys.c | 33 ---------------------------------
4 files changed, 2 insertions(+), 42 deletions(-)
New commits:
commit 43f47e8e6597f06cf2082514c10a71965fa6d3c8
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Thu Mar 21 13:56:32 2024 +0100
xfree86: x86emu: fix warning on unneccessary abs()
fix warning:
> In file included from ../hw/xfree86/int10/x86emu.c:11:
> ../hw/xfree86/x86emu/prim_ops.c:2478:9: warning: taking the absolute value of unsigned type 'x86emuu32' (aka 'unsigned int') has no effect [-Wabsolute-value]
> if (abs(div) > 0xff) {
> ^
> ../hw/xfree86/x86emu/prim_ops.c:2478:9: note: remove the call to 'abs' since unsigned values cannot be negative
> if (abs(div) > 0xff) {
> ^~~
> ../hw/xfree86/x86emu/prim_ops.c:2502:9: warning: taking the absolute value of unsigned type 'x86emuu32' (aka 'unsigned int') has no effect [-Wabsolute-value]
> if (abs(div) > 0xffff) {
> ^
> ../hw/xfree86/x86emu/prim_ops.c:2502:9: note: remove the call to 'abs' since unsigned values cannot be negative
> if (abs(div) > 0xffff) {
> ^~~
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1428>
diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c
index 47877eb26..ff25215e2 100644
--- a/hw/xfree86/x86emu/prim_ops.c
+++ b/hw/xfree86/x86emu/prim_ops.c
@@ -2475,7 +2475,7 @@ div_byte(u8 s)
}
div = dvd / (u8) s;
mod = dvd % (u8) s;
- if (abs(div) > 0xff) {
+ if (div > 0xff) {
x86emu_intr_raise(0);
return;
}
@@ -2499,7 +2499,7 @@ div_word(u16 s)
}
div = dvd / (u16) s;
mod = dvd % (u16) s;
- if (abs(div) > 0xffff) {
+ if (div > 0xffff) {
x86emu_intr_raise(0);
return;
}
commit a0daa6f1fe82be72f6341e0288304d7de8b84dea
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Thu Mar 21 10:29:30 2024 +0100
xfree86: x86emu: drop unused stq_u()
fix warning on unused function:
> ../hw/xfree86/x86emu/sys.c:87:1: warning: unused function 'stq_u' [-Wunused-function]
> stq_u(u64 val, u64 * p)
> ^
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1428>
diff --git a/hw/xfree86/x86emu/sys.c b/hw/xfree86/x86emu/sys.c
index d3fffa5cf..5622c5fc0 100644
--- a/hw/xfree86/x86emu/sys.c
+++ b/hw/xfree86/x86emu/sys.c
@@ -83,14 +83,6 @@ ldw_u(u16 * p)
/* Elemental unaligned stores */
-static __inline__ void
-stq_u(u64 val, u64 * p)
-{
- struct __una_u64 *ptr = (struct __una_u64 *) p;
-
- ptr->x = val;
-}
-
static __inline__ void
stl_u(u32 val, u32 * p)
{
@@ -126,14 +118,6 @@ ldw_u(u16 * p)
return ret;
}
-static __inline__ void
-stq_u(u64 val, u64 * p)
-{
- u64 tmp = val;
-
- memmove(p, &tmp, sizeof(*p));
-}
-
static __inline__ void
stl_u(u32 val, u32 * p)
{
commit 8081fe1206af343798db330a72b16996e53b5087
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Wed Mar 20 19:54:06 2024 +0100
xfree86: x86emu: drop unused ldq_u()
fix warning on unused function:
> ../hw/xfree86/x86emu/sys.c:69:1: warning: unused function 'ldq_u' [-Wunused-function]
> ldq_u(u64 * p)
> ^
> ../hw/xfree86/x86emu/sys.c:95:1: warning: unused function 'stq_u' [-Wunused-function]
> stq_u(u64 val, u64 * p)
> ^
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1428>
diff --git a/hw/xfree86/x86emu/sys.c b/hw/xfree86/x86emu/sys.c
index 6a648bf39..d3fffa5cf 100644
--- a/hw/xfree86/x86emu/sys.c
+++ b/hw/xfree86/x86emu/sys.c
@@ -65,14 +65,6 @@ struct __una_u16 {
/* Elemental unaligned loads */
-static __inline__ u64
-ldq_u(u64 * p)
-{
- const struct __una_u64 *ptr = (const struct __una_u64 *) p;
-
- return ptr->x;
-}
-
static __inline__ u32
ldl_u(u32 * p)
{
@@ -116,15 +108,6 @@ stw_u(u16 val, u16 * p)
}
#else /* !__GNUC__ */
-static __inline__ u64
-ldq_u(u64 * p)
-{
- u64 ret;
-
- memmove(&ret, p, sizeof(*p));
- return ret;
-}
-
static __inline__ u32
ldl_u(u32 * p)
{
commit 1e7085d143765d51fb06130ca737180bc13131a2
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Wed Mar 20 19:35:41 2024 +0100
xfree86: os-support: bsd: fix missing prototypes
Fix warnings on missing prototypes:
> ../hw/xfree86/os-support/bsd/bsd_VTsw.c:56:20: warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]
> xf86VTSwitchPending()
> ^
> void
> ../hw/xfree86/os-support/bsd/bsd_VTsw.c:67:17: warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]
> xf86VTSwitchAway()
> ^
> void
> ../hw/xfree86/os-support/bsd/bsd_VTsw.c:82:15: warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]
> xf86VTSwitchTo()
> ^
> void
> ../hw/xfree86/os-support/bsd/bsd_init.c:155:16: warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]
> xf86OpenConsole()
> ^
> void
> ../hw/xfree86/os-support/bsd/bsd_init.c:322:15: warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]
> xf86OpenPccons()
> ^
> void
> ../hw/xfree86/os-support/bsd/bsd_init.c:347:16: warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]
> xf86OpenSyscons()
> ^
> void
> ../hw/xfree86/os-support/bsd/bsd_init.c:453:13: warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]
> xf86OpenPcvt()
> ^
> void
> ../hw/xfree86/os-support/bsd/bsd_init.c:596:17: warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]
> xf86CloseConsole()
> ^
> void
> ../hw/xfree86/os-support/bsd/bsd_init.c:673:11: warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]
> xf86UseMsg()
> ^
> void
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1428>
diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index 79247ef92..ae6f28b58 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -32,7 +32,6 @@
#include "os/cmdline.h"
#include "compiler.h"
-
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86_os_support.h"
commit 20d0545f0dc520f952c543e0e7c2cefac7ba7553
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Wed Mar 20 19:32:40 2024 +0100
xfree86: modes: drop unused xf86_driver_has_show_cursor()
Fix warning on unused function:
> ../hw/xfree86/modes/xf86Cursors.c:212:1: warning: unused function 'xf86_driver_has_show_cursor' [-Wunused-function]
> xf86_driver_has_show_cursor(xf86CrtcPtr crtc)
> ^
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1428>
diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
index 6805f725a..adeecec06 100644
--- a/hw/xfree86/modes/xf86Cursors.c
+++ b/hw/xfree86/modes/xf86Cursors.c
@@ -208,12 +208,6 @@ set_bit(CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)
* Wrappers to deal with API compatibility with drivers that don't expose
* *_cursor_*_check
*/
-static inline Bool
-xf86_driver_has_show_cursor(xf86CrtcPtr crtc)
-{
- return crtc->funcs->show_cursor_check || crtc->funcs->show_cursor;
-}
-
static inline Bool
xf86_driver_has_load_cursor_image(xf86CrtcPtr crtc)
{
More information about the xorg-commit
mailing list