AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 22:10:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

* hurd/hurdselect.c (_hurd_select): Fix

Browse Source 
MACH_MSG_TYPE_INTEGER_T -> integer_t in sizeof.
	Use a union rather than casts to compare mach_msg_type_t as int.

2002-03-25  Roland McGrath  <roland@frob.com>

	* hurd/hurdchdir.c (_hurd_change_directory_port_from_name): Don't
	check off the end of NAME when it's shorter than 2 chars.
	Reported by Ognyan Kulev <ogi@fmi.uni-sofia.bg>.

2002-03-17  Roland McGrath  <roland@frob.com>

	* sysdeps/mach/hurd/i386/sys/io.h: New file.
	* sysdeps/mach/hurd/i386/ioperm.c: New file.
	* sysdeps/mach/hurd/i386/Dist: Add them.
	* sysdeps/mach/hurd/i386/Versions
	(libc: GLIBC_2.2.6): New set, add ioperm.
	* sysdeps/mach/configure.in: New check to set HAVE_I386_IO_PERM_MODIFY.
	(mach_interface_list): Check for mach_i386.defs.
	* config.h.in (HAVE_I386_IO_PERM_MODIFY): #undef it.
	* sysdeps/mach/configure: Regenerated.
This commit is contained in:
Roland McGrath 2002-04-02 04:43:06 +00:00
parent 96c4df5055
commit db6b51ada7
9 changed files with 333 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ChangeLog
View File

@ -1,3 +1,27 @@
2002-03-31 Roland McGrath <roland@frob.com>
* hurd/hurdselect.c (_hurd_select): Fix
MACH_MSG_TYPE_INTEGER_T -> integer_t in sizeof.
Use a union rather than casts to compare mach_msg_type_t as int.
2002-03-25 Roland McGrath <roland@frob.com>
* hurd/hurdchdir.c (_hurd_change_directory_port_from_name): Don't
check off the end of NAME when it's shorter than 2 chars.
Reported by Ognyan Kulev <ogi@fmi.uni-sofia.bg>.
2002-03-17 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/i386/sys/io.h: New file.
* sysdeps/mach/hurd/i386/ioperm.c: New file.
* sysdeps/mach/hurd/i386/Dist: Add them.
* sysdeps/mach/hurd/i386/Versions
(libc: GLIBC_2.2.6): New set, add ioperm.
* sysdeps/mach/configure.in: New check to set HAVE_I386_IO_PERM_MODIFY.
(mach_interface_list): Check for mach_i386.defs.
* config.h.in (HAVE_I386_IO_PERM_MODIFY): #undef it.
* sysdeps/mach/configure: Regenerated.
2002-03-22 Ulrich Drepper <drepper@redhat.com> 2002-03-22 Ulrich Drepper <drepper@redhat.com>
* po/fr.po: Update from translation team. * po/fr.po: Update from translation team.

3
config.h.in
View File

@ -144,6 +144,9 @@
/* Mach specific: define if the `host_page_size' RPC is available. */ /* Mach specific: define if the `host_page_size' RPC is available. */
#undef HAVE_HOST_PAGE_SIZE #undef HAVE_HOST_PAGE_SIZE
/* Mach/i386 specific: define if the `i386_io_perm_*' RPCs are available. */
#undef HAVE_I386_IO_PERM_MODIFY
/* Sparc64 specific: define if .dynamic section comes before .got for /* Sparc64 specific: define if .dynamic section comes before .got for
shared libs. */ shared libs. */
#undef SPARC64_DYNAMIC_BEFORE_GOT #undef SPARC64_DYNAMIC_BEFORE_GOT

31
hurd/hurdselect.c
View File

