Changeset 90f067d9 in mainline

Timestamp:

2012-04-13T07:41:22Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a7a7f8c

Parents:

9b0a6b4

Message:

Add filtering of ANSI escape sequences to msim

Location:

uspace/app/msim

Files:

• helenos.c (modified) (3 diffs)
• helenos_input.c (modified) (2 diffs)

uspace/app/msim/helenos.c

@@ -34 +34 @@
 #include "io/input.h"
 #include "io/output.h"
+#include "device/dprinter.h"
 #include "debug/gdb.h"
 #include "cmd.h"
@@ -40 +41 @@
 #include <str.h>
 #include <malloc.h>
+#include <ctype.h>
+#include <stdio.h>
+
+/* Define when the dprinter device shall try to filter
+ * out ANSI escape sequences.
+ */
+#define IGNORE_ANSI_ESCAPE_SEQUENCES
 
 extern char *input_helenos_get_next_command(void);
@@ -87 +95 @@
 
 
+char *input_helenos_get_next_command(void);
+
+static void (*original_printer_write)(cpu_t *, device_s *, ptr_t, uint32_t);
+static void helenos_printer_write(cpu_t *cpu, device_s *dev, ptr_t addr, uint32_t val)
+{
+#ifdef IGNORE_ANSI_ESCAPE_SEQUENCES
+        static bool inside_ansi_escape = false;
+        static bool just_ended_ansi_escape = false;
+
+        if (inside_ansi_escape) {
+                fprintf(stderr, "%02" PRIx32 "'%c' ", val, val >= 32 ? val : '?');
+                if (isalpha((int) val)) {
+                        just_ended_ansi_escape = true;
+                        inside_ansi_escape = false;
+                        fprintf(stderr, " [END]\n");
+                }
+
+                return;
+        }
+
+        if (val == 0x1B) {
+                inside_ansi_escape = true;
+
+                if (!just_ended_ansi_escape) {
+                        fprintf(stderr, "\n");
+                }
+                fprintf(stderr, "ESC sequence: ");
+
+                return;
+        }
+
+        just_ended_ansi_escape = false;
+#endif
+
+        (*original_printer_write)(cpu, dev, addr, val);
+}
+
+void helenos_dprinter_init(void)
+{
+        original_printer_write = dprinter.write;
+        dprinter.write = helenos_printer_write;
+}
+
+

uspace/app/msim/helenos_input.c

@@ -41 +41 @@
 
 char *input_helenos_get_next_command(void);
+void helenos_dprinter_init(void);
 
 /** Terminal and readline initialization
@@ -51 +52 @@
                 die(1, "Failed to intialize input.");
         }
+        helenos_dprinter_init();
 }