Module Name: src
Committed By: maxv
Date: Fri Nov 15 09:03:26 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64: cpufunc.S
src/sys/arch/i386/i386: cpufunc.S
src/sys/arch/x86/include: pio.h
Log Message:
Remove the ins* and outs* functions. Not sanitizer-friendly, and unused
anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/amd64/amd64/cpufunc.S
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/i386/i386/cpufunc.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/include/pio.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/cpufunc.S
diff -u src/sys/arch/amd64/amd64/cpufunc.S:1.47 src/sys/arch/amd64/amd64/cpufunc.S:1.48
--- src/sys/arch/amd64/amd64/cpufunc.S:1.47 Thu Nov 14 16:23:52 2019
+++ src/sys/arch/amd64/amd64/cpufunc.S Fri Nov 15 09:03:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.S,v 1.47 2019/11/14 16:23:52 maxv Exp $ */
+/* $NetBSD: cpufunc.S,v 1.48 2019/11/15 09:03:26 maxv Exp $ */
/*
* Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -349,15 +349,6 @@ ENTRY(inb)
ret
END(inb)
-ENTRY(insb)
- movl %edx, %ecx
- movl %edi, %edx
- movq %rsi, %rdi
- rep
- insb
- ret
-END(insb)
-
ENTRY(inw)
movq %rdi, %rdx
xorq %rax, %rax
@@ -366,15 +357,6 @@ ENTRY(inw)
ret
END(inw)
-ENTRY(insw)
- movl %edx, %ecx
- movl %edi, %edx
- movq %rsi, %rdi
- rep
- insw
- ret
-END(insw)
-
ENTRY(inl)
movq %rdi, %rdx
xorq %rax, %rax
@@ -383,15 +365,6 @@ ENTRY(inl)
ret
END(inl)
-ENTRY(insl)
- movl %edx, %ecx
- movl %edi, %edx
- movq %rsi, %rdi
- rep
- insl
- ret
-END(insl)
-
ENTRY(outb)
movq %rdi, %rdx
movq %rsi, %rax
@@ -399,14 +372,6 @@ ENTRY(outb)
ret
END(outb)
-ENTRY(outsb)
- movl %edx, %ecx
- movl %edi, %edx
- rep
- outsb
- ret
-END(outsb)
-
ENTRY(outw)
movq %rdi, %rdx
movq %rsi, %rax
@@ -414,25 +379,9 @@ ENTRY(outw)
ret
END(outw)
-ENTRY(outsw)
- movl %edx, %ecx
- movl %edi, %edx
- rep
- outsw
- ret
-END(outsw)
-
ENTRY(outl)
movq %rdi, %rdx
movq %rsi, %rax
outl %eax, %dx
ret
END(outl)
-
-ENTRY(outsl)
- movl %edx, %ecx
- movl %edi, %edx
- rep
- outsl
- ret
-END(outsl)
Index: src/sys/arch/i386/i386/cpufunc.S
diff -u src/sys/arch/i386/i386/cpufunc.S:1.36 src/sys/arch/i386/i386/cpufunc.S:1.37
--- src/sys/arch/i386/i386/cpufunc.S:1.36 Wed Oct 30 17:06:57 2019
+++ src/sys/arch/i386/i386/cpufunc.S Fri Nov 15 09:03:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.S,v 1.36 2019/10/30 17:06:57 maxv Exp $ */
+/* $NetBSD: cpufunc.S,v 1.37 2019/11/15 09:03:26 maxv Exp $ */
/*-
* Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/errno.h>
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.36 2019/10/30 17:06:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.37 2019/11/15 09:03:26 maxv Exp $");
#include "opt_xen.h"
@@ -247,17 +247,6 @@ ENTRY(inb)
ret
END(inb)
-ENTRY(insb)
- pushl %edi
- movl 8(%esp), %edx
- movl 12(%esp), %edi
- movl 16(%esp), %ecx
- rep
- insb
- popl %edi
- ret
-END(insb)
-
ENTRY(inw)
movl 4(%esp), %edx
xorl %eax, %eax
@@ -265,34 +254,12 @@ ENTRY(inw)
ret
END(inw)
-ENTRY(insw)
- pushl %edi
- movl 8(%esp), %edx
- movl 12(%esp), %edi
- movl 16(%esp), %ecx
- rep
- insw
- popl %edi
- ret
-END(insw)
-
ENTRY(inl)
movl 4(%esp), %edx
inl %dx, %eax
ret
END(inl)
-ENTRY(insl)
- pushl %edi
- movl 8(%esp), %edx
- movl 12(%esp), %edi
- movl 16(%esp), %ecx
- rep
- insl
- popl %edi
- ret
-END(insl)
-
ENTRY(outb)
movl 4(%esp), %edx
movl 8(%esp), %eax
@@ -300,17 +267,6 @@ ENTRY(outb)
ret
END(outb)
-ENTRY(outsb)
- pushl %esi
- movl 8(%esp), %edx
- movl 12(%esp), %esi
- movl 16(%esp), %ecx
- rep
- outsb
- popl %esi
- ret
-END(outsb)
-
ENTRY(outw)
movl 4(%esp), %edx
movl 8(%esp), %eax
@@ -318,31 +274,9 @@ ENTRY(outw)
ret
END(outw)
-ENTRY(outsw)
- pushl %esi
- movl 8(%esp), %edx
- movl 12(%esp), %esi
- movl 16(%esp), %ecx
- rep
- outsw
- popl %esi
- ret
-END(outsw)
-
ENTRY(outl)
movl 4(%esp), %edx
movl 8(%esp), %eax
outl %eax, %dx
ret
END(outl)
-
-ENTRY(outsl)
- pushl %esi
- movl 8(%esp), %edx
- movl 12(%esp), %esi
- movl 16(%esp), %ecx
- rep
- outsl
- popl %esi
- ret
-END(outsl)
Index: src/sys/arch/x86/include/pio.h
diff -u src/sys/arch/x86/include/pio.h:1.9 src/sys/arch/x86/include/pio.h:1.10
--- src/sys/arch/x86/include/pio.h:1.9 Sun May 22 16:01:43 2011
+++ src/sys/arch/x86/include/pio.h Fri Nov 15 09:03:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pio.h,v 1.9 2011/05/22 16:01:43 christos Exp $ */
+/* $NetBSD: pio.h,v 1.10 2019/11/15 09:03:26 maxv Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,17 +37,11 @@
*/
uint8_t inb(unsigned);
-void insb(unsigned, void *, int);
uint16_t inw(unsigned);
-void insw(unsigned, void *, int);
uint32_t inl(unsigned);
-void insl(unsigned, void *, int);
void outb(unsigned, uint8_t);
-void outsb(unsigned, void *, int);
void outw(unsigned, uint16_t);
-void outsw(unsigned, void *, int);
void outl(unsigned, uint32_t);
-void outsl(unsigned, void *, int);
#endif /* _X86_PIO_H_ */