@ -64,6 +64,14 @@ _hurd_select (int nfds,
} d[nfds]; } d[nfds];
sigset_t oset; sigset_t oset;
union typeword /* Use this to avoid unkosher casts. */
{
mach_msg_type_t type;
uint32_t word;
};
assert (sizeof (union typeword) == sizeof (mach_msg_type_t));
assert (sizeof (uint32_t) == sizeof (mach_msg_type_t));
if (sigmask && __sigprocmask (SIG_SETMASK, sigmask, &oset)) if (sigmask && __sigprocmask (SIG_SETMASK, sigmask, &oset))
return -1; return -1;
@ -298,15 +306,15 @@ _hurd_select (int nfds,
struct struct
{ {
mach_msg_header_t head; mach_msg_header_t head;
mach_msg_type_t err_type; union typeword err_type;
error_t err; error_t err;
} error; } error;
struct struct
{ {
mach_msg_header_t head; mach_msg_header_t head;
mach_msg_type_t err_type; union typeword err_type;
error_t err; error_t err;
mach_msg_type_t result_type; union typeword result_type;
int result; int result;
} success; } success;
#endif #endif
@ -321,15 +329,16 @@ _hurd_select (int nfds,
/* We got a message. Decode it. */ /* We got a message. Decode it. */
#define IO_SELECT_REPLY_MSGID (21012 + 100) /* XXX */ #define IO_SELECT_REPLY_MSGID (21012 + 100) /* XXX */
#ifdef MACH_MSG_TYPE_BIT #ifdef MACH_MSG_TYPE_BIT
const mach_msg_type_t inttype = const union typeword inttype =
{ MACH_MSG_TYPE_INTEGER_T, sizeof (MACH_MSG_TYPE_INTEGER_T) * 8, { type:
1, 1, 0, 0 }; { MACH_MSG_TYPE_INTEGER_T, sizeof (integer_t) * 8, 1, 1, 0, 0 }
};
#endif #endif
if (msg.head.msgh_id == IO_SELECT_REPLY_MSGID if (msg.head.msgh_id == IO_SELECT_REPLY_MSGID &&
&& msg.head.msgh_size >= sizeof msg.error msg.head.msgh_size >= sizeof msg.error &&
&& !(msg.head.msgh_bits & MACH_MSGH_BITS_COMPLEX) !(msg.head.msgh_bits & MACH_MSGH_BITS_COMPLEX) &&
#ifdef MACH_MSG_TYPE_BIT #ifdef MACH_MSG_TYPE_BIT
&& *(int *) &msg.error.err_type == *(int *) &inttype msg.error.err_type.word == inttype.word
#endif #endif
) )
{ {
@ -346,7 +355,7 @@ _hurd_select (int nfds,
if (msg.error.err || if (msg.error.err ||
msg.head.msgh_size != sizeof msg.success || msg.head.msgh_size != sizeof msg.success ||
#ifdef MACH_MSG_TYPE_BIT #ifdef MACH_MSG_TYPE_BIT
*(int *) &msg.success.result_type != *(int *) &inttype || msg.success.result_type.word != inttype.word ||
#endif #endif
(msg.success.result & SELECT_ALL) == 0) (msg.success.result & SELECT_ALL) == 0)
{ {

53
sysdeps/mach/configure vendored
View File

@ -168,20 +168,21 @@ for ifc in mach mach4 \
clock clock_priv host_priv host_security ledger lock_set \ clock clock_priv host_priv host_security ledger lock_set \
processor processor_set task thread_act vm_map \ processor processor_set task thread_act vm_map \
memory_object memory_object_default default_pager \ memory_object memory_object_default default_pager \
i386/mach_i386 \
; do ; do
ac_safe=`echo "mach/${ifc}.defs" | sed 'y%./+-%__p_%'` ac_safe=`echo "mach/${ifc}.defs" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for mach/${ifc}.defs""... $ac_c" 1>&6 echo $ac_n "checking for mach/${ifc}.defs""... $ac_c" 1>&6
echo "configure:175: checking for mach/${ifc}.defs" >&5 echo "configure:176: checking for mach/${ifc}.defs" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 180 "configure" #line 181 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <mach/${ifc}.defs> #include <mach/${ifc}.defs>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@ -208,12 +209,12 @@ if test "x$mach_interface_list" = x; then
fi fi
echo $ac_n "checking for host_page_size in mach_host.defs""... $ac_c" 1>&6 echo $ac_n "checking for host_page_size in mach_host.defs""... $ac_c" 1>&6
echo "configure:212: checking for host_page_size in mach_host.defs" >&5 echo "configure:213: checking for host_page_size in mach_host.defs" >&5
if eval "test \"`echo '$''{'libc_cv_mach_host_page_size'+set}'`\" = set"; then if eval "test \"`echo '$''{'libc_cv_mach_host_page_size'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 217 "configure" #line 218 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <mach/mach_host.defs> #include <mach/mach_host.defs>
EOF EOF
@ -239,17 +240,17 @@ fi
ac_safe=`echo "mach/machine/ndr_def.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "mach/machine/ndr_def.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for mach/machine/ndr_def.h""... $ac_c" 1>&6 echo $ac_n "checking for mach/machine/ndr_def.h""... $ac_c" 1>&6
echo "configure:243: checking for mach/machine/ndr_def.h" >&5 echo "configure:244: checking for mach/machine/ndr_def.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 248 "configure" #line 249 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <mach/machine/ndr_def.h> #include <mach/machine/ndr_def.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@ -270,17 +271,17 @@ else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
ac_safe=`echo "machine/ndr_def.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "machine/ndr_def.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for machine/ndr_def.h""... $ac_c" 1>&6 echo $ac_n "checking for machine/ndr_def.h""... $ac_c" 1>&6
echo "configure:274: checking for machine/ndr_def.h" >&5 echo "configure:275: checking for machine/ndr_def.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 279 "configure" #line 280 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <machine/ndr_def.h> #include <machine/ndr_def.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@ -303,3 +304,33 @@ fi
fi fi
echo $ac_n "checking for i386_io_perm_modify in mach_i386.defs""... $ac_c" 1>&6
echo "configure:310: checking for i386_io_perm_modify in mach_i386.defs" >&5
if eval "test \"`echo '$''{'libc_cv_mach_i386_ioports'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 315 "configure"
#include "confdefs.h"
#include <mach/i386/mach_i386.defs>
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "i386_io_perm_modify" >/dev/null 2>&1; then
rm -rf conftest*
libc_cv_mach_i386_ioports=yes
else
rm -rf conftest*
libc_cv_mach_i386_ioports=no
fi
rm -f conftest*
fi
echo "$ac_t""$libc_cv_mach_i386_ioports" 1>&6
if test $libc_cv_mach_i386_ioports = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_I386_IO_PERM_MODIFY 1
EOF
fi

10
sysdeps/mach/configure.in
View File

@ -52,6 +52,7 @@ for ifc in mach mach4 \
clock clock_priv host_priv host_security ledger lock_set \ clock clock_priv host_priv host_security ledger lock_set \
processor processor_set task thread_act vm_map \ processor processor_set task thread_act vm_map \
memory_object memory_object_default default_pager \ memory_object memory_object_default default_pager \
i386/mach_i386 \
; do ; do
AC_CHECK_HEADER(mach/${ifc}.defs, [dnl AC_CHECK_HEADER(mach/${ifc}.defs, [dnl
mach_interface_list="$mach_interface_list $ifc"]) mach_interface_list="$mach_interface_list $ifc"])
@ -73,3 +74,12 @@ AC_CHECK_HEADER(mach/machine/ndr_def.h, [dnl
DEFINES="$DEFINES -DNDR_DEF_HEADER='<mach/machine/ndr_def.h>'"], [dnl DEFINES="$DEFINES -DNDR_DEF_HEADER='<mach/machine/ndr_def.h>'"], [dnl
AC_CHECK_HEADER(machine/ndr_def.h, [dnl AC_CHECK_HEADER(machine/ndr_def.h, [dnl
DEFINES="$DEFINES -DNDR_DEF_HEADER='<machine/ndr_def.h>'"])]) DEFINES="$DEFINES -DNDR_DEF_HEADER='<machine/ndr_def.h>'"])])
AC_CACHE_CHECK(for i386_io_perm_modify in mach_i386.defs,
libc_cv_mach_i386_ioports, [dnl
AC_EGREP_HEADER(i386_io_perm_modify, mach/i386/mach_i386.defs,
libc_cv_mach_i386_ioports=yes,
libc_cv_mach_i386_ioports=no)])
if test $libc_cv_mach_i386_ioports = yes; then
AC_DEFINE([HAVE_I386_IO_PERM_MODIFY])
fi

2
sysdeps/mach/hurd/i386/Dist
View File

@ -1 +1,3 @@
static-start.S static-start.S
sys/io.h
ioperm.c

3
sysdeps/mach/hurd/i386/Versions
View File

@ -4,4 +4,7 @@ libc {
__register_frame; __register_frame_table; __deregister_frame; __register_frame; __register_frame_table; __deregister_frame;
__frame_state_for; __register_frame_info_table; __frame_state_for; __register_frame_info_table;
} }
GLIBC_2.2.6 {
ioperm;
}
} }

51
sysdeps/mach/hurd/i386/ioperm.c Normal file
View File

@ -0,0 +1,51 @@
/* Access to hardware i/o ports. Hurd/x86 version.
Copyright (C) 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <sys/io.h>
#include <hurd.h>
#include <mach/i386/mach_i386.h>
int
ioperm (unsigned long int from, unsigned long int num, int turn_on)
{
#if ! HAVE_I386_IO_PERM_MODIFY
return __hurd_fail (ENOSYS);
#else
error_t err;
device_t devmaster;
/* With the device master port we get a capability that represents
this range of io ports. */
err = __get_privileged_ports (NULL, &devmaster);
if (! err)
{
io_perm_t perm;
err = __i386_io_perm_create (devmaster, from, from + num, &perm);
__mach_port_deallocate (__mach_task_self (), devmaster);
if (! err)
{
/* Now we add or remove that set from our task's bitmap. */
err = __i386_io_perm_modify (__mach_task_self (), perm, turn_on);
__mach_port_deallocate (__mach_task_self (), perm);
}
}
return err ? __hurd_fail (err) : 0;
#endif
}

178
sysdeps/mach/hurd/i386/sys/io.h Normal file
View File

@ -0,0 +1,178 @@
/* Access to hardware i/o ports. GNU/x86 version.
Copyright (C) 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#ifndef _SYS_IO_H
#define _SYS_IO_H 1
#include <features.h>
__BEGIN_DECLS
/* If TURN_ON is TRUE, request for permission to do direct i/o on the
port numbers in the range [FROM,FROM+NUM-1]. Otherwise, turn I/O
permission off for that range. This call requires root privileges. */
extern int ioperm (unsigned long int __from, unsigned long int __num,
int __turn_on) __THROW;
/* Set the I/O privilege level to LEVEL. If LEVEL>3, permission to
access any I/O port is granted. This call requires root
privileges. */
extern int iopl (int __level) __THROW;
#if defined __GNUC__ && __GNUC__ >= 2
static __inline unsigned char
inb (unsigned short int port)
{
unsigned char _v;
__asm__ __volatile__ ("inb %w1,%0":"=a" (_v):"Nd" (port));
return _v;
}
static __inline unsigned char
inb_p (unsigned short int port)
{
unsigned char _v;
__asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
return _v;
}
static __inline unsigned short int
inw (unsigned short int port)
{
unsigned short _v;
__asm__ __volatile__ ("inw %w1,%0":"=a" (_v):"Nd" (port));
return _v;
}
static __inline unsigned short int
inw_p (unsigned short int port)
{
unsigned short int _v;
__asm__ __volatile__ ("inw %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
return _v;
}
static __inline unsigned int
inl (unsigned short int port)
{
unsigned int _v;
__asm__ __volatile__ ("inl %w1,%0":"=a" (_v):"Nd" (port));
return _v;
}
static __inline unsigned int
inl_p (unsigned short int port)
{
unsigned int _v;
__asm__ __volatile__ ("inl %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port));
return _v;
}
static __inline void
outb (unsigned char value, unsigned short int port)
{
__asm__ __volatile__ ("outb %b0,%w1": :"a" (value), "Nd" (port));
}
static __inline void
outb_p (unsigned char value, unsigned short int port)
{
__asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80": :"a" (value),
"Nd" (port));
}
static __inline void
outw (unsigned short int value, unsigned short int port)
{
__asm__ __volatile__ ("outw %w0,%w1": :"a" (value), "Nd" (port));
}
static __inline void
outw_p (unsigned short int value, unsigned short int port)
{
__asm__ __volatile__ ("outw %w0,%w1\noutb %%al,$0x80": :"a" (value),
"Nd" (port));
}
static __inline void
outl (unsigned int value, unsigned short int port)
{
__asm__ __volatile__ ("outl %0,%w1": :"a" (value), "Nd" (port));
}
static __inline void
outl_p (unsigned int value, unsigned short int port)
{
__asm__ __volatile__ ("outl %0,%w1\noutb %%al,$0x80": :"a" (value),
"Nd" (port));
}
static __inline void
insb (unsigned short int port, void *addr, unsigned long int count)
{
__asm__ __volatile__ ("cld ; rep ; insb":"=D" (addr),
"=c" (count):"d" (port), "0" (addr), "1" (count));
}
static __inline void
insw (unsigned short int port, void *addr, unsigned long int count)
{
__asm__ __volatile__ ("cld ; rep ; insw":"=D" (addr),
"=c" (count):"d" (port), "0" (addr), "1" (count));
}
static __inline void
insl (unsigned short int port, void *addr, unsigned long int count)
{
__asm__ __volatile__ ("cld ; rep ; insl":"=D" (addr),
"=c" (count):"d" (port), "0" (addr), "1" (count));
}
static __inline void
outsb (unsigned short int port, const void *addr, unsigned long int count)
{
__asm__ __volatile__ ("cld ; rep ; outsb":"=S" (addr),
"=c" (count):"d" (port), "0" (addr), "1" (count));
}
static __inline void
outsw (unsigned short int port, const void *addr, unsigned long int count)
{
__asm__ __volatile__ ("cld ; rep ; outsw":"=S" (addr),
"=c" (count):"d" (port), "0" (addr), "1" (count));
}
static __inline void
outsl (unsigned short int port, const void *addr, unsigned long int count)
{
__asm__ __volatile__ ("cld ; rep ; outsl":"=S" (addr),
"=c" (count):"d" (port), "0" (addr), "1" (count));
}
#endif /* GNU C */
__END_DECLS
#endif /* _SYS_IO_H */