BMDebug: more logging around loading source files.

Author: compuphase

README.md

@@ -1,6 +1,6 @@
 # Embedded Debugging with the Black Magic Probe
 <img src="https://github.com/compuphase/Black-Magic-Probe-Book/blob/master/doc/blackmagicprobe-book.jpg" alt="Book cover" width="400" align="right">
-This guide covers setting up and using the <a href="https://github.com/blackmagic-debug/blackmagic/">Black Magic Probe</a>. The Black Magic Probe is a low cost JTAG/SWD probe for ARM Cortex micro-controllers. A distinguishing feature of the Black Magic Probe is that it embeds a GDB server. As a result, the 
+This guide covers setting up and using the <a href="https://github.com/blackmagic-debug/blackmagic/">Black Magic Probe</a>. The Black Magic Probe is a low cost JTAG/SWD probe for ARM Cortex micro-controllers. A distinguishing feature of the Black Magic Probe is that it embeds a GDB server. As a result, the
     libbsd-dev
     libfontconfig-dev
     libgtk-3-dev
@@ -80,12 +80,5 @@ To generate the `.res` files, use MingW's `windres` function as follows:
 ```
 windres -O coff -J rc -i file.rc -o file.res
 ```
-
-You'll also need to install fontconfig with:
-
-```
-pacman -S mingw-w64-x86_64-fontconfig
-```
-
 ### Windows with Visual C/C++
 The makefile for Visual C/C++ (`Makefile.msvc`) uses Microsoft's `nmake`, which is a bare-bones `make` clone.

source/bmdebug.c

@@ -1529,7 +1529,7 @@ static bool sourcefile_disassemble(const char *path, const SOURCEFILE *source, A
  *                    OS-specific format). This parameter may be NULL (in which
  *                    case the path is assumed the same as the base name).
  */
-static void sources_add(int srcindex, const char *filename, const char *filepath)
+static bool sources_add(int srcindex, const char *filename, const char *filepath, bool debugmode)
 {
   assert(filename != NULL);
 
@@ -1557,7 +1557,9 @@ static void sources_add(int srcindex, const char *filename, const char *filepath
           src->srcindex[src->srccount] = srcindex;
           src->srccount += 1;
         }
-        return;
+        if (debugmode)
+          printf("exists, mapped to index %d\n", src->srcindex[0]);
+        return true;
       }
     }
   }
