New function cc65_symbol_inrange. Fixed an error in cc65_symbol_byname.

Restructured the dbgtest.c source.


git-svn-id: svn://svn.cc65.org/cc65/trunk@4806 b7a2c559-68d2-44c3-8de9-860c34a00d81

src/dbginfo/dbgtest.c

@@ -61,6 +61,101 @@ static void Usage (void)
 
 
 
+static void PrintSourceData (const cc65_sourcedata* D)
+/* Print the data for one source file */
+{
+    printf ("  %s\n", D->source_name);
+}
+
+
+
+static void PrintSegmentData (const cc65_segmentdata* D)
+/* Print the data for one segment */
+{
+    printf ("  %-20s $%06lX $%04lX",
+            D->segment_name,
+            (unsigned long) D->segment_start,
+            (unsigned long) D->segment_size);
+    if (D->output_name) {
+        printf ("  %-20s $%06lX", D->output_name, D->output_offs);
+    }
+    putchar ('\n');
+}
+
+
+
+static void PrintLineData (const cc65_linedata* D)
+/* Print the data for one source line */
+{
+    printf ("  %s(%lu)", D->source_name, (unsigned long) D->source_line);
+    if (D->output_name) {
+        printf (" [%s($%06lX)]", D->output_name, D->output_offs);
+    }
+    putchar ('\n');
+}
+
+
+
+static void PrintSymbolData (const cc65_symboldata* D)
+/* Print the data for one symbol */
+{
+    printf ("  %-20s = %04lX\n", D->symbol_name, D->symbol_value);
+}
+
+
+
+static void PrintSourceInfo (cc65_sourceinfo* Sources)
+/* Output the list of source files */
+{
+    unsigned I;
+    if (Sources) {
+        for (I = 0; I < Sources->count; ++I) {
+            PrintSourceData (Sources->data + I);
+        }
+    }
+}
+
+
+
+static void PrintSegmentInfo (cc65_segmentinfo* Segments)
+/* Output the list of segments */
+{
+    unsigned I;
+    if (Segments) {
+        for (I = 0; I < Segments->count; ++I) {
+            PrintSegmentData (Segments->data + I);
+        }
+    }
+}
+
+
+
+static void PrintLineInfo (const cc65_lineinfo* Info)
+/* Print a list of line infos */
+{
+    unsigned I;
+    if (Info) {
+        for (I = 0; I < Info->count; ++I) {
+            PrintLineData (Info->data + I);
+        }
+    }
+}
+
+
+
+static void PrintSymbolInfo (const cc65_symbolinfo* Symbols)
+/* Print a list of symbol infos */
+{
+    unsigned I;
+    if (Symbols) {
+        for (I = 0; I < Symbols->count; ++I) {
+            PrintSymbolData (Symbols->data + I);
+        }
+    }
+}
+
+
+
 int main (int argc, char** argv)
 {
     const char*         Input;
@@ -69,8 +164,7 @@ int main (int argc, char** argv)
     cc65_segmentinfo*   Segments;
     cc65_lineinfo*      Lines;
     cc65_symbolinfo*    Symbols;
-    unsigned            I;
-    unsigned long       Addr;
+    cc65_addr           Addr;
 
 
     /* Input file is argument */
@@ -90,26 +184,13 @@ int main (int argc, char** argv)
     /* Output a list of files */
     printf ("List of source files:\n");
     Sources = cc65_get_sourcelist (Info);
-    for (I = 0; I < Sources->count; ++I) {
-        printf ("  %s\n", Sources->data[I].source_name);
-    }
+    PrintSourceInfo (Sources);
     cc65_free_sourceinfo (Info, Sources);
 
     /* Output a list of segments */
     printf ("Segments processed when linking:\n");
     Segments = cc65_get_segmentlist (Info);
-    for (I = 0; I < Segments->count; ++I) {
-        printf ("  %-20s $%06lX $%04lX",
-                Segments->data[I].segment_name,
-                (unsigned long) Segments->data[I].segment_start,
-                (unsigned long) Segments->data[I].segment_size);
-        if (Segments->data[I].output_name) {
-            printf ("  %-20s $%06lX",
-                    Segments->data[I].output_name,
-                    Segments->data[I].output_offs);
-        }
-        putchar ('\n');
-    }
+    PrintSegmentInfo (Segments);
     cc65_free_segmentinfo (Info, Segments);
 
     /* Check one line */
@@ -118,9 +199,7 @@ int main (int argc, char** argv)
     if (Lines == 0) {
         printf ("  Not found\n");
     } else {
-        printf ("  Code range is $%04X-$%04X\n",
-                Lines->data[0].line_start,
-                Lines->data[0].line_end);
+        PrintLineInfo (Lines);
         cc65_free_lineinfo (Info, Lines);
     }
 
@@ -131,23 +210,8 @@ int main (int argc, char** argv)
     for (Addr = 0; Addr < 0x10000; ++Addr) {
         Lines = cc65_lineinfo_byaddr (Info, Addr);
         if (Lines) {
-            unsigned I;
-            printf ("  $%04lX: ", Addr);
-            for (I = 0; I < Lines->count; ++I) {
-                if (I > 0) {
-                    printf (", ");
-                }
-                printf ("%s(%lu)",
-                        Lines->data[I].source_name,
-                        (unsigned long) Lines->data[I].source_line);
-                if (Lines->data[I].output_name) {
-                    printf ("  %s($%06lX)",
-                            Lines->data[I].output_name,
-                            Lines->data[I].output_offs);
-
-                }
-            }
-            printf ("\n");
+            printf ("  $%04lX:\n", (unsigned long) Addr);
+            PrintLineInfo (Lines);
             cc65_free_lineinfo (Info, Lines);
         }
     }
@@ -157,16 +221,23 @@ int main (int argc, char** argv)
     Symbols = cc65_symbol_byname (Info, "_main");
     if (Symbols == 0) {
         printf ("  Not found\n");
-    } else {                             
-        unsigned I;
-        for (I = 0; I < Symbols->count; ++I) {
-            printf ("  %-20s = %04lX\n", 
-                    Symbols->data[I].symbol_name,
-                    Symbols->data[I].symbol_value);
-        }
+        Addr = 0x800;
+    } else {
+        PrintSymbolInfo (Symbols);
+        Addr = Symbols->data[0].symbol_value;
         cc65_free_symbolinfo (Info, Symbols);
     }
 
+    /* Print symbols for the next $100 bytes starting from main (or 0x800) */
+    printf ("Requesting labels for $%04lX-$%04lX:\n",           
+            (unsigned long) Addr, (unsigned long) Addr + 0xFF);
+    Symbols = cc65_symbol_inrange (Info, Addr, Addr + 0xFF);
+    if (Symbols == 0) {
+        printf ("  None found\n");
+    } else {
+        PrintSymbolInfo (Symbols);
+        cc65_free_symbolinfo (Info, Symbols);
+    }
 
     /* Free the debug info */
     cc65_free_dbginfo (Info);