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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

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

    re2ea4ab1 r09b859c  
    240240                movl $0xb80a0, %esi
    241241                movl $0xb8000, %edi
    242                 movl $1920, %ecx
    243                 rep movsw
     242                movl $960, %ecx
     243                rep movsl
    244244               
    245245                /* Clear the 24th row */
    246246                xorl %eax, %eax
    247                 movl $80, %ecx
    248                 rep stosw
     247                movl $40, %ecx
     248                rep stosl
    249249               
    250250                /* Go to row 24 */
    … …  
    348348                movl $0xb80a0, %esi
    349349                movl $0xb8000, %edi
    350                 movl $1920, %ecx
    351                 rep movsw
     350                movl $960, %ecx
     351                rep movsl
    352352               
    353353                /* Clear the 24th row */
    354354                xorl %eax, %eax
    355                 movl $80, %ecx
    356                 rep stosw
     355                movl $40, %ecx
     356                rep stosl
    357357               
    358358                /* Go to row 24 */
    … …  
    463463                movl $(PA2KA(0xb80a0)), %esi
    464464                movl $(PA2KA(0xb8000)), %edi
    465                 movl $1920, %ecx
    466                 rep movsw
     465                movl $960, %ecx
     466                rep movsl
    467467               
    468468                /* Clear the 24th row */
    469469                xorl %eax, %eax
    470                 movl $80, %ecx
    471                 rep stosw
     470                movl $40, %ecx
     471                rep stosl
    472472               
    473473                /* Go to row 24 */
Note: See TracChangeset for help on using the changeset viewer.