From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/1439 Path: news.gmane.org!not-for-mail From: Isaac Dunham Newsgroups: gmane.linux.lib.musl.general Subject: Re: [PATCH 1/10] ioperm & iopl Date: Mon, 6 Aug 2012 20:29:25 -0700 Message-ID: <20120806202925.596eff5c@newbook> References: <20120722181332.191d4fa5@newbook> <20120806192241.2ed1108f@newbook> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/OomkSkE+JP/=ulav3RyV_8g" X-Trace: dough.gmane.org 1344310184 15158 80.91.229.3 (7 Aug 2012 03:29:44 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 7 Aug 2012 03:29:44 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-1440-gllmg-musl=m.gmane.org@lists.openwall.com Tue Aug 07 05:29:43 2012 Return-path: Envelope-to: gllmg-musl@plane.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1SyaUI-0004ON-L2 for gllmg-musl@plane.gmane.org; Tue, 07 Aug 2012 05:29:42 +0200 Original-Received: (qmail 22373 invoked by uid 550); 7 Aug 2012 03:29:41 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 22365 invoked from network); 7 Aug 2012 03:29:41 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=lavabit; d=lavabit.com; b=vPVzRLf9vigeioADrWTvurG0glCjWcNLPb326GYTrbDYsL+7vaM/wCN8QGiTGmL68IPd+NAIG7BxH6Lm6XRe0b17VU4f5NoMDN7HaBmtOEOSyj6/IOXnr0n+9jTkxL1NsU62rpck7ZgScy4WWV4T+U65RnBuD1HX3l49l4O1uMs=; h=Date:From:To:Subject:Message-ID:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type; In-Reply-To: <20120806192241.2ed1108f@newbook> X-Mailer: Claws Mail 3.7.4 (GTK+ 2.20.1; i486-pc-linux-gnu) Xref: news.gmane.org gmane.linux.lib.musl.general:1439 Archived-At: --MP_/OomkSkE+JP/=ulav3RyV_8g Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Per conversation on IRC, here's a patch that moves everything of importance from sys/io.h to bits/io.h. bits/io.h is based on klibc sys/io.h, in this case. Isaac Dunham --MP_/OomkSkE+JP/=ulav3RyV_8g Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=fix-io_h.diff diff --git a/arch/i386/bits/io.h b/arch/i386/bits/io.h new file mode 100644 index 0000000..1a81e56 --- /dev/null +++ b/arch/i386/bits/io.h @@ -0,0 +1,154 @@ +/* ----------------------------------------------------------------------- * + * + * Copyright 2004 H. Peter Anvin - All Rights Reserved + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall + * be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * ----------------------------------------------------------------------- */ + +#ifndef _BITS_IO_H +#define _BITS_IO_H +#ifdef __cplusplus +extern "C" { +#endif + +int iopl(int); +int ioperm(unsigned long, unsigned long, int); + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void outb(unsigned char __v, unsigned short __p) +{ + asm volatile ("outb %0,%1" : : "a" (__v), "dN" (__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void outw(unsigned short __v, unsigned short __p) +{ + asm volatile ("outw %0,%1" : : "a" (__v), "dN" (__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void outl(unsigned int __v, unsigned short __p) +{ + asm volatile ("outl %0,%1" : : "a" (__v), "dN" (__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static unsigned char inb(unsigned short __p) +{ + unsigned char __v; + asm volatile ("inb %1,%0" : "=a" (__v) : "dN" (__p)); + return __v; +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static unsigned short inw(unsigned short __p) +{ + unsigned short __v; + asm volatile ("inw %1,%0" : "=a" (__v) : "dN" (__p)); + return __v; +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static unsigned int inl(unsigned short __p) +{ + unsigned int __v; + asm volatile ("inl %1,%0" : "=a" (__v) : "dN" (__p)); + return __v; +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void outsb(unsigned short __p, const void *__d, unsigned long __n) +{ + asm volatile ("cld; rep; outsb" + : "+S" (__d), "+c" (__n) + : "d" (__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void outsw(unsigned short __p, const void *__d, unsigned long __n) +{ + asm volatile ("cld; rep; outsw" + : "+S" (__d), "+c" (__n) + : "d" (__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void outsl(unsigned short __p, const void *__d, unsigned long __n) +{ + asm volatile ("cld; rep; outsl" + : "+S" (__d), "+c"(__n) + : "d" (__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void insb(unsigned short __p, void *__d, unsigned long __n) +{ + asm volatile ("cld; rep; insb" + : "+D" (__d), "+c" (__n) + : "d" (__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void insw(unsigned short __p, void *__d, unsigned long __n) +{ + asm volatile ("cld; rep; insw" + : "+D" (__d), "+c" (__n) + : "d" (__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void insl(unsigned short __p, void *__d, unsigned long __n) +{ + asm volatile ("cld; rep; insl" + : "+D" (__d), "+c" (__n) + : "d" (__p)); +} + +#ifdef __cplusplus +} +#endif +#endif diff --git a/arch/x86_64/bits/io.h b/arch/x86_64/bits/io.h new file mode 100644 index 0000000..9d16816 --- /dev/null +++ b/arch/x86_64/bits/io.h @@ -0,0 +1,149 @@ +/* ----------------------------------------------------------------------- * + * + * Copyright 2004 H. Peter Anvin - All Rights Reserved + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall + * be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * ----------------------------------------------------------------------- */ + +#ifndef _BITS_IO_H +#define _BITS_IO_H + +int iopl(int); +int ioperm(unsigned long, unsigned long, int); + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void outb(unsigned char __v, unsigned short __p) +{ + asm volatile ("outb %0,%1" : : "a" (__v), "dN"(__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void outw(unsigned short __v, unsigned short __p) +{ + asm volatile ("outw %0,%1" : : "a" (__v), "dN"(__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void outl(unsigned int __v, unsigned short __p) +{ + asm volatile ("outl %0,%1" : : "a" (__v), "dN"(__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static unsigned char inb(unsigned short __p) +{ + unsigned char __v; + asm volatile ("inb %1,%0" : "=a" (__v) : "dN"(__p)); + return __v; +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static unsigned short inw(unsigned short __p) +{ + unsigned short __v; + asm volatile ("inw %1,%0" : "=a" (__v) : "dN"(__p)); + return __v; +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static unsigned int inl(unsigned short __p) +{ + unsigned int __v; + asm volatile ("inl %1,%0" : "=a" (__v) : "dN"(__p)); + return __v; +} + + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void outsb(unsigned short __p, const void *__d, unsigned long __n) +{ + asm volatile ("cld; rep; outsb" + : "+S" (__d), "+c"(__n) + : "d"(__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void outsw(unsigned short __p, const void *__d, unsigned long __n) +{ + asm volatile ("cld; rep; outsw" + : "+S" (__d), "+c"(__n) + : "d"(__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void outsl(unsigned short __p, const void *__d, unsigned long __n) +{ + asm volatile ("cld; rep; outsl" + : "+S" (__d), "+c"(__n) + : "d"(__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void insb(unsigned short __p, void *__d, unsigned long __n) +{ + asm volatile ("cld; rep; insb" + : "+D" (__d), "+c"(__n) + : "d"(__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void insw(unsigned short __p, void *__d, unsigned long __n) +{ + asm volatile ("cld; rep; insw" + : "+D" (__d), "+c"(__n) + : "d"(__p)); +} + +#if __STDC_VERSION__ >= 199901L +inline +#endif +static void insl(unsigned short __p, void *__d, unsigned long __n) +{ + asm volatile ("cld; rep; insl" + : "+D" (__d), "+c"(__n) + : "d"(__p)); +} + +#endif diff --git a/include/sys/io.h b/include/sys/io.h index a6ba467..6a7c442 100644 --- a/include/sys/io.h +++ b/include/sys/io.h @@ -1,13 +1,7 @@ #ifndef _SYS_IO_H #define _SYS_IO_H -#ifdef __cplusplus -extern "C" { -#endif -int ioperm(unsigned long, unsigned long, int); -int iopl(int); +#include -#ifdef __cplusplus -} #endif #endif diff --git a/src/linux/ioperm.c b/src/linux/ioperm.c index 6d7c37d..08c6d8b 100644 --- a/src/linux/ioperm.c +++ b/src/linux/ioperm.c @@ -1,7 +1,8 @@ -#include #include "syscall.h" #ifdef SYS_ioperm +#include + int ioperm(unsigned long from, unsigned long num, int turn_on) { return syscall(SYS_ioperm, from, num, turn_on); diff --git a/src/linux/iopl.c b/src/linux/iopl.c index 5a626e1..835d3d4 100644 --- a/src/linux/iopl.c +++ b/src/linux/iopl.c @@ -1,7 +1,8 @@ -#include #include "syscall.h" #ifdef SYS_iopl +#include + int iopl(int level) { return syscall(SYS_iopl, level); --MP_/OomkSkE+JP/=ulav3RyV_8g--