[PATCH RFC] newlib add opendir and related functions
Patrick Mansfield
patmans@us.ibm.com
Fri Jun 15 07:27:00 GMT 2007
The newlib side.
Add support for opendir, closedir, readdir, rewinddir, seekdir and telldir
mainly via assist calls.
We have to maintain a a copy of a struct dirent in SPU LS, and pass a
pointer to it for the readir() result: a set of static DIR entries are
used that includes a struct dirent, so only a small number of opendirs are
allowed.
newlib ChangeLog:
2007-06-12 Patrick Mansfield <patmans@us.ibm.com>
* libc/machine/spu/sys/dirent.h: New file, add prototypes and SPU
specific struct and typedef.
* spu/dirfuncs.c: New file, holds the opendir, closedir, readdir,
rewinddir, seekdir and telldir implementations. This are grouped
in one file so that we do not need a separate file for the struct
dirent and DIR allocation code.
* spu/jsre.h: Add JSRE_OPENDIR and other dir opcodes.
* spu/Makefile.in: Add dirfuncs.o
Index: newlib-dirfuncs/libgloss/spu/Makefile.in
===================================================================
--- newlib-dirfuncs.orig/libgloss/spu/Makefile.in
+++ newlib-dirfuncs/libgloss/spu/Makefile.in
@@ -54,7 +54,7 @@ OBJDUMP = `t='$(program_transform_name)'
OBJCOPY = `t='$(program_transform_name)'; echo objcopy | sed -e $$t`
# object files needed
-OBJS = syscalls.o exit.o sbrk.o close.o fstat.o getpid.o isatty.o \
+OBJS = syscalls.o dirfuncs.o exit.o sbrk.o close.o fstat.o getpid.o isatty.o \
kill.o lseek.o nanosleep.o open.o read.o unlink.o write.o stat.o \
ftruncate.o dup.o access.o gettimeofday.o
Index: newlib-dirfuncs/libgloss/spu/jsre.h
===================================================================
--- newlib-dirfuncs.orig/libgloss/spu/jsre.h
+++ newlib-dirfuncs/libgloss/spu/jsre.h
@@ -50,6 +50,12 @@ Author: Andreas Neukoetter (ti95neuk@de.
#define JSRE_ACCESS 29
#define JSRE_DUP 30
#define JSRE_NANOSLEEP 32
+#define JSRE_OPENDIR 55
+#define JSRE_CLOSEDIR 56
+#define JSRE_READDIR 57
+#define JSRE_REWINDDIR 58
+#define JSRE_SEEKDIR 59
+#define JSRE_TELLDIR 60
typedef struct {
unsigned int dev;
Index: newlib-dirfuncs/newlib/libc/machine/spu/sys/dirent.h
===================================================================
--- /dev/null
+++ newlib-dirfuncs/newlib/libc/machine/spu/sys/dirent.h
@@ -0,0 +1,57 @@
+/*
+ Copyright 2007
+ International Business Machines Corporation,
+ Sony Computer Entertainment, Incorporated,
+ Toshiba Corporation,
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the names of the copyright holders nor the names of their
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef _SYS_DIRENT_H
+#define _SYS_DIRENT_H
+
+#define MAXNAMLEN 255
+
+struct dirent {
+ ino_t d_ino;
+ char d_name[MAXNAMLEN + 1];
+};
+
+typedef struct {
+ unsigned int ppc_dir;
+ /*
+ * Allow one readdir for each opendir, and store the data here.
+ */
+ struct dirent dirent;
+} DIR;
+
+DIR *opendir(const char *);
+int closedir(DIR *);
+struct dirent *readdir (DIR *);
+void rewinddir(DIR *);
+void seekdir(DIR *dir, off_t offset);
+off_t telldir(DIR *dir);
+#endif
Index: newlib-dirfuncs/libgloss/spu/dirfuncs.c
===================================================================
--- /dev/null
+++ newlib-dirfuncs/libgloss/spu/dirfuncs.c
@@ -0,0 +1,158 @@
+/*
+ Copyright 2007
+ International Business Machines Corporation,
+ Sony Computer Entertainment, Incorporated,
+ Toshiba Corporation,
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the names of the copyright holders nor the names of their
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+ * Put all of the dir functions in one file here, since it is not useful
+ * to use opendir without readdir, and then we can put the handling of the
+ * struct dirent here too.
+ */
+
+#include <unistd.h>
+#include <dirent.h>
+#include <errno.h>
+#include "jsre.h"
+
+/*
+ * The SPU DIR includes space for one dirent, and is 256 + 4 bytes in
+ * size, so keep this small. Alternatively, use malloc/free in readdir,
+ * that will use at least 756 bytes (for the current SPU specific malloc)
+ * plus the malloc / free code.
+ */
+#define SPE_OPENDIR_MAX 4
+
+static DIR spe_dir[SPE_OPENDIR_MAX]; /* zero by default */
+
+DIR *
+opendir (const char *name)
+{
+ DIR *dir;
+ int ppc_dir, i;
+
+ for (i = 0; i < SPE_OPENDIR_MAX; i++) {
+ if (!spe_dir[i].ppc_dir) {
+ dir = &spe_dir[i];
+ dir->ppc_dir =
+ __send_to_ppe (JSRE_POSIX1_SIGNALCODE, JSRE_OPENDIR, &name);
+ if (!dir->ppc_dir) {
+ dir = NULL;
+ }
+ return dir;
+ }
+ }
+
+ errno = EMFILE;
+ return NULL;
+}
+
+int
+closedir (DIR *dir)
+{
+ int rc, i;
+ int ppc_dir;
+
+ if (dir) {
+ /*
+ * Don't pass &dir->ppc_dir to __send_to_ppe, since it would be
+ * overwritten by the assist call.
+ */
+ ppc_dir = dir->ppc_dir;
+ rc = __send_to_ppe (JSRE_POSIX1_SIGNALCODE, JSRE_CLOSEDIR, &ppc_dir);
+
+ /*
+ * Try to release the dir even if the closedir failed.
+ */
+ for (i = 0; i < SPE_OPENDIR_MAX; i++) {
+ if (spe_dir[i].ppc_dir == dir->ppc_dir) {
+ spe_dir[i].ppc_dir = 0;
+ }
+ }
+ } else {
+ /*
+ * Gracefully handle NULL, but not other invalid dir values.
+ */
+ rc = -1;
+ errno = EBADF;
+ }
+ return rc;
+}
+
+typedef struct {
+ unsigned int ppc_dir;
+ unsigned int pad0[3];
+ unsigned int dirent;
+ unsigned int pad1[3];
+} syscall_readdir_t;
+
+struct dirent *
+readdir (DIR *dir)
+{
+ syscall_readdir_t sys;
+
+ sys.ppc_dir = dir->ppc_dir;
+ sys.dirent = (unsigned int) &dir->dirent;
+ return (struct dirent *) __send_to_ppe (JSRE_POSIX1_SIGNALCODE,
+ JSRE_READDIR, &sys);
+}
+
+void
+rewinddir (DIR *dir)
+{
+ int ppc_dir = dir->ppc_dir;
+
+ __send_to_ppe (JSRE_POSIX1_SIGNALCODE, JSRE_REWINDDIR, &ppc_dir);
+}
+
+typedef struct {
+ unsigned int ppc_dir;
+ unsigned int pad0[3];
+ unsigned int offset;
+ unsigned int pad1[3];
+} syscall_seekdir_t;
+
+void
+seekdir (DIR *dir, off_t offset)
+{
+ syscall_seekdir_t sys;
+
+ sys.ppc_dir = dir->ppc_dir;
+ sys.offset = offset;
+ __send_to_ppe (JSRE_POSIX1_SIGNALCODE, JSRE_SEEKDIR, &sys);
+}
+
+off_t
+telldir (DIR *dir)
+{
+ int ppc_dir = dir->ppc_dir;
+
+ __send_to_ppe (JSRE_POSIX1_SIGNALCODE, JSRE_TELLDIR, &ppc_dir);
+}
More information about the Newlib
mailing list