Changeset e4f8c77 in mainline for uspace/lib/c/arch

Timestamp:

2011-07-13T22:39:18Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e6910c8

Parents:

5974661 (diff), 8ecef91 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libposix.

Location:

uspace/lib/c/arch

Files:

• mips32/Makefile.common (modified) (1 diff)
• mips32/include/atomic.h (modified) (1 diff)
• mips32/include/fibril.h (modified) (1 diff)
• mips32/include/thread.h (modified) (1 diff)
• mips32/include/tls.h (modified) (1 diff)
• mips32/include/types.h (modified) (1 diff)
• mips32/src/syscall.c (modified) (2 diffs)
• mips32/src/tls.c (modified) (1 diff)
• mips32eb/Makefile.common (modified) (1 diff)
• mips64/Makefile.common (moved) (moved from uspace/srv/hw/irc/fhc/Makefile ) (2 diffs)
• mips64/Makefile.inc (moved) (moved from uspace/srv/hid/char_mouse/Makefile ) (2 diffs)
• mips64/_link.ld.in (added)
• mips64/include/atomic.h (added)
• mips64/include/config.h (added)
• mips64/include/ddi.h (added)
• mips64/include/faddr.h (added)
• mips64/include/fibril.h (added)
• mips64/include/inttypes.h (added)
• mips64/include/istate.h (moved) (moved from uspace/srv/hid/adb_mouse/adb_dev.h ) (2 diffs)
• mips64/include/syscall.h (added)
• mips64/include/thread.h (added)
• mips64/include/tls.h (added)
• mips64/include/types.h (added)
• mips64/src/entry.s (added)
• mips64/src/entryjmp.s (added)
• mips64/src/fibril.S (added)
• mips64/src/stacktrace.c (moved) (moved from uspace/lib/c/include/devman_obsolete.h ) (3 diffs)
• mips64/src/stacktrace_asm.S (added)
• mips64/src/syscall.c (added)
• mips64/src/thread_entry.s (added)
• mips64/src/tls.c (added)

uspace/lib/c/arch/mips32/Makefile.common

@@ -27 +27 @@
 #
 
-GCC_CFLAGS += -mips3
+GCC_CFLAGS += -mips3 -mabi=32
 
 ENDIANESS = LE

uspace/lib/c/arch/mips32/include/atomic.h

@@ -31 +31 @@
  */
 /** @file
- * @ingroup libcmips32eb
+ * @ingroup libcmips32
  */
 

uspace/lib/c/arch/mips32/include/fibril.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libcmips32      
+/** @addtogroup libcmips32
  * @{
  */
 /** @file
- * @ingroup libcmips32eb        
+ * @ingroup libcmips32
  */
 

uspace/lib/c/arch/mips32/include/thread.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libcmips32      
+/** @addtogroup libcmips32
  * @{
  */
 /** @file
- * @ingroup libcmips32eb        
+ * @ingroup libcmips32
  */
 

uspace/lib/c/arch/mips32/include/tls.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libcmips32      
+/** @addtogroup libcmips32
  * @{
  */
 /** @file
- * @ingroup libcmips32eb        
+ * @ingroup libcmips32
  */
 

uspace/lib/c/arch/mips32/include/types.h

@@ -31 +31 @@
  */
 /** @file
- * @ingroup libcmips32eb
+ * @ingroup libcmips32
  */
 

uspace/lib/c/arch/mips32/src/syscall.c

@@ -27 +27 @@
  */
 
- /** @addtogroup libcmips32
+/** @addtogroup libcmips32
  * @{
  */
 /** @file
-  * @ingroup libcmips32eb       
+  * @ingroup libcmips32
  */
 
@@ -64 +64 @@
 }
 
- /** @}
+/** @}
  */
-

uspace/lib/c/arch/mips32/src/tls.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libcmips32      
+/** @addtogroup libcmips32
  * @{
  */
 /** @file
- * @ingroup libcmips32eb        
+ * @ingroup libcmips32
  */
 

