WebSVN – HelenOS – Path Comparison – / – /branches/dd/uspace/lib/libc/arch/ Rev 4054 and /branches/dd/uspace/lib/libc/arch/ Rev 4055

Ignore whitespace Rev 4054 → Rev 4055

/branches/dd/uspace/lib/libc/arch/ppc64/_link.ld.in
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/include/thread.h
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/include/fibril.h
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/include/syscall.h
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/include/atomic.h
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/include/regname.h
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/include/byteorder.h
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/include/stackarg.h
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/include/faddr.h
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/include/limits.h
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/include/tls.h
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/include/types.h
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/include/config.h
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/Makefile.inc
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/src/thread_entry.s
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/src/syscall.c
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/src/entry.s
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/src/tls.c
File deleted

/branches/dd/uspace/lib/libc/arch/ppc64/src/fibril.S
File deleted

/branches/dd/uspace/lib/libc/arch/sparc64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dd/uspace/lib/libc/arch/sparc64/include/syscall.h
 ,6 → 38,14
 #include <sys/types.h>
 #include <kernel/syscall/syscall.h>
+#define __syscall0  __syscall
+#define __syscall1  __syscall
+#define __syscall2  __syscall
+#define __syscall3  __syscall
+#define __syscall4  __syscall
+#define __syscall5  __syscall
+#define __syscall6  __syscall
 static inline sysarg_t
 __syscall(const sysarg_t p1, const sysarg_t p2, const sysarg_t p3,
     const sysarg_t p4, const sysarg_t p5, const sysarg_t p6, const syscall_t id)

 /branches/dd/uspace/lib/libc/arch/sparc64/include/ddi.h
 ,0 → 1,92
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * 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.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+/** @file
+ * @ingroup libsparc64
+ */
+#ifndef LIBC_sparc64_DDI_H_
+#define LIBC_sparc64_DDI_H_
+#include <sys/types.h>
+#include <libarch/types.h>
+static inline memory_barrier(void)
+{
+    asm volatile ("membar #LoadLoad | #StoreStore\n" ::: "memory");
+}
+static inline void pio_write_8(ioport8_t *port, uint8_t v)
+{
+    *port = v;
+    memory_barrier();
+}
+static inline void pio_write_16(ioport16_t *port, uint16_t v)
+{
+    *port = v;
+    memory_barrier();
+}
+static inline void pio_write_32(ioport32_t *port, uint32_t v)
+{
+    *port = v;
+    memory_barrier();
+}
+static inline uint8_t pio_read_8(ioport8_t *port)
+{
+    uint8_t rv;
+    rv = *port;
+    memory_barrier();
+    return rv;
+}
+static inline uint16_t pio_read_16(ioport16_t *port)
+{
+    uint16_t rv;
+    rv = *port;
+    memory_barrier();
+    return rv;
+}
+static inline uint32_t pio_read_32(ioport32_t *port)
+{
+    uint32_t rv;
+    rv = *port;
+    memory_barrier();
+    return rv;
+}
+#endif

/branches/dd/uspace/lib/libc/arch/sparc64/include/config.h
37,7 → 37,6

#define PAGE_WIDTH 14
#define PAGE_SIZE (1 << PAGE_WIDTH)
#define PAGE_COLOR_BITS 0 /*< Only one page color. /

#endif

 /branches/dd/uspace/lib/libc/arch/sparc64/Makefile.inc
 ,10 → 30,10
 #
 TARGET = sparc64-linux-gnu
-TOOLCHAIN_DIR = /usr/local/sparc64/bin
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/sparc64/bin
-ARCH_SOURCES += arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
 CFLAGS += -mcpu=ultrasparc -m64
 LFLAGS += -no-check-sections -N

 /branches/dd/uspace/lib/libc/arch/sparc64/src/entry.s
 ,27 → 31,18
 .org 0
 .globl __entry
-.globl __entry_driver
 ## User-space task entry point
 #
+# %o0 contains uarg
+# %o1 contains pcb_ptr
 #
 __entry:
+    # Pass pcb_ptr as the first argument to __main()
+    mov %o1, %o0
     sethi %hi(_gp), %l7
     call __main
     or %l7, %lo(_gp), %l7
