Changeset 28a5ebd in mainline for kernel/arch/riscv64

Timestamp:

2020-06-18T15:39:50Z (6 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.

Location:

kernel/arch/riscv64

Files:

• include/arch/drivers/ucb.h (modified) (1 diff)
• src/asm.S (modified) (1 diff)
• src/drivers/ucb.c (modified) (2 diffs)

kernel/arch/riscv64/include/arch/drivers/ucb.h

@@ -42 +42 @@
 extern void htif_init(volatile uint64_t *, volatile uint64_t *);
 extern outdev_t *htifout_init(void);
-extern void htif_putwchar(outdev_t *, const wchar_t);
+extern void htif_putuchar(outdev_t *, const char32_t);
 
 #endif

kernel/arch/riscv64/src/asm.S

@@ -35 +35 @@
 FUNCTION_END(asm_delay_loop)
 
-FUNCTION_BEGIN(early_putwchar)
+FUNCTION_BEGIN(early_putuchar)
         ret
-FUNCTION_END(early_putwchar)
+FUNCTION_END(early_putuchar)
 
 FUNCTION_BEGIN(cpu_halt)

kernel/arch/riscv64/src/drivers/ucb.c

@@ -42 +42 @@
 
 static outdev_operations_t htifdev_ops = {
-        .write = htif_putwchar,
+        .write = htif_putuchar,
         .redraw = NULL,
         .scroll_up = NULL,
@@ -85 +85 @@
 }
 
-void htif_putwchar(outdev_t *dev, const wchar_t ch)
+void htif_putuchar(outdev_t *dev, const char32_t ch)
 {
         if (ascii_check(ch))