Changeset 09b859c in mainline for kernel/arch/amd64/src/asm.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/asm.S (modified) (5 diffs)

kernel/arch/amd64/src/asm.S

@@ -347 +347 @@
  * Since the EGA can only display Extended ASCII (usually
  * ISO Latin 1) characters, some of the Unicode characters
- * can be displayed in a wrong way. Only the newline character
- * is interpreted, all other characters (even unprintable) are
+ * can be displayed in a wrong way. Only newline and backspace
+ * are interpreted, all other characters (even unprintable) are
  * printed verbatim.
  *
@@ -399 +399 @@
         
         cmp $0x0a, %al
-        jne early_putchar_print
+        jne early_putchar_backspace
         
                 /* Interpret newline */
@@ -413 +413 @@
                 subw %dx, %bx
                 
-                jmp early_putchar_newline
+                jmp early_putchar_skip
+        
+        early_putchar_backspace:
+        
+                cmp $0x08, %al
+                jne early_putchar_print
+                
+                /* Interpret backspace */
+                
+                cmp $0x0000, %bx
+                je early_putchar_skip
+                
+                dec %bx
+                jmp early_putchar_skip
         
         early_putchar_print:
@@ -423 +436 @@
                 inc %bx
         
-        early_putchar_newline:
+        early_putchar_skip:
         
         /* Sanity check for the cursor on the last line */
@@ -432 +445 @@
                 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 */