Add help dialog to Blinkenlights emulator

tool/build/lib/debug.c

@@ -18,6 +18,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
 #include "libc/calls/struct/stat.h"
+#include "libc/elf/elf.h"
 #include "libc/log/check.h"
 #include "libc/runtime/gc.h"
 #include "libc/sysv/consts/map.h"
@@ -28,13 +29,15 @@
 
 void LoadDebugSymbols(struct Elf *elf) {
   int fd;
+  size_t n;
   void *elfmap;
   struct stat st;
   const char *path;
-  if (elf->ehdr) return;
+  if (elf->ehdr && GetElfSymbolTable(elf->ehdr, elf->size, &n) && n) return;
   DCHECK_NOTNULL(elf->prog);
+  fprintf(stderr, "HI %s\n", elf->prog);
   if ((fd = open(gc(xstrcat(elf->prog, ".dbg")), O_RDONLY)) != -1 ||
-      (fd = open(elf->prog, O_RDONLY))) {
+      (fd = open(elf->prog, O_RDONLY)) != -1) {
     if (fstat(fd, &st) != -1 &&
         (elfmap = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0)) !=
             MAP_FAILED) {

tool/build/lib/diself.c

@@ -203,5 +203,5 @@ void DisLoadElf(struct Dis *d, struct Elf *elf) {
   DisLoadElfLoads(d, elf);
   DisLoadElfSyms(d, elf);
   DisSortSyms(d);
-  DisCanonizeSyms(d);
+  /* DisCanonizeSyms(d); */
 }

tool/build/lib/lines.c

@@ -0,0 +1,54 @@
+/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
+│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2021 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ Permission to use, copy, modify, and/or distribute this software for         │
+│ any purpose with or without fee is hereby granted, provided that the         │
+│ above copyright notice and this permission notice appear in all copies.      │
+│                                                                              │
+│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
+│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
+│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
+│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
+│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
+│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
+│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
+│ PERFORMANCE OF THIS SOFTWARE.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/mem/mem.h"
+#include "libc/str/str.h"
+#include "tool/build/lib/lines.h"
+
+struct Lines *NewLines(void) {
+  return calloc(1, sizeof(struct Lines));
+}
+
+void FreeLines(struct Lines *lines) {
+  size_t i;
+  for (i = 0; i < lines->n; ++i) {
+    free(lines->p[i]);
+  }
+  free(lines);
+}
+
+void AppendLine(struct Lines *lines, const char *s, size_t n) {
+  lines->p = realloc(lines->p, ++lines->n * sizeof(*lines->p));
+  lines->p[lines->n - 1] = strndup(s, n);
+}
+
+void AppendLines(struct Lines *lines, const char *s) {
+  const char *p;
+  for (;;) {
+    p = strchr(s, '\n');
+    if (p) {
+      AppendLine(lines, s, p - s);
+      s = p + 1;
+    } else {
+      if (*s) {
+        AppendLine(lines, s, -1);
+      }
+      break;
+    }
+  }
+}

tool/build/lib/lines.h

@@ -0,0 +1,18 @@
+#ifndef COSMOPOLITAN_TOOL_BUILD_LIB_LINES_H_
+#define COSMOPOLITAN_TOOL_BUILD_LIB_LINES_H_
+#if !(__ASSEMBLER__ + __LINKER__ + 0)
+COSMOPOLITAN_C_START_
+
+struct Lines {
+  size_t n;
+  char **p;
+};
+
+struct Lines *NewLines(void);
+void FreeLines(struct Lines *);
+void AppendLine(struct Lines *, const char *, size_t);
+void AppendLines(struct Lines *, const char *);
+
+COSMOPOLITAN_C_END_
+#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
+#endif /* COSMOPOLITAN_TOOL_BUILD_LIB_LINES_H_ */

tool/build/lib/loader.c

@@ -140,7 +140,7 @@ void LoadProgram(struct Machine *m, const char *prog, char **args, char **vars,
   size_t i, mappedsize;
   DCHECK_NOTNULL(prog);
   elf->prog = prog;
-  if ((fd = open(prog, O_RDWR)) == -1 ||
+  if ((fd = open(prog, O_RDONLY)) == -1 ||
       (fstat(fd, &st) == -1 || !st.st_size)) {
     fputs(prog, stderr);
     fputs(": not found\n", stderr);

tool/build/lib/message.c

@@ -17,30 +17,51 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/log/check.h"
+#include "libc/macros.h"
 #include "libc/math.h"
 #include "libc/mem/mem.h"
 #include "libc/str/str.h"
+#include "libc/unicode/unicode.h"
 #include "tool/build/lib/buffer.h"
+#include "tool/build/lib/lines.h"
 #include "tool/build/lib/panel.h"
 
+static int GetWidthOfLongestLine(struct Lines *lines) {
+  int i, w, m;
+  for (m = i = 0; i < lines->n; ++i) {
+    w = strwidth(lines->p[i], 0);
+    m = MAX(m, w);
+  }
+  return m;
+}
+
 void PrintMessageBox(int fd, const char *msg, long tyn, long txn) {
-  char buf[1];
   struct Buffer b;
   int i, w, h, x, y;
-  h = 2 + 1 + 2;
-  w = 3 + strlen(msg) + 3;
+  struct Lines *lines;
+  lines = NewLines();
+  AppendLines(lines, msg);
+  h = 3 + lines->n + 3;
+  w = 4 + GetWidthOfLongestLine(lines) + 4;
   x = lrint(txn / 2. - w / 2.);
   y = lrint(tyn / 2. - h / 2.);
   memset(&b, 0, sizeof(b));
-  AppendFmt(&b, "\e[%d;%dH╔", y++, x);
-  for (i = 0; i < w - 2; ++i) AppendStr(&b, "═");
-  AppendStr(&b, "╗");
-  AppendFmt(&b, "\e[%d;%dH║  %-*s  ║", y++, x, w - 6, "");
-  AppendFmt(&b, "\e[%d;%dH║  %-*s  ║", y++, x, w - 6, msg);
-  AppendFmt(&b, "\e[%d;%dH║  %-*s  ║", y++, x, w - 6, "");
-  AppendFmt(&b, "\e[%d;%dH╚", y++, x);
-  for (i = 0; i < w - 2; ++i) AppendStr(&b, "═");
-  AppendStr(&b, "╝");
+  AppendFmt(&b, "\e[%d;%dH", y++, x);
+  for (i = 0; i < w; ++i) AppendStr(&b, " ");
+  AppendFmt(&b, "\e[%d;%dH ╔", y++, x);
+  for (i = 0; i < w - 4; ++i) AppendStr(&b, "═");
+  AppendStr(&b, "╗ ");
+  AppendFmt(&b, "\e[%d;%dH ║  %-*s  ║ ", y++, x, w - 8, "");
+  for (i = 0; i < lines->n; ++i) {
+    AppendFmt(&b, "\e[%d;%dH ║  %-*s  ║ ", y++, x, w - 8, lines->p[i]);
+  }
+  FreeLines(lines);
+  AppendFmt(&b, "\e[%d;%dH ║  %-*s  ║ ", y++, x, w - 8, "");
+  AppendFmt(&b, "\e[%d;%dH ╚", y++, x);
+  for (i = 0; i < w - 4; ++i) AppendStr(&b, "═");
+  AppendStr(&b, "╝ ");
+  AppendFmt(&b, "\e[%d;%dH", y++, x);
+  for (i = 0; i < w; ++i) AppendStr(&b, " ");
   CHECK_NE(-1, WriteBuffer(&b, fd));
   free(b.p);
 }