Changeset df3c6f02 in mainline for uspace/lib/c/arch/ia32/include

Timestamp:

2011-05-31T22:58:56Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d362410

Parents:

82582e4 (diff), 4ce90544 (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 mainline changes.

Location:

uspace/lib/c/arch/ia32/include

Files:

• config.h (modified) (1 diff)
• ddi.h (modified) (1 diff)
• faddr.h (modified) (1 diff)
• fibril.h (modified) (2 diffs)
• rtld/dynamic.h (moved) (moved from uspace/srv/loader/include/arch.h ) (1 diff)
• rtld/elf_dyn.h (added)

uspace/lib/c/arch/ia32/include/config.h

@@ -36 +36 @@
 #define LIBC_ia32_CONFIG_H_
 
-#define PAGE_WIDTH      12
-#define PAGE_SIZE       (1 << PAGE_WIDTH)
+#define PAGE_WIDTH  12
+#define PAGE_SIZE   (1 << PAGE_WIDTH)
+
+#define USER_ADDRESS_SPACE_START_ARCH  UINT32_C(0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH    UINT32_C(0x7fffffff)
 
 #endif

uspace/lib/c/arch/ia32/include/ddi.h

@@ -37 +37 @@
 #include <libarch/types.h>
 
-#define IO_SPACE_BOUNDARY       ((void *) (64 * 1024))
+#define IO_SPACE_BOUNDARY  ((void *) (64 * 1024))
 
 static inline uint8_t pio_read_8(ioport8_t *port)

uspace/lib/c/arch/ia32/include/faddr.h

@@ -38 +38 @@
 #include <libarch/types.h>
 
-#define FADDR(fptr)             ((uintptr_t) (fptr))
+#define FADDR(fptr)  ((uintptr_t) (fptr))
 
 #endif

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

@@ -42 +42 @@
  * panic sooner or later
  */
-#define SP_DELTA     (12)
+#define SP_DELTA  12
 
 #define context_set(c, _pc, stack, size, ptls) \
@@ -51 +51 @@
                 (c)->ebp = 0; \
         } while (0)
-        
-/* We include only registers that must be preserved
+
+/*
+ * We include only registers that must be preserved
  * during function call
  */

uspace/lib/c/arch/ia32/include/rtld/dynamic.h

@@ -27 +27 @@
  */
 
-/** @addtogroup fs
+/** @addtogroup generic 
  * @{
  */
 /** @file
- * @brief
  */
 
-#ifndef LOADER_ARCH_H_
-#define LOADER_ARCH_H_
+#ifndef LIBC_ia32_RTLD_DYNAMIC_H_
+#define LIBC_ia32_RTLD_DYNAMIC_H_
 
-extern void program_run(void *entry_point, void *pcb);
+#include <sys/types.h>
+
+typedef struct {
+        /* Empty. */
+} dyn_info_arch_t;
 
 #endif
 
-/**
- * @}
+/** @}
  */