-    call __io_init
-    nop
-    call main
-    nop
-    call __exit
-    nop
-__entry_driver:
-    sethi %hi(_gp), %l7
-    call __main
-    or %l7, %lo(_gp), %l7
-    call main
-    nop
     call __exit
     nop

/branches/dd/uspace/lib/libc/arch/ia64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dd/uspace/lib/libc/arch/ia64/include/syscall.h
 ,6 → 36,8
 #ifndef LIBC_ia64_SYSCALL_H_
 #define LIBC_ia64_SYSCALL_H_
+#define LIBARCH_SYSCALL_GENERIC
 #include <syscall.h>
 #endif

 /branches/dd/uspace/lib/libc/arch/ia64/include/ddi.h
 ,0 → 1,115
+/*
+ * Copyright (c) 2005 Jakub Vana
+ * 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.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+/** @addtogroup libcia64
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_ia64_DDI_H_
+#define LIBC_ia64_DDI_H_
+#include <sys/types.h>
+#include <libarch/types.h>
+#define IO_SPACE_BOUNDARY   (64 * 1024)
+uint64_t get_ia64_iospace_address(void);
+extern uint64_t ia64_iospace_address;
+#define IA64_IOSPACE_ADDRESS \
+    (ia64_iospace_address ? \
+        ia64_iospace_address : \
+        (ia64_iospace_address = get_ia64_iospace_address()))
+static inline void pio_write_8(ioport8_t *port, uint8_t v)
+{
+    uintptr_t prt = (uintptr_t) port;
+    *((uint8_t *)(IA64_IOSPACE_ADDRESS +
+        ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
+    asm volatile ("mf\n" ::: "memory");
+}
+static inline void pio_write_16(ioport16_t *port, uint16_t v)
+{
+    uintptr_t prt = (uintptr_t) port;
+    *((uint16_t *)(IA64_IOSPACE_ADDRESS +
+        ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
+    asm volatile ("mf\n" ::: "memory");
+}
+static inline void pio_write_32(ioport32_t *port, uint32_t v)
+{
+    uintptr_t prt = (uintptr_t) port;
+    *((uint32_t *)(IA64_IOSPACE_ADDRESS +
+        ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
+    asm volatile ("mf\n" ::: "memory");
+}
+static inline uint8_t pio_read_8(ioport8_t *port)
+{
+    uintptr_t prt = (uintptr_t) port;
+    asm volatile ("mf\n" ::: "memory");
+    return *((uint8_t *)(IA64_IOSPACE_ADDRESS +
+        ((prt & 0xfff) | ((prt >> 2) << 12))));
+}
+static inline uint16_t pio_read_16(ioport16_t *port)
+{
+    uintptr_t prt = (uintptr_t) port;
+    asm volatile ("mf\n" ::: "memory");
+    return *((uint16_t *)(IA64_IOSPACE_ADDRESS +
+        ((prt & 0xfff) | ((prt >> 2) << 12))));
+}
+static inline uint32_t pio_read_32(ioport32_t *port)
+{
+    uintptr_t prt = (uintptr_t) port;
+    asm volatile ("mf\n" ::: "memory");
+    return *((uint32_t *)(IA64_IOSPACE_ADDRESS +
+        ((prt & 0xfff) | ((prt >> 2) << 12))));
+}
+#endif
+/** @}
+ */

 /branches/dd/uspace/lib/libc/arch/ia64/include/config.h
 ,8 → 36,7
 #define LIBC_ia64_CONFIG_H_
 #define PAGE_WIDTH  14
-#define PAGE_SIZE   (1<<PAGE_WIDTH)
-#define PAGE_COLOR_BITS 0        /* dummy */
+#define PAGE_SIZE   (1 << PAGE_WIDTH)
 #endif

 /branches/dd/uspace/lib/libc/arch/ia64/Makefile.inc
 ,14 → 30,15
 #
 TARGET = ia64-pc-linux-gnu
-TOOLCHAIN_DIR = /usr/local/ia64/bin
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64/bin
 CFLAGS += -fno-unwind-tables -DMALLOC_ALIGNMENT_16
 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS +=
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c \
+    arch/$(UARCH)/src/ddi.c
 BFD_NAME = elf64-ia64-little
 BFD_ARCH = ia64-elf64

 /branches/dd/uspace/lib/libc/arch/ia64/src/ddi.c
 ,0 → 1,13
