Changeset 28a5ebd in mainline for kernel/generic/src/console/console.c

Timestamp:

2020-06-18T15:39:50Z (4 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/generic/src/console/console.c (modified) (10 diffs)

kernel/generic/src/console/console.c

@@ -59 +59 @@
 
 #define KIO_PAGES    8
-#define KIO_LENGTH   (KIO_PAGES * PAGE_SIZE / sizeof(wchar_t))
+#define KIO_LENGTH   (KIO_PAGES * PAGE_SIZE / sizeof(char32_t))
 
 /** Kernel log cyclic buffer */
-wchar_t kio[KIO_LENGTH] __attribute__((aligned(PAGE_SIZE)));
+char32_t kio[KIO_LENGTH] __attribute__((aligned(PAGE_SIZE)));
 
 /** Kernel log initialized */
@@ -95 +95 @@
 };
 
-static void stdout_write(outdev_t *, wchar_t);
+static void stdout_write(outdev_t *, char32_t);
 static void stdout_redraw(outdev_t *);
 static void stdout_scroll_up(outdev_t *);
@@ -148 +148 @@
 }
 
-static void stdout_write(outdev_t *dev, wchar_t ch)
+static void stdout_write(outdev_t *dev, char32_t ch)
 {
         list_foreach(dev->list, link, outdev_t, sink) {
@@ -261 +261 @@
         buf[offset] = 0;
 
-        wchar_t ch;
+        char32_t ch;
         while ((ch = indev_pop_character(indev)) != '\n') {
                 if (ch == '\b') {
                         if (count > 0) {
                                 /* Space, backspace, space */
-                                putwchar('\b');
-                                putwchar(' ');
-                                putwchar('\b');
+                                putuchar('\b');
+                                putuchar(' ');
+                                putuchar('\b');
 
                                 count--;
@@ -277 +277 @@
 
                 if (chr_encode(ch, buf, &offset, buflen - 1) == EOK) {
-                        putwchar(ch);
+                        putuchar(ch);
                         count++;
                         buf[offset] = 0;
@@ -287 +287 @@
 
 /** Get character from input device & echo it to screen */
-wchar_t getc(indev_t *indev)
-{
-        wchar_t ch = indev_pop_character(indev);
-        putwchar(ch);
+char32_t getc(indev_t *indev)
+{
+        char32_t ch = indev_pop_character(indev);
+        putuchar(ch);
         return ch;
 }
@@ -324 +324 @@
         /* Print characters that weren't printed earlier */
         while (kio_stored > 0) {
-                wchar_t tmp = kio[(kio_start + kio_len - kio_stored) % KIO_LENGTH];
+                char32_t tmp = kio[(kio_start + kio_len - kio_stored) % KIO_LENGTH];
                 kio_stored--;
 
@@ -344 +344 @@
  * The caller is required to hold kio_lock
  */
-void kio_push_char(const wchar_t ch)
+void kio_push_char(const char32_t ch)
 {
         kio[(kio_start + kio_len) % KIO_LENGTH] = ch;
@@ -360 +360 @@
 }
 
-void putwchar(const wchar_t ch)
+void putuchar(const char32_t ch)
 {
         bool ordy = ((stdout) && (stdout->op->write));
@@ -377 +377 @@
                  * for possible future output.
                  *
-                 * The early_putwchar() function is used to output
+                 * The early_putuchar() function is used to output
                  * the character for low-level debugging purposes.
                  * Note that the early_putc() function might be
                  * a no-op on certain hardware configurations.
                  */
-                early_putwchar(ch);
+                early_putuchar(ch);
         }