AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-10-18 11:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

spirv-dis: Add --color option to force color disassembly

Browse Source 
Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/1170
This commit is contained in:
David Neto 2018-01-17 10:57:20 -05:00
parent 5e70d20d80
commit 3604c0b71d
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/dis/dis.cpp
View File

@ -43,7 +43,9 @@ Options:
Output goes to standard output if this option is
not specified, or if the filename is "-".
--no-color Don't print in color.
--color Force color output. The default when printing to a terminal.
Overrides a previous --no-color option.
--no-color Don't print in color. Overrides a previous --color option.
The default when output goes to something other than a
terminal (e.g. a file, a pipe, or a shell redirection).
@ -64,10 +66,15 @@ int main(int argc, char** argv) {
const char* inFile = nullptr;
const char* outFile = nullptr;
bool allow_color = false;
#ifdef SPIRV_COLOR_TERMINAL
allow_color = true;
bool color_is_possible =
#if SPIRV_COLOR_TERMINAL
true;
#else
false;
#endif
bool force_color = false;
bool force_no_color = false;
bool allow_indent = true;
bool show_byte_offsets = false;
bool no_header = false;
@ -90,7 +97,11 @@ int main(int argc, char** argv) {
case '-': {
// Long options
if (0 == strcmp(argv[argi], "--no-color")) {
allow_color = false;
force_no_color = true;
force_color = false;
} else if (0 == strcmp(argv[argi], "--color")) {
force_no_color = false;
force_color = true;
} else if (0 == strcmp(argv[argi], "--no-indent")) {
allow_indent = false;
} else if (0 == strcmp(argv[argi], "--offsets")) {
@ -148,14 +159,17 @@ int main(int argc, char** argv) {
if (!outFile || (0 == strcmp("-", outFile))) {
// Print to standard output.
options |= SPV_BINARY_TO_TEXT_OPTION_PRINT;
if (color_is_possible && !force_no_color) {
bool output_is_tty = true;
#if defined(_POSIX_VERSION)
output_is_tty = isatty(fileno(stdout));
#endif
if (allow_color && output_is_tty) {
if (output_is_tty || force_color) {
options |= SPV_BINARY_TO_TEXT_OPTION_COLOR;
}
}
}
// Read the input binary.
std::vector<uint32_t> contents;