Changeset 0637ddb in mainline

Timestamp:

2016-05-09T07:33:15Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fa9f8ad

Parents:

4928165

Message:

Use PAGE_SIZE and KA2PA() instead of numeric constants

Location:

kernel/arch/ia32/src

Files:

• boot/multiboot.S (modified) (4 diffs)
• smp/ap.S (modified) (2 diffs)

kernel/arch/ia32/src/boot/multiboot.S

@@ -221 +221 @@
                 
                 /* Align address down to 4k */
-                andl $(~4095), %esi
+                andl $(~(PAGE_SIZE - 1)), %esi
                 
         use_kernel_end:
                 
                 /* Align address to 4k */
-                addl $4095, %esi
-                andl $(~4095), %esi
+                addl $(PAGE_SIZE - 1), %esi
+                andl $(~(PAGE_SIZE - 1)), %esi
                 
                 /* Allocate space for page tables */
                 movl %esi, pt_loc
-                movl $ballocs, %edi
-                andl $0x7fffffff, %edi
+                movl $KA2PA(ballocs), %edi
                 
                 movl %esi, (%edi)
@@ -246 +245 @@
                         orl %ebx, %eax
                         movl %eax, (%esi, %ecx, 4)
-                        addl $(4 * 1024), %ebx
+                        addl $PAGE_SIZE, %ebx
                         
                         incl %ecx
@@ -268 +267 @@
                         /* Mapping 0x80000000 + %ecx * 4M => 0x00000000 + %ecx * 4M */
                         movl %eax, (%edi, %ecx, 4)
-                        addl $(4 * 1024), %ebx
+                        addl $PAGE_SIZE, %ebx
                         
                         incl %ecx
@@ -286 +285 @@
 /** Calculate unmapped address of the end of the kernel. */
 calc_kernel_end:
-        movl $hardcoded_load_address, %edi
-        andl $0x7fffffff, %edi
+        movl $KA2PA(hardcoded_load_address), %edi
         movl (%edi), %esi
-        andl $0x7fffffff, %esi
-        
-        movl $hardcoded_ktext_size, %edi
-        andl $0x7fffffff, %edi
+        leal KA2PA(0)(%esi), %esi
+        
+        movl $KA2PA(hardcoded_ktext_size), %edi
         addl (%edi), %esi
-        andl $0x7fffffff, %esi
-        
-        movl $hardcoded_kdata_size, %edi
-        andl $0x7fffffff, %edi
+        leal KA2PA(0)(%esi), %esi
+        
+        movl $KA2PA(hardcoded_kdata_size), %edi
         addl (%edi), %esi
-        andl $0x7fffffff, %esi
+        leal KA2PA(0)(%esi), %esi
         movl %esi, kernel_end
         

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

@@ -75 +75 @@
         movw %ax, %es
         movw %ax, %ss
-        movl $KA2PA(ctx), %eax  /* KA2PA((uintptr_t) &ctx) */
+        movl $KA2PA(ctx), %eax          /* KA2PA((uintptr_t) &ctx) */
         movl CONTEXT_OFFSET_SP(%eax), %esp
-        subl $PA2KA(0), %esp    /* KA2PA(ctx.sp) */
+        leal KA2PA(0)(%esp), %esp       /* KA2PA(ctx.sp) */
 
         /*
@@ -85 +85 @@
         call map_kernel_pse
         
-        addl $PA2KA(0), %esp    /* PA2KA(ctx.sp) */
+        addl $PA2KA(0), %esp            /* PA2KA(ctx.sp) */
         
         /* create the first stack frame */