WebSVN - shark - Path Comparison - /shark/branches/xen/libc/arch/ Rev 1621 and /shark/branches/xen/libc/arch/ Rev 1620

Ignore whitespace Rev 1621 → Rev 1620

/shark/branches/xen/libc/arch/x86/include/arch/string.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/unistd.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/sys/cdefs.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/math.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/time.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/endian.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/assert.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/stdlib.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/limits.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/stdio.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/i386/stdlib.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/i386/limits.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/i386/stdio.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/i386/float.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/i386/string.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/ctype.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/stdarg.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/errno.h
File deleted

/shark/branches/xen/libc/arch/x86/include/arch/float.h
File deleted

 /shark/branches/xen/libc/arch/x86/libm/makefile
 ,7 → 12,7
 include $(BASE)/config.mk
-C_OPT += $(INCL)/ll -I.
+C_OPT += -I$(INCL)/ll -I.
 C_OPT += -Dlint -Wno-uninitialized -Wno-parentheses
 ASM_OPT += -Dlint -I.
 ,7 → 75,7
 cleanall : clean
         echo # Kernel Dependency file > deps
-        $(RM) $(LIB_PATH)libhm.a
+        $(RM) (LIB_PATH)libhm.a
 #deps : $(OBJS:.o=.c)
 deps : makefile $(CFILES)

 /shark/branches/xen/libc/arch/x86/libm/msun/src/w_cabs.c
 ,7 → 5,7
  * Placed into the Public Domain, 1994.
  */
