Changeset f2ffad4 in mainline

Timestamp:

2005-05-12T20:37:03Z (20 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.

Files:

• arch/ia32/include/faddr.h (added)
• arch/ia64/Makefile.inc (modified) (2 diffs)
• arch/ia64/include/faddr.h (added)
• arch/mips/include/faddr.h (added)
• src/Makefile (modified) (1 diff)
• src/main/main.c (modified) (3 diffs)
• src/proc/scheduler.c (modified) (2 diffs)
• src/proc/thread.c (modified) (2 diffs)

arch/ia64/Makefile.inc

@@ -8 +8 @@
 LD=$(IA-64_BINUTILS_DIR)/$(IA-64_TARGET)-ld
 
-ASFLAGS=-EL
+ASFLAGS=-mconstant-gp
 
 DEFS=-DARCH=$(ARCH)
 CPPFLAGS=$(DEFS) -nostdinc -I../include
-CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -Wmissing-prototypes -Werror -O3
-LFLAGS=-EL -M -no-check-sections -T ../arch/ia64/_link.ld
+CFLAGS=$(CPPFLAGS) -mconstant-gp -nostdlib -fno-builtin -Wmissing-prototypes -Werror -O3
+LFLAGS=-EL -M -T ../arch/ia64/_link.ld
 
 arch_sources= \
@@ -23 +23 @@
         arch/fpu_context.c \
         arch/context.S 
-        
-

src/Makefile

@@ -77 +77 @@
 
 %.o: %.s
-        $(AS) $< -o $@
+        $(AS) $(ASFLAGS) $< -o $@
 
 %.o: %.c

src/main/main.c

@@ -54 +54 @@
 
 #include <arch.h>
+#include <arch/faddr.h>
 
 char *project = "SPARTAN kernel";
@@ -95 +96 @@
         context_save(&ctx);
         ctx.sp = config.base + config.kernel_size - 8;
-        ctx.pc = (__address) main_bsp_separated_stack;
+        ctx.pc = FADDR(main_bsp_separated_stack);
         context_restore(&ctx);
         /* not reached */
@@ -193 +194 @@
          */
         CPU->saved_context.sp = (__address) &CPU->stack[CPU_STACK_SIZE-8];
-        CPU->saved_context.pc = (__address) main_ap_separated_stack;
+        CPU->saved_context.pc = FADDR(main_ap_separated_stack);
         context_restore(&CPU->saved_context);
         /* not reached */

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];