⛏️ index : haiku.git

fed6a37b4f3cc27fb35b49f23b6243e72afef99d [patch]

a62cfb6f4ed5df5bc425f760cbc7b3250bfb46bd

7ae2e6756b1e685220556b715f7595e53a5b9444

fed6a37b4f3cc27fb35b49f23b6243e72afef99d.tar.gz

bootloader console: encode output

EFI wants UCS-2, BIOS uses CP437. Other systems untouched.

As a side effect, the high bits don't spill anymore into other fields.

Fixes: #18016
Change-Id: I704e8b8ab5e2c0d07ebbe033b3313245252ffd5d
Reviewed-on: https://review.haiku-os.org/c/haiku/+/9976
Reviewed-by: waddlesplash <waddlesplash@gmail.com>

Diff

 src/system/boot/platform/bios_ia32/Jamfile     |  1 +
 src/system/boot/platform/bios_ia32/console.cpp | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
 src/system/boot/platform/efi/Jamfile           |  1 +
 src/system/boot/platform/efi/console.cpp       | 44 +++++++++++++++++++++++++++++++++++++++++++-
 src/system/boot/platform/pxe_ia32/Jamfile      |  1 +
 5 files changed, 87 insertions(+), 9 deletions(-)

diff --git a/src/system/boot/platform/bios_ia32/Jamfile b/src/system/boot/platform/bios_ia32/Jamfile
index 36ee833..ca0a16c 100644
--- a/src/system/boot/platform/bios_ia32/Jamfile
+++ b/src/system/boot/platform/bios_ia32/Jamfile
@@ -5,6 +5,7 @@
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders [ FDirName graphics common ] ;
UsePrivateHeaders [ FDirName graphics vesa ] ;
UsePrivateHeaders [ FDirName interface ] ;
UsePrivateHeaders [ FDirName storage ] ;