+#include <libarch/ddi.h>
+#include <sysinfo.h>
+uint64_t ia64_iospace_address=0;
+uint64_t get_ia64_iospace_address(void)
+{
+    return sysinfo_value("ia64_iospace.address.virtual");
+}

 /branches/dd/uspace/lib/libc/arch/ia64/src/entry.s
 ,27 → 31,17
 .org 0
 .globl __entry
-.globl __entry_driver
 ## User-space task entry point
 #
+# r2 contains the PCB pointer
 #
 __entry:
     alloc loc0 = ar.pfs, 0, 1, 2, 0
-    mov r1 = _gp
-    br.call.sptk.many b0 = __main
-:
-    br.call.sptk.many b0 = __io_init
-:
-    br.call.sptk.many b0 = main
-:
-    br.call.sptk.many b0 = __exit
+    movl r1 = _gp
-__entry_driver:
-    alloc loc0 = ar.pfs, 0, 1, 2, 0
-    mov r1 = _gp
+    # Pass PCB pointer as the first argument to __main
+    mov out0 = r2
     br.call.sptk.many b0 = __main
 :
-    br.call.sptk.many b0 = main
-:
     br.call.sptk.many b0 = __exit

 /branches/dd/uspace/lib/libc/arch/ia64/src/thread_entry.s
 ,7 → 36,7
 __thread_entry:
     alloc loc0 = ar.pfs, 0, 1, 1, 0
-    mov r1 = _gp
+    movl r1 = _gp
     #
     # r8 contains address of uarg structure.