@@ -1590,12 +1592,18 @@ static void sources_add(int srcindex, const char *filename, const char *filepath
   /* load the source file */
   const char *path = (newsrc->path != NULL) ? newsrc->path : newsrc->basename;
   FILE *fp = fopen(path, "rt");
-  if (fp != NULL) {
-    sourcefile_load(fp, &newsrc->root);
-    fclose(fp);
-    /* get it's timestamp too */
-    newsrc->timestamp = file_timestamp(path);
+  if (fp == NULL) {
+    if (debugmode)
+      printf("file open failed, error %d\n", errno);
+    return false;
   }
+  sourcefile_load(fp, &newsrc->root);
+  fclose(fp);
+  if (debugmode)
+    printf("loaded\n");
+  /* get it's timestamp too */
+  newsrc->timestamp = file_timestamp(path);
+  return true;
 }
 
 /** sources_clear() removes all source files from the sources lists, and
@@ -1625,7 +1633,7 @@ static void sources_clear(bool free_sym)
   }
 }
 
-static void sources_parse(const char *gdbresult)
+static bool sources_parse(const char *gdbresult, bool debugmode)
 {
   const char *head = gdbresult;
   if (*head == '^')
@@ -1635,7 +1643,7 @@ static void sources_parse(const char *gdbresult)
   if (*head == ',')
     head++;
   if (strncmp(head, "files=", 6) != 0)
-    return;
+    return false;
 
   int fileidx = 0;
   assert(head[6] == '[');
@@ -1683,13 +1691,16 @@ static void sources_parse(const char *gdbresult)
     const char *basename;
     for (basename = name + strlen(name) - 1; basename > name && *(basename -1 ) != '/' && *(basename -1 ) != '\\'; basename--)
       {}
-    sources_add(fileidx, basename, path);
+    if (debugmode)
+      printf("SRC: %d: %s [%s] ", fileidx, basename, path);
+    sources_add(fileidx, basename, path, debugmode);
     fileidx++;
     head = sep + 1;
     assert(*head == ',' || *head == ']');
     if (*head == ',')
-        head++;
+      head++;
   }
+  return true;
 }
 
 /** file_timestamp() returns the latest modification time of a file, which may
@@ -3546,6 +3557,10 @@ static void source_widget(struct nk_context *ctx, const char *id, float rowheigh
     if (lines == 0) {
       nk_layout_row_dynamic(ctx, rowheight, 1);
       nk_label(ctx, "NO SOURCE", NK_TEXT_CENTERED);
+      const char *basename = source_getname(source_cursorfile);
+      char msg[250];
+      sprintf(msg, "[%d] %s", source_cursorfile, (basename != NULL) ? basename : "unknown");
+      nk_label(ctx, msg, NK_TEXT_CENTERED);
     }
     nk_group_end(ctx);
     if (maxlen > 0)
@@ -7097,7 +7112,7 @@ static void handle_stateaction(APPSTATE *state, const enum nk_collapse_states ta
         MARKSTATE(state);
       } else if (gdbmi_isresult() != NULL) {
         if (strncmp(gdbmi_isresult(), "done,", 5) == 0) {
-          sources_parse(gdbmi_isresult() + 5);      /* + 5 to skip "done" and comma */
+          sources_parse(gdbmi_isresult() + 5, state->debugmode);      /* + 5 to skip "done" and comma */
           state->sourcefiles = sources_getnames(&state->sourcefiles_count); /* create array with names for the dropdown */
           state->warn_source_tstamps = !elf_up_to_date(state->ELFfile);     /* check timestamps of sources against elf file */
           MOVESTATE(state, STATE_MEMACCESS_1);

source/bmflash.c

@@ -670,8 +670,8 @@ static void version(void)
         freopen("CONOUT$", "wb", stdout);
         freopen("CONOUT$", "wb", stderr);
       }
-      printf("Fortify: [%d] %s\n", type, str);
 #   endif
+    printf("Fortify: [%d] %s\n", type, str);
   }
 #endif
 

source/bmprofile.c

@@ -164,8 +164,8 @@ static void version(void)
         freopen("CONOUT$", "wb", stdout);
         freopen("CONOUT$", "wb", stderr);
       }
-      printf("Fortify: [%d] %s\n", type, str);
 #   endif
+    printf("Fortify: [%d] %s\n", type, str);
   }
 #endif
 

source/bmserial.c

@@ -146,8 +146,8 @@ static void version(void)
         freopen("CONOUT$", "wb", stdout);
         freopen("CONOUT$", "wb", stderr);
       }
-      printf("Fortify: [%d] %s\n", type, str);
 #   endif
+    printf("Fortify: [%d] %s\n", type, str);
   }
 #endif
 

source/bmtrace.c

@@ -190,8 +190,8 @@ static void version(void)
         freopen("CONOUT$", "wb", stdout);
         freopen("CONOUT$", "wb", stderr);
       }
-      printf("Fortify: [%d] %s\n", type, str);
 #   endif
+    printf("Fortify: [%d] %s\n", type, str);
   }
 #endif
 

source/nuklear.c

@@ -12762,9 +12762,9 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
     combo->label_normal     = table[NK_COLOR_TEXT];
     combo->label_hover      = table[NK_COLOR_TEXT];
     combo->label_active     = table[NK_COLOR_TEXT];
-    combo->sym_normal       = NK_SYMBOL_TRIANGLE_DOWN; /* NK_SYMBOL_TRIANGLE_DOWN_SMALL */
-    combo->sym_hover        = NK_SYMBOL_TRIANGLE_DOWN; /* NK_SYMBOL_TRIANGLE_DOWN_SMALL */
-    combo->sym_active       = NK_SYMBOL_TRIANGLE_DOWN; /* NK_SYMBOL_TRIANGLE_DOWN_SMALL */
+    combo->sym_normal       = NK_SYMBOL_TRIANGLE_DOWN_SMALL;
+    combo->sym_hover        = NK_SYMBOL_TRIANGLE_DOWN_SMALL;
+    combo->sym_active       = NK_SYMBOL_TRIANGLE_DOWN_SMALL;
     combo->content_padding  = nk_vec2(4,4);
     combo->button_padding   = nk_vec2(0,4);
     combo->spacing          = nk_vec2(4,0);
