Changeset 09b859c in mainline for kernel/arch/amd64/src/boot/boot.S

Timestamp:

2010-07-07T18:37:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

77385fe

Parents:

e2ea4ab1 (diff), 22c3444 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from mainline.

File:

• kernel/arch/amd64/src/boot/boot.S (modified) (4 diffs)

kernel/arch/amd64/src/boot/boot.S

@@ -247 +247 @@
                 movl $0xb80a0, %esi
                 movl $0xb8000, %edi
-                movl $1920, %ecx
-                rep movsw
+                movl $960, %ecx
+                rep movsl
                 
                 /* Clear the 24th row */
                 xorl %eax, %eax
-                movl $80, %ecx
-                rep stosw
+                movl $40, %ecx
+                rep stosl
                 
                 /* Go to row 24 */
@@ -357 +357 @@
                 movl $0xb80a0, %esi
                 movl $0xb8000, %edi
-                movl $1920, %ecx
-                rep movsw
+                movl $960, %ecx
+                rep movsl
                 
                 /* Clear the 24th row */
                 xorl %eax, %eax
-                movl $80, %ecx
-                rep stosw
+                movl $40, %ecx
+                rep stosl
                 
                 /* Go to row 24 */
@@ -516 +516 @@
                 movq $(PA2KA(0xb80a0)), %rsi
                 movq $(PA2KA(0xb8000)), %rdi
-                movq $1920, %rcx
-                rep movsw
+                movq $480, %rcx
+                rep movsq
                 
                 /* Clear the 24th row */
                 xorq %rax, %rax
-                movq $80, %rcx
-                rep stosw
+                movq $20, %rcx
+                rep stosq
                 
                 /* Go to row 24 */
@@ -605 +605 @@
 .align 4096
 ptl_2_4g:
-        ptl2gen 512 3
+        ptl2gen 512 4
 
 /* Page table for pages in the 6th gigabyte. */
 .align 4096
 ptl_2_5g:
-        ptl2gen 512 3
+        ptl2gen 512 5
 
 /* Page table for pages in the 7th gigabyte. */
 .align 4096
 ptl_2_6g:
-        ptl2gen 512 3
+        ptl2gen 512 6
 
 /* Page table for pages in the 8th gigabyte. */
 .align 4096
 ptl_2_7g:
-        ptl2gen 512 3
+        ptl2gen 512 7
 
 .align 4096