/branches/dd/uspace/lib/libc/arch/arm32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dd/uspace/lib/libc/arch/arm32/include/syscall.h
 ,12 → 30,14
  * @{
  */
 /** @file
- *  @brief Empty.
+ *  @brief
  */
 #ifndef LIBC_arm32_SYSCALL_H_
 #define LIBC_arm32_SYSCALL_H_
+#define LIBARCH_SYSCALL_GENERIC
 #include <syscall.h>
 #endif

 /branches/dd/uspace/lib/libc/arch/arm32/include/byteorder.h
 ,7 → 36,7
 #ifndef LIBC_arm32_BYTEORDER_H_
 #define LIBC_arm32_BYTEORDER_H_
-#define ARCH_IS_BIG_ENDIAN
+#define ARCH_IS_LITTLE_ENDIAN
 #endif

 /branches/dd/uspace/lib/libc/arch/arm32/include/ddi.h
 ,0 → 1,69
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * 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.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+/** @file
+ * @ingroup libcarm32
+ */
+#ifndef LIBC_arm32_DDI_H_
+#define LIBC_arm32_DDI_H_
+#include <sys/types.h>
+#include <libarch/types.h>
+static inline void pio_write_8(ioport8_t *port, uint8_t v)
+{
+    *port = v;
+}
+static inline void pio_write_16(ioport16_t *port, uint16_t v)
+{
+    *port = v;
+}
+static inline void pio_write_32(ioport32_t *port, uint32_t v)
+{
+    *port = v;
+}
+static inline uint8_t pio_read_8(ioport8_t *port)
+{
+    return *port;
+}
+static inline uint16_t pio_read_16(ioport16_t *port)
+{
+    return *port;
+}
+static inline uint32_t pio_read_32(ioport32_t *port)
+{
+    return *port;
+}
+#endif

/branches/dd/uspace/lib/libc/arch/arm32/include/config.h
38,7 → 38,6

#define PAGE_WIDTH 12
#define PAGE_SIZE (1 << PAGE_WIDTH)
#define PAGE_COLOR_BITS 0 /* dummy */

#endif

 /branches/dd/uspace/lib/libc/arch/arm32/Makefile.inc
 ,15 → 31,15
 #
 TARGET = arm-linux-gnu
-TOOLCHAIN_DIR = /usr/local/arm/bin
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
 CFLAGS += -ffixed-r9 -mtp=soft
 LFLAGS += -N $(SOFTINT_PREFIX)/libsoftint.a
-AFLAGS +=
+AFLAGS +=
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c \
-        arch/$(ARCH)/src/eabi.S
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c \
+    arch/$(UARCH)/src/eabi.S
 BFD_NAME = elf32-littlearm
 BFD_ARCH = arm

 /branches/dd/uspace/lib/libc/arch/arm32/src/entry.s
 ,19 → 31,14
 .org 0
 .global __entry
-.global __entry_driver
 ## User-space task entry point
 #
+# r1 contains the PCB pointer
 #
 __entry:
+    # Pass pcb_ptr to __main as the first argument (in r0)
+    mov r0, r1
     bl __main
-    bl __io_init
-    bl main
-    bl __exit
-__entry_driver:
-    bl __main
-    bl main
     bl __exit

 /branches/dd/uspace/lib/libc/arch/mips32eb/Makefile.inc
 ,12 → 30,12
 #
 TARGET = mips-sgi-irix5
-TOOLCHAIN_DIR = /usr/local/mips/bin
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips/bin
 CFLAGS += -mips3
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+        arch/$(UARCH)/src/fibril.S \
+        arch/$(UARCH)/src/tls.c
 LFLAGS += -N

/branches/dd/uspace/lib/libc/arch/ppc32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dd/uspace/lib/libc/arch/ppc32/include/syscall.h
 ,6 → 36,8
 #ifndef LIBC_ppc32_SYSCALL_H_
 #define LIBC_ppc32_SYSCALL_H_
+#define LIBARCH_SYSCALL_GENERIC
 #include <syscall.h>
 #endif

 /branches/dd/uspace/lib/libc/arch/ppc32/include/ddi.h
 ,0 → 1,69
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * 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.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+/** @file
+ * @ingroup libcppc32
+ */
+#ifndef LIBC_ppc32_DDI_H_
+#define LIBC_ppc32_DDI_H_
+#include <sys/types.h>
+#include <libarch/types.h>
+static inline void pio_write_8(ioport8_t *port, uint8_t v)
+{
+    *port = v;
+}
+static inline void pio_write_16(ioport16_t *port, uint16_t v)
+{
+    *port = v;
+}
+static inline void pio_write_32(ioport32_t *port, uint32_t v)
+{
+    *port = v;
+}
+static inline uint8_t pio_read_8(ioport8_t *port)
+{
+    return *port;
+}
+static inline uint16_t pio_read_16(ioport16_t *port)
+{
+    return *port;
+}
+static inline uint32_t pio_read_32(ioport32_t *port)
+{
+    return *port;
+}
+#endif

 /branches/dd/uspace/lib/libc/arch/ppc32/include/config.h
 ,8 → 36,7
 #define LIBC_ppc32_CONFIG_H_
 #define PAGE_WIDTH  12
-#define PAGE_SIZE   (1<<PAGE_WIDTH)
-#define PAGE_COLOR_BITS 0        /* dummy */
+#define PAGE_SIZE   (1 << PAGE_WIDTH)
 #endif

 /branches/dd/uspace/lib/libc/arch/ppc32/Makefile.inc
 ,11 → 30,11
 #
 TARGET = ppc-linux-gnu
-TOOLCHAIN_DIR = /usr/local/ppc/bin
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/ppc/bin
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
 CFLAGS += -mcpu=powerpc -msoft-float -m32
 AFLAGS += -a32

 /branches/dd/uspace/lib/libc/arch/ppc32/src/entry.s
 ,18 → 31,15
 .org 0
 .globl __entry
-.globl __entry_driver
 ## User-space task entry point
 #
+# r6 contains the PCB pointer
 #
 __entry:
+    # Pass the PCB pointer to __main() as the first argument.
+    # The first argument is passed in r3.
+    mr %r3, %r6
     bl __main
-    bl __io_init
-    bl main
-    bl __exit
-__entry_driver:
-    bl __main
-    bl main
     bl __exit

/branches/dd/uspace/lib/libc/arch/amd64/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dd/uspace/lib/libc/arch/amd64/include/syscall.h
 ,6 → 36,8
 #ifndef LIBC_amd64_SYSCALL_H_
 #define LIBC_amd64_SYSCALL_H_
+#define LIBARCH_SYSCALL_GENERIC
 #include <syscall.h>
 #endif

 /branches/dd/uspace/lib/libc/arch/amd64/include/atomic.h
 ,11 → 38,11
 #define LIBC_amd64_ATOMIC_H_
 static inline void atomic_inc(atomic_t *val) {
-    asm volatile ("lock incq %0\n" : "=m" (val->count));
+    asm volatile ("lock incq %0\n" : "+m" (val->count));
 }
 static inline void atomic_dec(atomic_t *val) {
-    asm volatile ("lock decq %0\n" : "=m" (val->count));
+    asm volatile ("lock decq %0\n" : "+m" (val->count));
 }
 static inline long atomic_postinc(atomic_t *val)
 ,7 → 52,7
     asm volatile (
         "movq $1, %0\n"
         "lock xaddq %0, %1\n"
-        : "=r" (r), "=m" (val->count)
+        : "=r" (r), "+m" (val->count)
     );
     return r;
 ,14 → 65,14
     asm volatile (
         "movq $-1, %0\n"
         "lock xaddq %0, %1\n"
-        : "=r" (r), "=m" (val->count)
+        : "=r" (r), "+m" (val->count)
     );
     return r;
 }