uspace/lib/c/arch/mips32eb/Makefile.common

@@ -27 +27 @@
 #
 
-GCC_CFLAGS += -mips3
+GCC_CFLAGS += -mips3 -mabi=32
 
 ENDIANESS = BE

uspace/lib/c/arch/mips64/Makefile.common

@@ -1 +1 @@
 #
 # Copyright (c) 2005 Martin Decky
-# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -28 +27 @@
 #
 
-USPACE_PREFIX = ../../../..
-BINARY = fhc
+GCC_CFLAGS += -mips3 -mabi=64
+AFLAGS = -64
 
-SOURCES = \
-        fhc.c
+ENDIANESS = LE
 
-include $(USPACE_PREFIX)/Makefile.common
+BFD_ARCH = mips:4000
+BFD_NAME = elf64-tradlittlemips

uspace/lib/c/arch/mips64/Makefile.inc

@@ -1 +1 @@
 #
 # Copyright (c) 2005 Martin Decky
-# Copyright (c) 2007 Jakub Jermar
 # All rights reserved.
 #
@@ -28 +27 @@
 #
 
-USPACE_PREFIX = ../../..
-EXTRA_CFLAGS = -Iinclude
-BINARY = char_ms
+ARCH_SOURCES = \
+        arch/$(UARCH)/src/entry.s \
+        arch/$(UARCH)/src/entryjmp.s \
+        arch/$(UARCH)/src/thread_entry.s \
+        arch/$(UARCH)/src/syscall.c \
+        arch/$(UARCH)/src/fibril.S \
+        arch/$(UARCH)/src/tls.c \
+        arch/$(UARCH)/src/stacktrace.c \
+        arch/$(UARCH)/src/stacktrace_asm.S
 
-SOURCES = \
-        proto/ps2.c \
-        char_mouse.c \
-        chardev.c
-
-include $(USPACE_PREFIX)/Makefile.common
+.PRECIOUS: arch/$(UARCH)/src/entry.o

uspace/lib/c/arch/mips64/include/istate.h

@@ -27 +27 @@
  */
 
-/** @addtogroup mouse
- * @brief
+/** @addtogroup libcmips64
  * @{
  */
@@ -34 +33 @@
  */
 
-#ifndef ADBDEV_H_
-#define ADBDEV_H_
+#ifndef LIBC_mips64__ISTATE_H_
+#define LIBC_mips64__ISTATE_H_
 
-#include <sys/types.h>
-
-extern int adb_dev_init(void);
+#include <arch/istate.h>
 
 #endif
 
-/**
- * @}
- */ 
-
+/** @}
+ */

uspace/lib/c/arch/mips64/src/stacktrace.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
- * Copyright (c) 2010 Lenka Trochtova 
+ * Copyright (c) 2010 Jakub Jermar
+ * Copyright (c) 2010 Jiri Svoboda
  * All rights reserved.
  *
@@ -28 +28 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libcmips64 mips64
+ * @ingroup lc
  * @{
  */
@@ -34 +35 @@
  */
 
-#ifndef LIBC_DEVMAN_OBSOLETE_H_
-#define LIBC_DEVMAN_OBSOLETE_H_
+#include <sys/types.h>
+#include <bool.h>
+#include <errno.h>
 
-#include <ipc/devman.h>
-#include <async.h>
-#include <bool.h>
+#include <stacktrace.h>
 
-extern int devman_obsolete_get_phone(devman_interface_t, unsigned int);
-extern void devman_obsolete_hangup_phone(devman_interface_t);
+bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp)
+{
+        (void) st; (void) fp;
+        return false;
+}
 
-extern int devman_obsolete_device_connect(devman_handle_t, unsigned int);
-extern int devman_obsolete_parent_device_connect(devman_handle_t, unsigned int);
+int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev)
+{
+        (void) st; (void) fp; (void) prev;
+        return ENOTSUP;
+}
 
-#endif
+int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra)
+{
+        (void) st; (void) fp; (void) ra;
+        return ENOTSUP;
+}
 
 /** @}