Changeset ec8b0dac in mainline

Timestamp:

2009-07-11T15:14:56Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4b2c458c

Parents:

4c467ee

Message:

Things are much easier when the compiler knows that context_save() returns twice.

Files:

• kernel/generic/include/context.h (modified) (1 diff)
• uspace/lib/libc/generic/fibril.c (modified) (1 diff)
• uspace/lib/libc/include/fibril.h (modified) (1 diff)

kernel/generic/include/context.h

@@ -46 +46 @@
 #endif /* context_set */
 
-extern int context_save_arch(context_t *c);
+extern int context_save_arch(context_t *c) __attribute__ ((returns_twice));
 extern void context_restore_arch(context_t *c) __attribute__ ((noreturn));
 

uspace/lib/libc/generic/fibril.c

@@ -166 +166 @@
                 /* Save current state */
                 if (!context_save(&srcf->ctx)) {
-                        /*
-                         * Make sure to reload srcf with the current fibril
-                         * address. Its value may be invalid after
-                         * contex_restore() due to e.g. register recycling.
-                         */
-                        srcf = __tcb_get()->fibril_data;
                         if (serialization_count)
                                 srcf->flags &= ~FIBRIL_SERIALIZED;

uspace/lib/libc/include/fibril.h

@@ -76 +76 @@
 #define fibril_local __thread
 
-extern int context_save(context_t *c);
+extern int context_save(context_t *c) __attribute__ ((returns_twice));
 extern void context_restore(context_t *c) __attribute__ ((noreturn));