-#define atomic_preinc(val) (atomic_postinc(val)+1)
-#define atomic_predec(val) (atomic_postdec(val)-1)
+#define atomic_preinc(val) (atomic_postinc(val) + 1)
+#define atomic_predec(val) (atomic_postdec(val) - 1)
 #endif

 /branches/dd/uspace/lib/libc/arch/amd64/include/config.h
 ,8 → 36,7
 #define LIBC_amd64_CONFIG_H_
 #define PAGE_WIDTH  12
-#define PAGE_SIZE   (1<<PAGE_WIDTH)
-#define PAGE_COLOR_BITS 0        /* dummy */
+#define PAGE_SIZE   (1 << PAGE_WIDTH)
 #endif

 /branches/dd/uspace/lib/libc/arch/amd64/Makefile.inc
 ,11 → 30,11
 #
 TARGET = amd64-linux-gnu
-TOOLCHAIN_DIR = /usr/local/amd64/bin
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/amd64/bin
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
 LFLAGS += -N

 /branches/dd/uspace/lib/libc/arch/amd64/src/entry.s
 ,18 → 31,14
 .org 0
 .globl __entry
-.globl __entry_driver
 ## User-space task entry point
 #
+# %rdi contains the PCB pointer
 #
 __entry:
+    # %rdi was deliberately chosen as the first argument is also in %rdi
+    # Pass PCB pointer to __main (no operation)
     call __main
-    call __io_init
-    call main
-    call __exit
-__entry_driver:
-    call __main
-    call main
     call __exit

/branches/dd/uspace/lib/libc/arch/mips32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dd/uspace/lib/libc/arch/mips32/include/syscall.h
 ,6 → 36,8
 #ifndef LIBC_mips32_SYSCALL_H_
 #define LIBC_mips32_SYSCALL_H_
+#define LIBARCH_SYSCALL_GENERIC
 #include <syscall.h>
 #endif

 /branches/dd/uspace/lib/libc/arch/mips32/include/atomic.h
 ,13 → 59,14
     asm volatile (
         "1:\n"
         "   ll %0, %1\n"
-        "   addiu %0, %0, %3\n" /* same as addi, but never traps on overflow */
+        "   addu %0, %0, %3\n"  /* same as add, but never traps on overflow */
         "       move %2, %0\n"
         "   sc %0, %1\n"
         "   beq %0, %4, 1b\n"   /* if the atomic operation failed, try again */
         /*  nop */      /* nop is inserted automatically by compiler */
-        : "=r" (tmp), "=m" (val->count), "=r" (v)
-        : "i" (i), "i" (0)
+        "   nop\n"
+        : "=&r" (tmp), "+m" (val->count), "=&r" (v)
+        : "r" (i), "i" (0)
         );
     return v;

 /branches/dd/uspace/lib/libc/arch/mips32/include/ddi.h
 ,0 → 1,69