{
diff --git a/src/system/boot/platform/bios_ia32/console.cpp b/src/system/boot/platform/bios_ia32/console.cpp
index 4abdcd6..fa4497b 100644
--- a/src/system/boot/platform/bios_ia32/console.cpp
+++ b/src/system/boot/platform/bios_ia32/console.cpp
@@ -10,8 +10,10 @@
#include "video.h"

#include <SupportDefs.h>
#include <util/kernel_cpp.h>

#include <boot/stage2.h>
#include <utf8_functions.h>
#include <util/kernel_cpp.h>

#include <string.h>

@@ -80,16 +82,51 @@
	if (gKernelArgs.frame_buffer.enabled)
		return bufferSize;

	for (uint32 i = 0; i < bufferSize; i++) {
		if (string[0] == '\n')
	size_t length = bufferSize;
	while (length > 0) {
		if (string[0] == '\n') {
			sScreenOffset += sScreenWidth - (sScreenOffset % sScreenWidth);
		else
			length--;
			string++;
		} else if ((string[0] & 0x80) == 0) {
			sScreenBase[sScreenOffset++] = sColor | string[0];
			length--;
			string++;
		} else {
			// UTF8ToCharCode expects a NULL-terminated string, which we can't
			// guarantee. UTF8NextCharLen checks the bounds and allows us to
			// know whether we can safely read the next character.
			uint32 codepoint;
			uint32 charLen = UTF8NextCharLen(string, length);
			if (charLen > 0) {
				codepoint = UTF8ToCharCode(&string);
				length -= charLen;
			} else {
				codepoint = 0xfffd;
				string++;
				length--;
			}

			switch (codepoint) {
				case 0x25B2:	// BLACK UP-POINTING TRIANGLE
					sScreenBase[sScreenOffset++] = sColor | 0x1e;
					break;
				case 0x25BC:	// BLACK DOWN-POINTING TRIANGLE
					sScreenBase[sScreenOffset++] = sColor | 0x1f;
					break;
				case 0x2026:	// HORIZONTAL ELLIPSIS
					WriteAt(cookie, -1, "...", 3);
					break;
				case 0x00A9:	// COPYRIGHT SIGN
					WriteAt(cookie, -1, "(C)", 3);
					break;
				default:
					sScreenBase[sScreenOffset++] = sColor | '?';
			}
		}

		if (sScreenOffset >= sScreenWidth * sScreenHeight)
			scroll_up();

		string++;
	}
	return bufferSize;
}
diff --git a/src/system/boot/platform/efi/Jamfile b/src/system/boot/platform/efi/Jamfile
index b77e9b6..909473c 100644
--- a/src/system/boot/platform/efi/Jamfile
+++ b/src/system/boot/platform/efi/Jamfile
@@ -1,6 +1,7 @@
SubDir HAIKU_TOP src system boot platform efi ;

UsePrivateHeaders [ FDirName graphics common ] ;
UsePrivateHeaders [ FDirName interface ] ;
UsePrivateHeaders [ FDirName kernel boot ] ;
UsePrivateHeaders [ FDirName kernel platform ] ;
UsePrivateHeaders [ FDirName kernel boot platform efi ] ;
diff --git a/src/system/boot/platform/efi/console.cpp b/src/system/boot/platform/efi/console.cpp
index e3030e7..cd55232 100644
--- a/src/system/boot/platform/efi/console.cpp
+++ b/src/system/boot/platform/efi/console.cpp
@@ -16,6 +16,7 @@
#include <boot/platform.h>
#include <boot/platform/generic/video.h>
#include <efi/protocol/console-control.h>
#include <utf8_functions.h>
#include <util/kernel_cpp.h>

#include "efi_platform.h"
@@ -82,8 +83,45 @@
	char16_t ucsBuffer[bufferSize + 3];
	uint32 j = 0;

	for (uint32 i = 0; i < bufferSize; i++) {
		switch (string[i]) {
	size_t length = bufferSize;
	while (length > 0) {
		uint32 codepoint;

		// UTF8ToCharCode expects a NULL-terminated string, which we can't
		// guarantee. UTF8NextCharLen checks the bounds and allows us to
		// know whether we can safely read the next character.
		if (string[0] == 0) {
			codepoint = 0;
			string++;
			length--;
		} else {
			uint32 charLen = UTF8NextCharLen(string, length);
			if (charLen > 0) {
				codepoint = UTF8ToCharCode(&string);
				length -= charLen;
			} else {
				codepoint = 0xfffd;
				string++;
				length--;
			}
		}

		if (codepoint > 0xffff) {
			codepoint = 0xfffd;	// REPLACEMENT CHARACTER
		} else if (codepoint < 0x20) {
			// Per the spec, only NUL, BS, TAB, LF and CR are allowed in the
			// control codes region for output strings. Assume something used
			// legacy BIOS encoding if we get one of the others.
			static const uint16 controlCodes[] = {
				0x0000, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022,
				0x0008, 0x0009, 0x000A, 0x2642, 0x2640, 0x000D, 0x266B, 0x263C,
				0x25BA, 0x25C4, 0x2195, 0x203C, 0x00B6, 0x00A7, 0x25AC, 0x21A8,
				0x2191, 0x2193, 0x2192, 0x2190, 0x221F, 0x2194, 0x25B2, 0x25BC
			};
			codepoint = controlCodes[codepoint];
		}

		switch (codepoint) {
			case '\n': {
				ucsBuffer[j++] = '\r';
				ucsBuffer[j++] = '\n';
@@ -98,7 +136,7 @@
				continue;
			}
			default:
				ucsBuffer[j++] = (char16_t)string[i];
				ucsBuffer[j++] = codepoint;
		}
	}

diff --git a/src/system/boot/platform/pxe_ia32/Jamfile b/src/system/boot/platform/pxe_ia32/Jamfile
index bb6a9b5..49ce6b7 100644
--- a/src/system/boot/platform/pxe_ia32/Jamfile
+++ b/src/system/boot/platform/pxe_ia32/Jamfile
@@ -7,6 +7,7 @@
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders [ FDirName graphics common ] ;
UsePrivateHeaders [ FDirName graphics vesa ] ;
UsePrivateHeaders [ FDirName interface ] ;
UsePrivateHeaders [ FDirName storage ] ;

{