Changeset 28a5ebd in mainline for kernel/arch/amd64/src/asm.S

Timestamp:

2020-06-18T15:39:50Z (5 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ce52c333

Parents:

4f663f3e

Message:

Use char32_t instead of wchat_t to represent UTF-32 strings

The intention of the native HelenOS string API has been always to
support Unicode in the UTF-8 and UTF-32 encodings as the sole character
representations and ignore the obsolete mess of older single-byte and
multibyte character encodings. Before C11, the wchar_t type has been
slightly misused for the purpose of the UTF-32 strings. The newer
char32_t type is obviously a much more suitable option. The standard
defines char32_t as uint_least32_t, thus we can take the liberty to fix
it to uint32_t.

To maintain compatilibity with the C Standard, the putwchar(wchar_t)
functions has been replaced by our custom putuchar(char32_t) functions
where appropriate.

File:

• kernel/arch/amd64/src/asm.S (modified) (7 diffs)

kernel/arch/amd64/src/asm.S

@@ -409 +409 @@
  *
  */
-FUNCTION_BEGIN(early_putwchar)
+FUNCTION_BEGIN(early_putuchar)
 
 #if (defined(CONFIG_L4RE_UVMM_EARLY_PRINT))
@@ -447 +447 @@
         /* Sanity check for the cursor on screen */
         cmp $2000, %ax
-        jb early_putwchar_cursor_ok
+        jb early_putuchar_cursor_ok
 
                 movw $1998, %ax
 
-        early_putwchar_cursor_ok:
+        early_putuchar_cursor_ok:
 
         movw %ax, %bx
@@ -460 +460 @@
 
         cmp $0x0a, %al
-        jne early_putwchar_backspace
+        jne early_putuchar_backspace
 
                 /* Interpret newline */
@@ -474 +474 @@
                 subw %dx, %bx
 
-                jmp early_putwchar_skip
-
-        early_putwchar_backspace:
+                jmp early_putuchar_skip
+
+        early_putuchar_backspace:
 
                 cmp $0x08, %al
-                jne early_putwchar_print
+                jne early_putuchar_print
 
                 /* Interpret backspace */
 
                 cmp $0x0000, %bx
-                je early_putwchar_skip
+                je early_putuchar_skip
 
                 dec %bx
-                jmp early_putwchar_skip
-
-        early_putwchar_print:
+                jmp early_putuchar_skip
+
+        early_putuchar_print:
 
                 /* Print character */
@@ -497 +497 @@
                 inc %bx
 
-        early_putwchar_skip:
+        early_putuchar_skip:
 
         /* Sanity check for the cursor on the last line */
         cmp $2000, %bx
-        jb early_putwchar_no_scroll
+        jb early_putuchar_no_scroll
 
                 /* Scroll the screen (24 rows) */
@@ -517 +517 @@
                 movw $1920, %bx
 
-        early_putwchar_no_scroll:
+        early_putuchar_no_scroll:
 
         /* Write bits 8 - 15 of the cursor address */
@@ -544 +544 @@
 
         ret
-FUNCTION_END(early_putwchar)
+FUNCTION_END(early_putuchar)