-#include "math.h"
+#include <math.h>
 struct complex {
         double x;

 /shark/branches/xen/libc/arch/x86/libm/msun/src/math.h
 ,7 → 92,7
 #endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */
-#include <arch/sys/cdefs.h>
+#include <sys/cdefs.h>
 __BEGIN_DECLS
 /*
  * ANSI/POSIX

 /shark/branches/xen/libc/arch/x86/libm/msun/src/s_ldexpf.c
 ,7 → 19,7
 #include "math.h"
 #include "math_private.h"
-#include <arch/errno.h>
+#include <errno.h>
 #ifdef __STDC__
         float ldexpf(float value, int exp)

 /shark/branches/xen/libc/arch/x86/libm/msun/src/math_pri.h
 ,8 → 17,8
 #ifndef _MATH_PRIVATE_H_
 #define _MATH_PRIVATE_H_
-#include <arch/endian.h>
-#include <ll/sys/types.h>
+#include <machine/endian.h>
+#include <sys/types.h>
 /* The original fdlibm code used statements like:
         n0 = ((*(int*)&one)>>29)^1;             * index of high word *

 /shark/branches/xen/libc/arch/x86/libm/msun/src/w_scalbf.c
 ,7 → 26,7
 #include "math.h"
 #include "math_private.h"
-#include <arch/errno.h>
+#include <errno.h>
 #ifdef __STDC__
 #ifdef _SCALB_INT

 /shark/branches/xen/libc/arch/x86/libm/msun/src/s_ldexp.c
 ,7 → 16,7
 #include "math.h"
 #include "math_private.h"
-#include <arch/errno.h>
+#include <errno.h>
 #ifdef __STDC__
         double ldexp(double value, int exp)

 /shark/branches/xen/libc/arch/x86/libm/msun/src/w_drem.c
 ,7 → 5,7
  * Placed into the Public Domain, 1994.
  */
-#include "math.h"
+#include <math.h>
 double
 drem(x, y)

 /shark/branches/xen/libc/arch/x86/libm/msun/src/math_private.h
 ,8 → 17,8
 #ifndef _MATH_PRIVATE_H_
 #define _MATH_PRIVATE_H_
-#include <arch/endian.h>
-#include <ll/sys/types.h>
+#include <machine/endian.h>
+#include <sys/types.h>
 /* The original fdlibm code used statements like:
         n0 = ((*(int*)&one)>>29)^1;             * index of high word *

 /shark/branches/xen/libc/arch/x86/libm/msun/src/w_scalb.c
 ,7 → 23,7
 #include "math.h"
 #include "math_private.h"
-#include <arch/errno.h>
+#include <errno.h>
 #ifdef __STDC__
 #ifdef _SCALB_INT

 /shark/branches/xen/libc/arch/x86/libm/msun/src/k_standa.c
 ,7 → 16,7
 #include "math.h"
 #include "math_private.h"
-#include <arch/errno.h>
+#include <errno.h>
 /* Undefine these if you're actually going to use the FreeBSD libc. */
 #define _USE_WRITE
 ,7 → 26,7
 #include <stdio.h>                      /* fputs(), stderr */
 #define WRITE2(u,v)     fputs(u, stderr)
 #else   /* !defined(_USE_WRITE) */
-#include <arch/unistd.h>                        /* write */
+#include <unistd.h>                     /* write */
 #define WRITE2(u,v)     write(2, u, v)
 #undef fflush
 #endif  /* !defined(_USE_WRITE) */

 /shark/branches/xen/libc/arch/x86/libm/machine/endian.h
 ,0 → 1,120
+/*
+ * Copyright (c) 1987, 1991 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *      from: @(#)endian.h      7.8 (Berkeley) 4/3/91
+ *      endian.h,v 1.5 1994/09/10 20:03:14 csgr Exp
+ */
+#ifndef _MACHINE_ENDIAN_H_
+#define _MACHINE_ENDIAN_H_ 1
+/*
+ * Define the order of 32-bit words in 64-bit words.
+ */
+#define _QUAD_HIGHWORD 1
+#define _QUAD_LOWWORD 0
+/*
+ * Definitions for byte order, according to byte significance from low
+ * address to high.
+ */
+#define LITTLE_ENDIAN   1234    /* LSB first: i386, vax */
+#define BIG_ENDIAN      4321    /* MSB first: 68000, ibm, net */
+#define PDP_ENDIAN      3412    /* LSB first in word, MSW first in long */
+#define BYTE_ORDER      LITTLE_ENDIAN
+#ifndef KERNEL
+#include <ll/sys/cdefs.h>
+#endif
+#define __word_swap_long(x) \
+({ register u_long X = (x); \
+   __asm ("rorl $16, %1" \
+        : "=r" (X) \
+        : "0" (X)); \
+   X; })
+#if __GNUC__ >= 2
+#define __byte_swap_long(x) \
+({ register u_long X = (x); \
+   __asm ("xchgb %h1, %b1\n\trorl $16, %1\n\txchgb %h1, %b1" \
+        : "=q" (X) \
+        : "0" (X)); \
+   X; })
+#define __byte_swap_word(x) \
+({ register u_short X = (x); \
+   __asm ("xchgb %h1, %b1" \
+        : "=q" (X) \
+        : "0" (X)); \
+   X; })
+#else /* __GNUC__ >= 2 */
+#define __byte_swap_long(x) \
+({ register u_long X = (x); \
+   __asm ("rorw $8, %w1\n\trorl $16, %1\n\trorw $8, %w1" \
+        : "=r" (X) \
+        : "0" (X)); \
+   X; })
+#define __byte_swap_word(x) \
+({ register u_short X = (x); \
+   __asm ("rorw $8, %w1" \
+        : "=r" (X) \
+        : "0" (X)); \
+   X; })
+#endif /* __GNUC__ >= 2 */
+/*
+ * Macros for network/external number representation conversion.
+ */
+#if BYTE_ORDER == BIG_ENDIAN && !defined(lint)
+#define ntohl(x)        (x)
+#define ntohs(x)        (x)
+#define htonl(x)        (x)
+#define htons(x)        (x)
+#define NTOHL(x)        (x)
+#define NTOHS(x)        (x)
+#define HTONL(x)        (x)
+#define HTONS(x)        (x)
+#else
+#define ntohl   __byte_swap_long
+#define ntohs   __byte_swap_word
+#define htonl   __byte_swap_long
+#define htons   __byte_swap_word
+#define NTOHL(x)        (x) = ntohl((u_long)x)
+#define NTOHS(x)        (x) = ntohs((u_short)x)
+#define HTONL(x)        (x) = htonl((u_long)x)
+#define HTONS(x)        (x) = htons((u_short)x)
+#endif
+#endif /* _MACHINE_ENDIAN_H_ */

 /shark/branches/xen/libc/arch/x86/libm/machine/infinity.c
 ,7 → 20,7
  */
-#include <arch/math.h>
+#include <math.h>
 /* bytes for +Infinity on a 387 */
 char __infinity[] = { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f };

 /shark/branches/xen/libc/arch/x86/libm/machine/stub.c
 ,7 → 21,7
 #include <ll/i386/cons.h>
-#include <arch/stdlib.h>
+#include <ll/stdlib.h>
 #include <ll/sys/types.h>
 /* bytes for +Infinity on a 387 */

 /shark/branches/xen/libc/arch/x86/ioformat/sprintf.c
 ,14 → 19,14
  * For legalese, check out the included GPL license.
  */
-#include <arch/i386/stdlib.h>
-#include <arch/i386/string.h>
-#include <arch/i386/limits.h>
-#include <arch/i386/float.h>
+#include <ll/i386/stdlib.h>
+#include <ll/i386/string.h>
+#include <ll/i386/limits.h>
+#include <ll/i386/float.h>
 #include <ll/i386/mem.h>
-#include <arch/stdarg.h>
-//#include <arch/ctype.h>
-#include <arch/math.h>
+#include <ll/stdarg.h>
+//#include <ll/ctype.h>
+#include <ll/math.h>
 #include "sprintf.h"
 FILE(sprintf);

 /shark/branches/xen/libc/arch/x86/ioformat/ksprintf.c
 ,12 → 19,12
  * For legalese, check out the included GPL license.
  */
-#include <arch/i386/stdlib.h>
-#include <arch/i386/string.h>
-#include <arch/i386/limits.h>
-#include <arch/i386/float.h>
+#include <ll/i386/stdlib.h>
+#include <ll/i386/string.h>
+#include <ll/i386/limits.h>
+#include <ll/i386/float.h>
 #include <ll/i386/mem.h>
-#include <arch/stdarg.h>
+#include <ll/stdarg.h>
 #include "sprintf.h"
 FILE(ksprintf);

 /shark/branches/xen/libc/arch/x86/ioformat/ucvt.c
 ,13 → 19,13
  * For legalese, check out the included GPL license.
  */
-#include <arch/i386/stdlib.h>
-#include <arch/i386/string.h>
-#include <arch/i386/limits.h>
-#include <arch/i386/float.h>
+#include <ll/i386/stdlib.h>
+#include <ll/i386/string.h>
+#include <ll/i386/limits.h>
+#include <ll/i386/float.h>
 #include <ll/i386/mem.h>
-#include <arch/stdarg.h>
-#include <arch/ctype.h>
+#include <ll/stdarg.h>
+#include <ll/ctype.h>
 #include "sprintf.h"
 FILE(ucvt);

 /shark/branches/xen/libc/arch/x86/ioformat/sscanf.c
 ,11 → 19,11
  * For legalese, check out the included GPL license.
  */
-#include <arch/i386/stdlib.h>
-#include <arch/i386/string.h>
-#include <arch/i386/limits.h>
-#include <arch/stdarg.h>
-#include <arch/ctype.h>
+#include <ll/i386/stdlib.h>
+#include <ll/i386/string.h>
+#include <ll/i386/limits.h>
+#include <ll/stdarg.h>
+#include <ll/ctype.h>
 #include "sprintf.h"
 FILE(sscanf);

 /shark/branches/xen/libc/arch/x86/ioformat/ecvt.c
 ,14 → 20,14
  */
-#include <arch/i386/stdlib.h>
-#include <arch/i386/string.h>
-#include <arch/i386/limits.h>
-#include <arch/i386/float.h>
+#include <ll/i386/stdlib.h>
+#include <ll/i386/string.h>
+#include <ll/i386/limits.h>
+#include <ll/i386/float.h>
 #include <ll/i386/mem.h>
-#include <arch/stdarg.h>
-#include <arch/ctype.h>
-#include <arch/math.h>
+#include <ll/stdarg.h>
+#include <ll/ctype.h>
+#include <ll/math.h>
 #include "sprintf.h"
 FILE(ecvt);

 /shark/branches/xen/libc/arch/x86/ioformat/fcvt.c
 ,14 → 19,14
  * For legalese, check out the included GPL license.
  */
-#include <arch/i386/stdlib.h>
-#include <arch/i386/string.h>
-#include <arch/i386/limits.h>
-#include <arch/i386/float.h>
+#include <ll/i386/stdlib.h>
+#include <ll/i386/string.h>
+#include <ll/i386/limits.h>
+#include <ll/i386/float.h>
 #include <ll/i386/mem.h>
-#include <arch/stdarg.h>
-#include <arch/ctype.h>
-#include <arch/math.h>
+#include <ll/stdarg.h>
+#include <ll/ctype.h>
+#include <ll/math.h>
 #include "sprintf.h"
 FILE(fcvt);

 /shark/branches/xen/libc/arch/x86/ioformat/gcvt.c
 ,14 → 19,14
  * For legalese, check out the included GPL license.
  */
-#include <arch/i386/stdlib.h>
-#include <arch/i386/string.h>
-#include <arch/i386/limits.h>
-#include <arch/i386/float.h>
+#include <ll/i386/stdlib.h>
+#include <ll/i386/string.h>
+#include <ll/i386/limits.h>
+#include <ll/i386/float.h>
 #include <ll/i386/mem.h>
-#include <arch/stdarg.h>
-#include <arch/ctype.h>
-#include <arch/math.h>
+#include <ll/stdarg.h>
+#include <ll/ctype.h>
+#include <ll/math.h>
 #include "sprintf.h"
 FILE(gcvt);

 /shark/branches/xen/libc/arch/x86/stdlib/stdlib.c
 ,8 → 21,8
 #include <ll/i386/hw-func.h>
-#include <arch/i386/stdlib.h>
-#include <arch/unistd.h>
+#include <ll/i386/stdlib.h>
+#include <ll/unistd.h>
 FILE(stdlib);

 /shark/branches/xen/libc/arch/x86/stdlib/strtou.c
 ,11 → 19,11
  * For legalese, check out the included GPL license.
  */
-#include <arch/i386/stdlib.h>
-#include <arch/i386/string.h>
-#include <arch/i386/limits.h>
-#include <arch/stdarg.h>
-#include <arch/ctype.h>
+#include <ll/i386/stdlib.h>
+#include <ll/i386/string.h>
+#include <ll/i386/limits.h>
+#include <ll/stdarg.h>
+#include <ll/ctype.h>
 FILE(strtou);

 /shark/branches/xen/libc/arch/x86/stdlib/strtod.c
 ,12 → 19,12
  * For legalese, check out the included GPL license.
  */
-#include <arch/i386/stdlib.h>
-#include <arch/i386/string.h>
-#include <arch/i386/limits.h>
-#include <arch/stdarg.h>
-#include <arch/ctype.h>
-#include <arch/math.h>
+#include <ll/i386/stdlib.h>
+#include <ll/i386/string.h>
+#include <ll/i386/limits.h>
+#include <ll/stdarg.h>
+#include <ll/ctype.h>
+#include <ll/math.h>
 FILE(strod);

 /shark/branches/xen/libc/arch/x86/stdlib/random.c
 ,8 → 19,8
  * For legalese, check out the included GPL license.
  */
-#include <arch/i386/stdlib.h>
-#include <arch/math.h>
+#include <ll/i386/stdlib.h>
+#include <ll/math.h>
 FILE(random);

 /shark/branches/xen/libc/arch/x86/stdlib/strtoi.c
 ,12 → 19,12
  * For legalese, check out the included GPL license.
  */
-#include <arch/i386/stdlib.h>
-#include <arch/i386/string.h>
-#include <arch/i386/limits.h>
-#include <arch/stdarg.h>
-#include <arch/ctype.h>
-#include <arch/math.h>
+#include <ll/i386/stdlib.h>
+#include <ll/i386/string.h>
+#include <ll/i386/limits.h>
+#include <ll/stdarg.h>
+#include <ll/ctype.h>
+#include <ll/math.h>
 FILE(strtoi);

 /shark/branches/xen/libc/arch/x86/stdlib/strtol.c
 ,10 → 35,10
 static char sccsid[] = "@(#)strtol.c    8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
-#include <arch/limits.h>
-#include <arch/ctype.h>
-#include <arch/errno.h>
-#include <arch/stdlib.h>
+#include <ll/limits.h>
+#include <ll/ctype.h>
+#include <ll/errno.h>
+#include <ll/stdlib.h>
 FILE(strtol);

 /shark/branches/xen/libc/arch/x86/stdlib/strtoul.c
 ,10 → 35,10
 static char sccsid[] = "@(#)strtoul.c   8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
-#include <arch/limits.h>
-#include <arch/ctype.h>
-#include <arch/errno.h>
-#include <arch/stdlib.h>
+#include <ll/limits.h>
+#include <ll/ctype.h>
+#include <ll/errno.h>
+#include <ll/stdlib.h>
 FILE(strtoul);

 /shark/branches/xen/libc/arch/x86/string/strncat.c
 ,7 → 19,7
  * For legalese, check out the included GPL license.
  */
-#include <arch/i386/string.h>
+#include <ll/i386/string.h>
 FILE(strncat);

 /shark/branches/xen/libc/arch/x86/string/special.c
 ,8 → 19,8
  * For legalese, check out the included GPL license.
  */
-#include <arch/ctype.h>
-#include <arch/i386/string.h>
+#include <ll/ctype.h>
+#include <ll/i386/string.h>
 FILE(IsSpecial);

 /shark/branches/xen/libc/arch/x86/string/strstr.c
 ,7 → 19,7
  * For legalese, check out the included GPL license.
  */
-#include <arch/i386/string.h>
+#include <ll/i386/string.h>
 FILE(strstr);

 /shark/branches/xen/libc/arch/x86/string/strbase.c
 ,8 → 19,8
  * For legalese, check out the included GPL license.
  */
-#include <arch/ctype.h>
-#include <arch/i386/string.h>
+#include <ll/ctype.h>
+#include <ll/i386/string.h>
 FILE(strbase);

 /shark/branches/xen/libc/arch/x86/string/string.c
 ,7 → 19,7
  * For legalese, check out the included GPL license.
  */
-#include <arch/i386/string.h>
+#include <ll/i386/string.h>
 FILE(string);

 /shark/branches/xen/libc/arch/x86/string/strrchr.c
 ,7 → 19,7
  * For legalese, check out the included GPL license.
  */
-#include <arch/i386/string.h>
+#include <ll/i386/string.h>
 FILE(strchr);

 /shark/branches/xen/libc/arch/x86/string/strnum.c
 ,8 → 19,8
  * For legalese, check out the included GPL license.
  */
-#include <arch/ctype.h>
-#include <arch/i386/string.h>
+#include <ll/ctype.h>
+#include <ll/i386/string.h>
 FILE(strnum);

Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1621 → Rev 1620