+/*
+ * Copyright (c) 2009 Jakub Jermar
+ * 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.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+/** @file
+ * @ingroup libcmips32
+ */
+#ifndef LIBC_mips32_DDI_H_
+#define LIBC_mips32_DDI_H_
+#include <sys/types.h>
+#include <libarch/types.h>
+static inline void pio_write_8(ioport8_t *port, uint8_t v)
+{
+    *port = v;
+}
+static inline void pio_write_16(ioport16_t *port, uint16_t v)
+{
+    *port = v;
+}
+static inline void pio_write_32(ioport32_t *port, uint32_t v)
+{
+    *port = v;
+}
+static inline uint8_t pio_read_8(ioport8_t *port)
+{
+    return *port;
+}
+static inline uint16_t pio_read_16(ioport16_t *port)
+{
+    return *port;
+}
+static inline uint32_t pio_read_32(ioport32_t *port)
+{
+    return *port;
+}
+#endif

 /branches/dd/uspace/lib/libc/arch/mips32/include/config.h
 ,8 → 36,7
 #define LIBC_mips32_CONFIG_H_
 #define PAGE_WIDTH  14
-#define PAGE_SIZE   (1<<PAGE_WIDTH)
-#define PAGE_COLOR_BITS 0        /* dummy */
+#define PAGE_SIZE   (1 << PAGE_WIDTH)
 #endif

 /branches/dd/uspace/lib/libc/arch/mips32/Makefile.inc
 ,18 → 30,12
 #
 TARGET = mipsel-linux-gnu
-TOOLCHAIN_DIR = /usr/local/mipsel/bin
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/mipsel/bin
 CFLAGS += -mips3
--include ../../Makefile.config
-ifeq ($(CONFIG_MIPS_FPU),y)
-    CFLAGS += -DCONFIG_MIPS_FPU
-endif
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.c \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.c \
-    arch/$(ARCH)/src/fibril.S \
-    arch/$(ARCH)/src/tls.c
 BFD_ARCH = mips
 BFD_NAME = elf32-tradlittlemips

 /branches/dd/uspace/lib/libc/arch/mips32/src/entry.s
 ,13 → 35,13
 ## User-space task entry point
 #
+# $a0 ($4) contains the PCB pointer
 #
 .ent __entry
 __entry:
     .frame $sp, 32, $31
     .cpload $25
     # Mips o32 may store its arguments on stack, make space (16 bytes),
     # so that it could work with -O0
     # Make space additional 16 bytes for the stack frame
 ,42 → 48,18
     addiu $sp, -32
     .cprestore 16   # Allow PIC code
-    jal __main
-    nop
-    jal __io_init
-    nop
-    jal main
-    nop
-    jal __exit
-    nop
-.end
-.ent __entry_driver
-__entry_driver:
-    .frame $sp, 32, $31
-    .cpload $25
-    # Mips o32 may store its arguments on stack, make space (16 bytes),
-    # so that it could work with -O0
-    # Make space additional 16 bytes for the stack frame
+    # Pass pcb_ptr to __main() as the first argument. pcb_ptr is already
+    # in $a0. As the first argument is passed in $a0, no operation
+    # is needed.
-    addiu $sp, -32
-    .cprestore 16   # Allow PIC code
     jal __main
     nop
-    jal main
-    nop
     jal __exit
     nop
 .end
 # Alignment of output section data to 0x4000
 .section .data
 .align 14

/branches/dd/uspace/lib/libc/arch/ia32/_link.ld.in
1,4 → 1,4
STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
ENTRY(__entry)

