[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
hurd-l4/libl4 ChangeLog Makefile.am headers.m4 ...
From: |
Marcus Brinkmann |
Subject: |
hurd-l4/libl4 ChangeLog Makefile.am headers.m4 ... |
Date: |
Thu, 18 Sep 2003 18:30:31 -0400 |
CVSROOT: /cvsroot/hurd
Module name: hurd-l4
Branch:
Changes by: Marcus Brinkmann <address@hidden> 03/09/18 18:30:31
Modified files:
libl4 : ChangeLog Makefile.am headers.m4
libl4/l4 : init.h kip.h
Log message:
2003-09-19 Marcus Brinkmann <address@hidden>
* l4/init.h: Include <l4/syscall.h>
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/libl4/ChangeLog.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/libl4/Makefile.am.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/libl4/headers.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/libl4/l4/init.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd-l4/libl4/l4/kip.h.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: hurd-l4/libl4/ChangeLog
diff -u hurd-l4/libl4/ChangeLog:1.13 hurd-l4/libl4/ChangeLog:1.14
--- hurd-l4/libl4/ChangeLog:1.13 Thu Sep 18 17:54:54 2003
+++ hurd-l4/libl4/ChangeLog Thu Sep 18 18:30:30 2003
@@ -1,4 +1,16 @@
+2003-09-19 Marcus Brinkmann <address@hidden>
+
+ * l4/init.h: Include <l4/syscall.h>
+
2003-09-18 Marcus Brinkmann <address@hidden>
+
+ * Makefile.am (nobase_include_HEADERS): Add l4/init.h.
+ * headers.m4: Likewise.
+
+ * l4/kip.h (L4_MIN_PAGE_SIZE): New macro.
+ (l4_memory_desc_high): Return the address of the last byte, not
+ the byte following it, according to 20030912 version of the L4 X.2
+ specification, revision 4.
* l4/types.h (__L4_PRI_PREFIX, L4_PRIdWORD, L4_PRIiWORD,
L4_PRIoWORD, L4_PRIuWORD, L4_PRIxWORD, L4_PRIXWORD, L4_SCNdWORD,
Index: hurd-l4/libl4/Makefile.am
diff -u hurd-l4/libl4/Makefile.am:1.2 hurd-l4/libl4/Makefile.am:1.3
--- hurd-l4/libl4/Makefile.am:1.2 Thu Sep 18 11:46:58 2003
+++ hurd-l4/libl4/Makefile.am Thu Sep 18 18:30:30 2003
@@ -24,7 +24,7 @@
SUBDIRS = $(ARCH_SUBDIR)
include_HEADERS = l4.h
-nobase_include_HEADERS = l4/types.h l4/math.h l4/globals.h \
+nobase_include_HEADERS = l4/types.h l4/math.h l4/globals.h l4/init.h \
l4/vregs.h l4/stubs.h l4/stubs-init.h l4/syscall.h \
l4/kip.h l4/thread.h l4/schedule.h l4/space.h \
l4/ipc.h l4/misc.h
Index: hurd-l4/libl4/headers.m4
diff -u hurd-l4/libl4/headers.m4:1.1 hurd-l4/libl4/headers.m4:1.2
--- hurd-l4/libl4/headers.m4:1.1 Fri Sep 12 14:45:56 2003
+++ hurd-l4/libl4/headers.m4 Thu Sep 18 18:30:30 2003
@@ -13,6 +13,7 @@
AC_CONFIG_LINKS([
include/l4.h:libl4/l4.h
include/l4/globals.h:libl4/l4/globals.h
+ include/l4/init.h:libl4/l4/init.h
include/l4/ipc.h:libl4/l4/ipc.h
include/l4/kip.h:libl4/l4/kip.h
include/l4/math.h:libl4/l4/math.h
Index: hurd-l4/libl4/l4/init.h
diff -u hurd-l4/libl4/l4/init.h:1.1 hurd-l4/libl4/l4/init.h:1.2
--- hurd-l4/libl4/l4/init.h:1.1 Thu Sep 18 16:16:40 2003
+++ hurd-l4/libl4/l4/init.h Thu Sep 18 18:30:31 2003
@@ -23,6 +23,7 @@
#define _L4_INIT_H 1
#include <l4/kip.h>
+#include <l4/syscall.h>
/* Initialize the global data. */
Index: hurd-l4/libl4/l4/kip.h
diff -u hurd-l4/libl4/l4/kip.h:1.5 hurd-l4/libl4/l4/kip.h:1.6
--- hurd-l4/libl4/l4/kip.h:1.5 Thu Sep 18 11:46:58 2003
+++ hurd-l4/libl4/l4/kip.h Thu Sep 18 18:30:31 2003
@@ -352,8 +352,7 @@
{
l4_kern_desc_t kern;
- kern = (l4_kern_desc_t) ((l4_word_t) l4_kip ()
- + l4_kip ()->kern_desc_ptr);
+ kern = (l4_kern_desc_t) ((l4_word_t) l4_kip () + l4_kip ()->kern_desc_ptr);
return kern->id;
}
@@ -364,8 +363,7 @@
{
l4_kern_desc_t kern;
- kern = (l4_kern_desc_t) ((l4_word_t) l4_kip ()
- + l4_kip ()->kern_desc_ptr);
+ kern = (l4_kern_desc_t) ((l4_word_t) l4_kip () + l4_kip ()->kern_desc_ptr);
if (year)
*year = kern->gen_date.year + 2000;
@@ -382,8 +380,7 @@
{
l4_kern_desc_t kern;
- kern = (l4_kern_desc_t) ((l4_word_t) l4_kip ()
- + l4_kip ()->kern_desc_ptr);
+ kern = (l4_kern_desc_t) ((l4_word_t) l4_kip () + l4_kip ()->kern_desc_ptr);
if (ver)
*ver = kern->version.ver;
@@ -400,8 +397,7 @@
{
l4_kern_desc_t kern;
- kern = (l4_kern_desc_t) ((l4_word_t) l4_kip ()
- + l4_kip ()->kern_desc_ptr);
+ kern = (l4_kern_desc_t) ((l4_word_t) l4_kip () + l4_kip ()->kern_desc_ptr);
return kern->supplier;
}
@@ -422,8 +418,7 @@
if (num >= l4_num_processors ())
return (l4_proc_desc_t) 0;
- return (l4_proc_desc_t) ((l4_word_t) l4_kip ()
- + l4_kip ()->proc_desc_ptr)
+ return (l4_proc_desc_t) ((l4_word_t) l4_kip () + l4_kip ()->proc_desc_ptr)
+ num * (1 << l4_kip ()->processor_info.log2_size);
}
@@ -445,6 +440,7 @@
#define L4_MIN_PAGE_SIZE_LOG2 10
+#define L4_MIN_PAGE_SIZE (L4_WORD_C(1) << L4_MIN_PAGE_SIZE_LOG2)
static inline l4_word_t
__attribute__((__always_inline__))
@@ -635,9 +631,8 @@
if (num >= l4_num_memory_desc ())
return (l4_memory_desc_t) 0;
- mem = (l4_memory_desc_t)
- ((l4_word_t) l4_kip ()
- + l4_kip ()->memory_info.mem_desc_ptr);
+ mem = (l4_memory_desc_t) ((l4_word_t) l4_kip ()
+ + l4_kip ()->memory_info.mem_desc_ptr);
return mem + num;
}
@@ -658,19 +653,25 @@
}
+/* Return the address of the first byte of the memory region described
+ by MEM. */
static inline l4_word_t
__attribute__((__always_inline__))
l4_memory_desc_low (l4_memory_desc_t mem)
{
+ /* The lower 10 bits are hard-wired to 0. */
return mem->low << 10;
}
+/* Return the address of the last byte of the memory region described
+ by MEM. */
static inline l4_word_t
__attribute__((__always_inline__))
l4_memory_desc_high (l4_memory_desc_t mem)
{
- return mem->high << 10;
+ /* The lower 10 bits are hard-wired to 1. */
+ return (mem->high << 10) | ((1 << 10) - 1);
}
#endif /* l4/kip.h */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- hurd-l4/libl4 ChangeLog Makefile.am headers.m4 ...,
Marcus Brinkmann <=