Changeset 4928165 in mainline

Timestamp:

2016-05-08T21:18:45Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0637ddb

Parents:

a0d9abcd

Message:

Use symbolic constants instead of magic numbers

• Use PA2KA(0) instead of 0x80000000
• Use CONTEXT_OFFSET_SP instead of silently assuming that SP is at offset 0

Location:

kernel/arch

Files:

• amd64/src/smp/ap.S (modified) (2 diffs)
• ia32/src/smp/ap.S (modified) (3 diffs)

kernel/arch/amd64/src/smp/ap.S

@@ -39 +39 @@
 #include <arch/cpu.h>
 #include <arch/cpuid.h>
+#include <arch/context_struct.h>
 
 .section K_TEXT_START, "ax"
@@ -98 +99 @@
 start64:
         movabsq $ctx, %rsp
-        movq (%rsp), %rsp
+        movq CONTEXT_OFFSET_SP(%rsp), %rsp
         
         pushq $0

kernel/arch/ia32/src/smp/ap.S

@@ -38 +38 @@
 #include <arch/pm.h>
 #include <arch/cpu.h>
+#include <arch/context_struct.h>
 
 .section K_TEXT_START, "ax"
@@ -74 +75 @@
         movw %ax, %es
         movw %ax, %ss
-        movl $KA2PA(ctx), %eax  /* KA2PA((uintptr_t) &ctx) */
-        movl (%eax), %esp
-        subl $0x80000000, %esp  /* KA2PA(ctx.sp) */
+        movl $KA2PA(ctx), %eax  /* KA2PA((uintptr_t) &ctx) */
+        movl CONTEXT_OFFSET_SP(%eax), %esp
+        subl $PA2KA(0), %esp    /* KA2PA(ctx.sp) */
 
         /*
@@ -84 +85 @@
         call map_kernel_pse
         
-        addl $0x80000000, %esp  /*  PA2KA(ctx.sp) */
+        addl $PA2KA(0), %esp    /* PA2KA(ctx.sp) */
         
         /* create the first stack frame */