Changeset f2ffad4 in mainline for src/main/main.c

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.

File:

• src/main/main.c (modified) (3 diffs)

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 */