PHDRS {

 /branches/dd/uspace/lib/libc/arch/ia32/include/syscall.h
 ,8 → 36,25
 #ifndef LIBC_ia32_SYSCALL_H_
 #define LIBC_ia32_SYSCALL_H_
-#include <syscall.h>
+#include <sys/types.h>
+#include <kernel/syscall/syscall.h>
+#define __syscall0  __syscall_sysenter
+#define __syscall1  __syscall_sysenter
+#define __syscall2  __syscall_sysenter
+#define __syscall3  __syscall_sysenter
+#define __syscall4  __syscall_sysenter
+#define __syscall5  __syscall_int
+#define __syscall6  __syscall_int
+extern sysarg_t
+__syscall_sysenter(const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t,
+     const sysarg_t, const sysarg_t, const syscall_t);
+extern sysarg_t
+__syscall_int(const sysarg_t, const sysarg_t, const sysarg_t, const sysarg_t,
+     const sysarg_t, const sysarg_t, const syscall_t);
 #endif
 /** @}

 /branches/dd/uspace/lib/libc/arch/ia32/include/atomic.h
 ,11 → 36,11
 #define LIBC_ia32_ATOMIC_H_
 static inline void atomic_inc(atomic_t *val) {
-    asm volatile ("lock incl %0\n" : "=m" (val->count));
+    asm volatile ("lock incl %0\n" : "+m" (val->count));
 }
 static inline void atomic_dec(atomic_t *val) {
-    asm volatile ("lock decl %0\n" : "=m" (val->count));
+    asm volatile ("lock decl %0\n" : "+m" (val->count));
 }
 static inline long atomic_postinc(atomic_t *val)
 ,7 → 50,7
     asm volatile (
         "movl $1, %0\n"
         "lock xaddl %0, %1\n"
-        : "=r" (r), "=m" (val->count)
+        : "=r" (r), "+m" (val->count)
     );
     return r;
 ,14 → 63,14
     asm volatile (
         "movl $-1, %0\n"
         "lock xaddl %0, %1\n"
-        : "=r" (r), "=m" (val->count)
+        : "=r" (r), "+m" (val->count)
     );
     return r;
 }
-#define atomic_preinc(val) (atomic_postinc(val)+1)
-#define atomic_predec(val) (atomic_postdec(val)-1)
+#define atomic_preinc(val) (atomic_postinc(val) + 1)
+#define atomic_predec(val) (atomic_postdec(val) - 1)
 #endif

 /branches/dd/uspace/lib/libc/arch/ia32/include/ddi.h
 ,43 → 33,72
 #ifndef LIBC_ia32_DDI_H_
 #define LIBC_ia32_DDI_H_
-static inline void outb(int16_t port, uint8_t b)
+#include <sys/types.h>
+#include <libarch/types.h>
+#define IO_SPACE_BOUNDARY   ((void *) (64 * 1024))
+static inline uint8_t pio_read_8(ioport8_t *port)
 {
-    asm volatile ("outb %0, %1\n" :: "a" (b), "d" (port));
+    uint8_t val;
+    asm volatile (
+        "inb %w[port], %b[val]\n"
+        : [val] "=a" (val)
+        : [port] "d" (port)
+    );
+    return val;
 }
-static inline void outw(int16_t port, int16_t w)
+static inline uint16_t pio_read_16(ioport16_t *port)
 {
-    asm volatile ("outw %0, %1\n" :: "a" (w), "d" (port));
+    uint16_t val;
+    asm volatile (
+        "inw %w[port], %w[val]\n"
+        : [val] "=a" (val)
+        : [port] "d" (port)
+    );
+    return val;
 }
-static inline void outl(int16_t port, uint32_t l)
+static inline uint32_t pio_read_32(ioport32_t *port)
 {
-    asm volatile ("outl %0, %1\n" :: "a" (l), "d" (port));
+    uint32_t val;
+    asm volatile (
+        "inl %w[port], %[val]\n"
+        : [val] "=a" (val)
+        : [port] "d" (port)
+    );
+    return val;
 }
-static inline uint8_t inb(int16_t port)
+static inline void pio_write_8(ioport8_t *port, uint8_t val)
 {
-    uint8_t val;
-    asm volatile ("inb %1, %0 \n" : "=a" (val) : "d"(port));
-    return val;
+    asm volatile (
+        "outb %b[val], %w[port]\n"
+        :: [val] "a" (val), [port] "d" (port)
+    );
 }
-static inline int16_t inw(int16_t port)
+static inline void pio_write_16(ioport16_t *port, uint16_t val)
 {
-    int16_t val;
-    asm volatile ("inw %1, %0 \n" : "=a" (val) : "d"(port));
-    return val;
+    asm volatile (
+        "outw %w[val], %w[port]\n"
+        :: [val] "a" (val), [port] "d" (port)
+    );
 }
-static inline uint32_t inl(int16_t port)
+static inline void pio_write_32(ioport32_t *port, uint32_t val)
 {
-    uint32_t val;
-    asm volatile ("inl %1, %0 \n" : "=a" (val) : "d"(port));
-    return val;
+    asm volatile (
+        "outl %[val], %w[port]\n"
+        :: [val] "a" (val), [port] "d" (port)
+    );
 }
 #endif

 /branches/dd/uspace/lib/libc/arch/ia32/include/config.h
 ,8 → 36,7
 #define LIBC_ia32_CONFIG_H_
 #define PAGE_WIDTH  12
-#define PAGE_SIZE   (1<<PAGE_WIDTH)
-#define PAGE_COLOR_BITS 0        /* dummy */
+#define PAGE_SIZE   (1 << PAGE_WIDTH)
 #endif

 /branches/dd/uspace/lib/libc/arch/ia32/Makefile.inc
 ,12 → 30,12
 #
 TARGET = i686-pc-linux-gnu
-TOOLCHAIN_DIR = /usr/local/i686/bin
+TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686/bin
-ARCH_SOURCES += arch/$(ARCH)/src/syscall.S \
-        arch/$(ARCH)/src/fibril.S \
-        arch/$(ARCH)/src/tls.c \
-        arch/$(ARCH)/src/setjmp.S
+ARCH_SOURCES += arch/$(UARCH)/src/syscall.S \
+    arch/$(UARCH)/src/fibril.S \
+    arch/$(UARCH)/src/tls.c \
+    arch/$(UARCH)/src/setjmp.S
 LFLAGS += -N

 /branches/dd/uspace/lib/libc/arch/ia32/src/entry.s
 ,10 → 31,10
 .org 0
 .globl __entry
-.globl __entry_driver
 ## User-space task entry point
 #
+# %ebx contains the PCB pointer
 #
 __entry:
     mov %ss, %ax
 ,19 → 42,9
     mov %ax, %es
     mov %ax, %fs
     # Do not set %gs, it contains descriptor that can see TLS
+    # Pass the PCB pointer to __main as the first argument
+    pushl %ebx
     call __main
-    call __io_init
-    call main
     call __exit
-__entry_driver:
-    mov %ss, %ax
-    mov %ax, %ds
-    mov %ax, %es
-    mov %ax, %fs
-    # Do not set %gs, it contains descriptor that can see TLS
-    call __main
-    call main
-    call __exit

 /branches/dd/uspace/lib/libc/arch/ia32/src/syscall.S
 ,14 → 28,14
 .text
-/** Syscall wrapper.
+/** Syscall wrapper - INT $0x30 version.
  *
  * Mind the order of arguments. First two arguments and the syscall number go to
  * scratch registers. An optimized version of this wrapper for fewer arguments
  * could benefit from this and not save unused registers on the stack.
  */
-.global __syscall
-__syscall:
+.global __syscall_int
+__syscall_int:
     pushl %ebx
     pushl %esi
     pushl %edi
 ,3 → 54,37
     popl %ebx
     ret
+/** Syscall wrapper - SYSENTER version.
+ *
+ * This is an optimized version of syscall for four or less arguments.  Note
+ * that EBP and EDI are used to remember user stack address and the return
+ * address. The kernel part doesn't save DS, ES and FS so the handler restores
+ * these to the selector immediately following CS (it must be the flat data
+ * segment, otherwise the SYSENTER wouldn't work in the first place).
+ */
+.global __syscall_sysenter
+__syscall_sysenter:
+    pushl %ebx
+    pushl %esi
+    pushl %edi
+    pushl %ebp
+    mov %esp, %ebp
+    lea ra, %edi
+    movl 20(%esp), %edx # First argument.
+    movl 24(%esp), %ecx # Second argument.
+    movl 28(%esp), %ebx # Third argument.
+    movl 32(%esp), %esi # Fourth argument.
+    movl 44(%esp), %eax # Syscall number.
+    sysenter
+ra:
+    movw %cs, %cx
+    addw $8, %cx
+    movw %cx, %ds
+    movw %cx, %es
+    movw %cx, %fs
+    popl %ebp
+    popl %edi
+    popl %esi
+    popl %ebx
+    ret

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4054 → Rev 4055