GerbilSoft/rom-properties
1
Fork 0
mirror of https://github.com/GerbilSoft/rom-properties.git synced 2025-06-18 11:35:38 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[rpcli] vt.cpp, win32_console_print_ansi_color(): Convert the if/else block to switch/case.
Some checks failed
Codecov / run (push) Has been cancelled
Details

Browse Source 
gcc is able to optimize the if/else block into a jump table, but MSVC
gets confused and fails to optimize it. Converting to switch/case
allows both compilers to optimize it using a jump table.

The gcc version might be slightly bigger now due to explicitly stating
the 30-37 and 40-47 cases instead of checking ranges, but it might be
slightly faster due to not having to check ranges and instead simply
jumping to the correct case.
This commit is contained in:
David Korth 2025-04-24 01:53:04 -04:00
parent 4a1287da34
commit 2934ccd46a
1 changed files with 54 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/rpcli/vt.cpp
View File

@ -347,46 +347,60 @@ seq_loop:
}
// Check the number.
if (num == 0) {
// Reset
wAttributes = ci_stdout.wAttributesOrig;
} else if (num == 1) {
// Bold
wAttributes |= FOREGROUND_INTENSITY;
} else if (num == 4) {
// Underline
// NOTE: Works on Windows 10; does not work on Windows 7.
wAttributes |= COMMON_LVB_UNDERSCORE;
} else if (num == 7) {
// Reverse video
// NOTE: Works on Windows 10; does not work on Windows 7.
wAttributes |= COMMON_LVB_REVERSE_VIDEO;
} else if (num == 22) {
// Normal intensity
wAttributes &= ~FOREGROUND_INTENSITY;
} else if (num == 27) {
// Not-reverse video
// NOTE: Works on Windows 10; does not work on Windows 7.
wAttributes &= ~COMMON_LVB_REVERSE_VIDEO;
} else if (num >= 30 && num <= 37) {
// Foreground color
wAttributes &= ~0x0007;
wAttributes |= color_map[num - 30];
} else if (num == 39) {
// Default foreground color
wAttributes &= ~0x0007;
wAttributes |= (ci_stdout.wAttributesOrig & 0x0007);
} else if (num >= 40 && num <= 47) {
// Background color
wAttributes &= ~0x0070;
wAttributes |= (color_map[num - 40] << 4);
} else if (num == 49) {
// Default background color
wAttributes &= ~0x0070;
wAttributes |= (ci_stdout.wAttributesOrig & 0x0070);
} else {
// Not a valid number.
// Ignore it and keep processing.
switch (num) {
case 0:
// Reset
wAttributes = ci_stdout.wAttributesOrig;
break;
case 1:
// Bold
wAttributes |= FOREGROUND_INTENSITY;
break;
case 4:
// Underline
// NOTE: Works on Windows 10; does not work on Windows 7.
wAttributes |= COMMON_LVB_UNDERSCORE;
break;
case 7:
// Reverse video
// NOTE: Works on Windows 10; does not work on Windows 7.
wAttributes |= COMMON_LVB_REVERSE_VIDEO;
break;
case 22:
// Normal intensity
wAttributes &= ~FOREGROUND_INTENSITY;
break;
case 27:
// Not-reverse video
// NOTE: Works on Windows 10; does not work on Windows 7.
wAttributes &= ~COMMON_LVB_REVERSE_VIDEO;
break;
case 30: case 31: case 32: case 33:
case 34: case 35: case 36: case 37:
// Foreground color
wAttributes &= ~0x0007;
wAttributes |= color_map[num - 30];
break;
case 39:
// Default foreground color
wAttributes &= ~0x0007;
wAttributes |= (ci_stdout.wAttributesOrig & 0x0007);
break;
case 40: case 41: case 42: case 43:
case 44: case 45: case 46: case 47:
// Background color
wAttributes &= ~0x0070;
wAttributes |= (color_map[num - 40] << 4);
break;
case 49:
// Default background color
wAttributes &= ~0x0070;
wAttributes |= (ci_stdout.wAttributesOrig & 0x0070);
break;
default:
// Not a valid number.
// Ignore it and keep processing.
break;
}
// Is this a separator or the end of the sequence?