Changeset f2ffad4 in mainline for src/proc

Timestamp:

2005-05-12T20:37:03Z (21 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

da79d0fd

Parents:

ea3fb2e

Message:

For each architecture, add function/macro FADDR that calculates absolute address of a function referenced by void (* f)(void).
IA-32 and MIPS gcc's use direct addressing (f == FADDR(f)) while IA-64 gcc uses indirect addressing (f != FADDR(f)).

Tweaks in IA-64 Makefile.inc to declare constant gp and main Makefile to consider ASFLAGS when compiling .s targets.

Location:

src/proc

Files:

• scheduler.c (modified) (2 diffs)
• thread.c (modified) (2 diffs)

src/proc/scheduler.c

@@ -42 +42 @@
 #include <mm/page.h>
 #include <synch/spinlock.h>
+#include <arch/faddr.h>
 
 #ifdef __SMP__
@@ -233 +234 @@
         context_save(&CPU->saved_context);
         CPU->saved_context.sp = (__address) &CPU->stack[CPU_STACK_SIZE-8];
-        CPU->saved_context.pc = (__address) scheduler_separated_stack;
+        CPU->saved_context.pc = FADDR(scheduler_separated_stack);
         context_restore(&CPU->saved_context);
         /* not reached */

src/proc/thread.c

@@ -49 +49 @@
 #include <arch/interrupt.h>
 #include <smp/ipi.h>
+#include <arch/faddr.h>
 
 char *thread_states[] = {"Invalid", "Running", "Sleeping", "Ready", "Entering", "Exiting"};
@@ -165 +166 @@
                 
                 context_save(&t->saved_context);
-                t->saved_context.pc = (__address) cushion;
+                t->saved_context.pc = FADDR(cushion);
                 t->saved_context.sp = (__address) &t->kstack[THREAD_STACK_SIZE-8];