From 895475f85dc8f8bae126cda31f37f90d1fc8305f Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 17 Jan 2026 09:43:14 -0800 Subject: [PATCH] xfree86: remove leftover ev56.c source files Commit 166ac294a replaced the function calls in these files with inline functions in compiler.h and updated the configure scripts & meson builds to stop compiling them, but missed actually removing the now unused sources. Fixes: 166ac294a ("xfree86: Inline xf86{Read,Write}Mmio{8,16,32} on alpha") Signed-off-by: Alan Coopersmith --- hw/xfree86/os-support/bsd/bsd_ev56.c | 76 -------------------------- hw/xfree86/os-support/linux/lnx_ev56.c | 59 -------------------- 2 files changed, 135 deletions(-) delete mode 100644 hw/xfree86/os-support/bsd/bsd_ev56.c delete mode 100644 hw/xfree86/os-support/linux/lnx_ev56.c diff --git a/hw/xfree86/os-support/bsd/bsd_ev56.c b/hw/xfree86/os-support/bsd/bsd_ev56.c deleted file mode 100644 index 6a190ab4e..000000000 --- a/hw/xfree86/os-support/bsd/bsd_ev56.c +++ /dev/null @@ -1,76 +0,0 @@ - -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - -#include - -#include "input.h" -#include "scrnintstr.h" -#include "compiler.h" - -#include "xf86.h" -#include "xf86_os_support.h" -#include "xf86Priv.h" -#include "xf86_OSlib.h" - -#include - -/* - * The following functions are used only on EV56 and greater CPUs, - * and the assembler requires going to EV56 mode in order to emit - * these instructions. - */ -__asm(".arch ev56"); - -int readDense8(void *Base, register unsigned long Offset); -int readDense16(void *Base, register unsigned long Offset); -int readDense32(void *Base, register unsigned long Offset); -void - writeDense8(int Value, void *Base, register unsigned long Offset); -void - writeDense16(int Value, void *Base, register unsigned long Offset); -void - writeDense32(int Value, void *Base, register unsigned long Offset); - -int -readDense8(void *Base, register unsigned long Offset) -{ - mem_barrier(); - return (alpha_ldbu((void *) ((unsigned long) Base + (Offset)))); -} - -int -readDense16(void *Base, register unsigned long Offset) -{ - mem_barrier(); - return (alpha_ldwu((void *) ((unsigned long) Base + (Offset)))); -} - -int -readDense32(void *Base, register unsigned long Offset) -{ - mem_barrier(); - return *(volatile CARD32 *) ((unsigned long) Base + (Offset)); -} - -void -writeDense8(int Value, void *Base, register unsigned long Offset) -{ - write_mem_barrier(); - alpha_stb((void *) ((unsigned long) Base + (Offset)), Value); -} - -void -writeDense16(int Value, void *Base, register unsigned long Offset) -{ - write_mem_barrier(); - alpha_stw((void *) ((unsigned long) Base + (Offset)), Value); -} - -void -writeDense32(int Value, void *Base, register unsigned long Offset) -{ - write_mem_barrier(); - *(volatile CARD32 *) ((unsigned long) Base + (Offset)) = Value; -} diff --git a/hw/xfree86/os-support/linux/lnx_ev56.c b/hw/xfree86/os-support/linux/lnx_ev56.c deleted file mode 100644 index 4e886b6ce..000000000 --- a/hw/xfree86/os-support/linux/lnx_ev56.c +++ /dev/null @@ -1,59 +0,0 @@ -/* This file has to be built with -mcpu=ev56 */ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - -#include "xf86.h" -#include "compiler.h" - -int readDense8(void *Base, register unsigned long Offset); -int readDense16(void *Base, register unsigned long Offset); -int readDense32(void *Base, register unsigned long Offset); -void - writeDense8(int Value, void *Base, register unsigned long Offset); -void - writeDense16(int Value, void *Base, register unsigned long Offset); -void - writeDense32(int Value, void *Base, register unsigned long Offset); - -int -readDense8(void *Base, register unsigned long Offset) -{ - mem_barrier(); - return *(volatile CARD8 *) ((unsigned long) Base + (Offset)); -} - -int -readDense16(void *Base, register unsigned long Offset) -{ - mem_barrier(); - return *(volatile CARD16 *) ((unsigned long) Base + (Offset)); -} - -int -readDense32(void *Base, register unsigned long Offset) -{ - mem_barrier(); - return *(volatile CARD32 *) ((unsigned long) Base + (Offset)); -} - -void -writeDense8(int Value, void *Base, register unsigned long Offset) -{ - write_mem_barrier(); - *(volatile CARD8 *) ((unsigned long) Base + (Offset)) = Value; -} - -void -writeDense16(int Value, void *Base, register unsigned long Offset) -{ - write_mem_barrier(); - *(volatile CARD16 *) ((unsigned long) Base + (Offset)) = Value; -} - -void -writeDense32(int Value, void *Base, register unsigned long Offset) -{ - write_mem_barrier(); - *(volatile CARD32 *) ((unsigned long) Base + (Offset)) = Value; -}