@@ -18080,8 +18080,10 @@ nk_draw_symbol(struct nk_command_buffer *out, enum nk_symbol_type type,
         } else {
             /* circles: make the bounding box rectangular */
             content = nk_square_rect(content);
-            if (type == NK_SYMBOL_CIRCLE_SOLID_SMALL || type == NK_SYMBOL_CIRCLE_OUTLINE_SMALL)
-                content = nk_shrink_rect(content, 3);
+            if (type == NK_SYMBOL_CIRCLE_SOLID_SMALL || type == NK_SYMBOL_CIRCLE_OUTLINE_SMALL) {
+                content = nk_shrink_rect(content, content.w * 0.3f);
+                content.y += content.h * 0.3f;
+            }
             nk_fill_circle(out, content, foreground);
             if (type == NK_SYMBOL_CIRCLE_OUTLINE)
                 nk_fill_circle(out, nk_shrink_rect(content, 1), background);
@@ -18097,10 +18099,12 @@ nk_draw_symbol(struct nk_command_buffer *out, enum nk_symbol_type type,
         heading = (type == NK_SYMBOL_TRIANGLE_RIGHT) ? NK_RIGHT :
             (type == NK_SYMBOL_TRIANGLE_LEFT) ? NK_LEFT:
             (type == NK_SYMBOL_TRIANGLE_UP) ? NK_UP: NK_DOWN;
-        if (type == NK_SYMBOL_TRIANGLE_DOWN_SMALL)
-            nk_triangle_from_direction(points, content, 3, 3, heading);
-        else
+        if (type == NK_SYMBOL_TRIANGLE_DOWN_SMALL) {
+            float sz = NK_MIN(content.w, content.h);
+            nk_triangle_from_direction(points, content, sz * 0.1f, sz * 0.1f, heading);
+        } else {
           nk_triangle_from_direction(points, content, 0, 0, heading);
+        }
         nk_fill_triangle(out, points[0].x, points[0].y, points[1].x, points[1].y,
             points[2].x, points[2].y, foreground);
     } break;

source/nuklear.h

@@ -533,9 +533,9 @@ enum nk_symbol_type {
     NK_SYMBOL_PLUS,
     NK_SYMBOL_MINUS,
     NK_SYMBOL_TRIPLE_DOT,
-    NK_SYMBOL_TRIANGLE_DOWN_SMALL,
-    NK_SYMBOL_CIRCLE_SOLID_SMALL,
-    NK_SYMBOL_CIRCLE_OUTLINE_SMALL,
+    NK_SYMBOL_TRIANGLE_DOWN_SMALL,  /* 20% smaller (10% margin around symbol) */
+    NK_SYMBOL_CIRCLE_SOLID_SMALL,   /* 60% smaller */
+    NK_SYMBOL_CIRCLE_OUTLINE_SMALL, /* 60% smaller */
     NK_SYMBOL_LINK,
     NK_SYMBOL_LINK_ALT,
     NK_SYMBOL_MAX

source/svnrev.h

@@ -2,18 +2,18 @@
  * (https://www.compuphase.com/svnrev.htm).
  * You should not modify it manually, as it may be re-generated.
  * 
- * $Revision: 6901$
- * $Date: 2023-02-23$
+ * $Revision: 6902M$
+ * $Date: 2023-02-24$
  */
 
 #ifndef _SVNREV_H_
 #define _SVNREV_H_
 
-#define SVNREV_NUM	6901
-#define SVNREV_STR	"1.2.6901"
-#define SVNREV_RCS	"$Revision: 6901 $"
-#define SVNREV_DATE	"2023-02-23"
-#define SVNREV_STAMP	20230223L
-#define SVNREV_MODIFIED	0
+#define SVNREV_NUM	6902
+#define SVNREV_STR	"1.2.6902M"
+#define SVNREV_RCS	"$Revision: 6902M $"
+#define SVNREV_DATE	"2023-02-24"
+#define SVNREV_STAMP	20230224L
+#define SVNREV_MODIFIED	1
 
 #endif /* _SVNREV_H_ */