V 1.17

Extended the -hv[clm] option. You can now limit the data export to (c)onstants, (l)abels and (m)acros.
Or any combination of them.
  -hvcl exports constants and labels.
By default all data is exported, same as -hvclm
Used by the "Atasm-Altirra-Bridge" VSCode plugin (https://bit.ly/3ATTHVR)
Breaking default behavior change: When running atasm without a target assembler file (was test.m65) the command line help is shown. Same when specifying -h on the command line.

Author: CycoPH

README.md

@@ -1,6 +1,6 @@
-# ATasm v1.16
+# ATasm v1.17
 ### A mostly Mac/65 compatible 6502 cross-assembler 
-Copyright (c) 1998-2021 Mark Schmelzenbach, modified by Peter Hinz (2021)
+Copyright (c) 1998-2021 Mark Schmelzenbach, modified by Peter Hinz (2022)
 
 *ATasm is a 6502 command-line cross-assembler that is compatible with the original Mac/65 macroassembler released by OSS software. Code development can now be performed using "modern" editors and compiles with lightning speed.*
 

VERSION.TXT

@@ -139,4 +139,10 @@ Dec 22, 2021
                  Code like this now assembles:
                  lda #1<<4
                  Fixed a bug in .LST output generator.  Filenames were not tracked correctly which caused source lines
-                 to be allocated to the wrong source file.  Thank you to Lars Langhans for reporting this. 
+                 to be allocated to the wrong source file.  Thank you to Lars Langhans for reporting this.
+Feb 2, 2022
+  version 1.17 - Extended the -hv[clm] option. You can now limit the data export to (c)onstants, (l)abels and (m)acros.
+				 Or any combination of them. -hvcl exports constants and labels. By default all data is exported.
+				 Used by the "Atasm-Altirra-Bridge" VSCode plugin (https://bit.ly/3ATTHVR)
+				 Breaking default behavior change: When running atasm without a target assembler file (was test.m65)
+				 the command line help is shown. Same when specifying -h on the command line.

atasm.exe

@@ -2457,6 +2457,31 @@ int find_extension(char *name) {
   }
   return end-name;
 }
+
+/*=========================================================================*
+ * Show command line help
+ *=========================================================================*/
+void showHelp(char *executable)
+{
+    fprintf(stderr, "\nUsage: %s [-v] [-s] [-r] [-d[symbol=value] [-o[fname.out] [-m[fname.state]] <fname.m65>\n", executable ? executable : "atasm");
+    fputs("  where  -v: prints assembly trace\n", stderr);
+    fputs("         -s: prints symbol table\n", stderr);
+    fputs("         -u: enables undocumented opcodes\n", stderr);
+    fputs("         -m[fname]: defines template emulator state file\n", stderr);
+    fputs("         -x[fname]: saves object file to .XFD/.ATR disk image [fname]\n", stderr);
+    fputs("         -r: saves object code as a raw binary image\n", stderr);
+    fputs("         -f[value]: set raw binary fill byte to [value]\n", stderr);
+    fputs("         -o[fname]: saves object file to [fname] instead of <fname>.65o\n", stderr);
+    fputs("         -d[symbol=value]: pre-defines [symbol] to [value]\n", stderr);
+    fputs("         -l[fname]: dumps labels to file [fname]\n", stderr);
+    fputs("         -g[fname]: dumps debug list to file [fname]\n", stderr);
+    fputs("         -Idirectory: search [directory] for .INCLUDE files\n", stderr);
+    fputs("         -mae: treats local labels like MAE assembler\n", stderr);
+    fputs("         -hc[fname]: dumps equates and labels to header file for CC65\n", stderr);
+    fputs("         -ha[fname]: dumps equates and labels to header file for assembler\n", stderr);
+    fputs("         -hv[clm]: dumps all info for VSCode plugin. c=constants, l=labels, m=macros\n", stderr);
+}
+
 /*=========================================================================*
  * function main
  *
@@ -2474,7 +2499,7 @@ int main(int argc, char *argv[]) {
 
   create_c_header_fn = create_asm_header_fn = 0;
   dsymbol=state=0;
-  dumpVSCode = 0;
+  dumpVSCode = DUMP_NOTHING;   /* No dumping of constant, label, macros, and includes to 'asm-symbols.json' file */
   strcpy(snap,"atari800.a8s");
   fname[0]=outfile[0]=labelfile[0]=listfile[0]=cheaderfile[0]=asmheaderfile[0]='\0';
   opt.savetp=opt.verbose=opt.MAElocals=0;
@@ -2534,7 +2559,23 @@ int main(int argc, char *argv[]) {
 		}
 	}
     else if (!STRNCASECMP(argv[i], "-hv", 3)) {
-        dumpVSCode = 1;
+        if (strlen(argv[i]) > 3) {
+            /* There are special selectors after the -hv switch */
+            /* c = constants, l = labels, m = macros */
+            char* param = argv[i];
+            for (int x = 3; x < strlen(param); ++x) {
+                if (!STRNCASECMP(&param[x], "c", 1)) { dumpVSCode |= DUMP_CONSTANTS; }
+                else if (!STRNCASECMP(&param[x], "l", 1)) { dumpVSCode |= DUMP_LABELS; }
+                else if (!STRNCASECMP(&param[x], "m", 1)) { dumpVSCode |= DUMP_MACROS; }
+            }
+            // Hmm, did not select anything useful, so dump it all
+            if (dumpVSCode == DUMP_NOTHING)
+                dumpVSCode = DUMP_ALL;
+        }
+        else {
+            /* Dump all the items */
+            dumpVSCode = DUMP_ALL; /* constants, labels, macros, (includes are always dumped) */
+        }
     }
     else if (!STRNCASECMP(argv[i],"-g",2)) {
       if (strlen(argv[i])>2) {
@@ -2581,29 +2622,15 @@ int main(int argc, char *argv[]) {
         fprintf(stderr,"Using default state file: '%s'\n",snap);
       state=1;
     } else if (!STRCASECMP(argv[i],"-h")) {
-      fprintf(stderr,"\nUsage: %s [-v] [-s] [-r] [-d[symbol=value] [-o[fname.out] [-m[fname.state]] <fname.m65>\n",argv[0]);
-      fputs("  where  -v: prints assembly trace\n",stderr);
-      fputs("         -s: prints symbol table\n",stderr);
-      fputs("         -u: enables undocumented opcodes\n",stderr);
-      fputs("         -m[fname]: defines template emulator state file\n",stderr);
-      fputs("         -x[fname]: saves object file to .XFD/.ATR disk image [fname]\n",stderr);
-      fputs("         -r: saves object code as a raw binary image\n",stderr);
-      fputs("         -f[value]: set raw binary fill byte to [value]\n",stderr);
-      fputs("         -o[fname]: saves object file to [fname] instead of <fname>.65o\n",stderr);
-      fputs("         -d[symbol=value]: pre-defines [symbol] to [value]\n",stderr);
-      fputs("         -l[fname]: dumps labels to file [fname]\n",stderr);
-      fputs("         -g[fname]: dumps debug list to file [fname]\n",stderr);
-      fputs("         -Idirectory: search [directory] for .INCLUDE files\n",stderr);
-      fputs("         -mae: treats local labels like MAE assembler\n",stderr);
-      fputs("         -hc[fname]: dumps equates and labels to header file for CC65\n", stderr);
-      fputs("         -ha[fname]: dumps equates and labels to header file for assembler\n", stderr);
-      fputs("         -hv: dumps all info for VSCode plugin\n", stderr);
+      showHelp(argv[0]);
       return 1;
     } else strcpy(fname,argv[i]);
   }
 
   if (!strlen(fname)) {
-    strcpy(fname,"test.m65");
+    // strcpy(fname,"test.m65");
+    showHelp(argv[0]);
+    return 1;
   }
 
   /* If the -hc or -ha options did not specify a filename lets create them now */
@@ -2628,7 +2655,7 @@ int main(int argc, char *argv[]) {
       dump_assembler_header(asmheaderfile);
 
   if (dumpVSCode)
-      dump_VSCode(trackedFiles);
+      dump_VSCode(trackedFiles, dumpVSCode);
 
   fputs("\nAssembly successful\n",stderr);
   fprintf(stderr,"  Compiled %d bytes (~%dk)\n",bsize,bsize/1024);

docs/atasm.pdf

@@ -803,13 +803,17 @@ char* bestNameForSymbol(symbol* sym)
     return sym->name;
 }
 
-void dump_VSCode(file_tracking* trackedFiles)
+/*
+* trackedFiles: linked list of files that have been included
+* parts: which data is to be dumped (CONSTANTS, LABEL, MACROS)
+*/
+void dump_VSCode(file_tracking* trackedFiles, int parts)
 {
     symbol* sym, * head;
     FILE* out;
     int count;
 
-    out = fopen("plugin.json", "wb");
+    out = fopen("asm-symbols.json", "wb");
     if (!out)
         return;
 
@@ -823,83 +827,91 @@ void dump_VSCode(file_tracking* trackedFiles)
 
     fprintf(out, "{\n");
 
+    // Constants
     fprintf(out, "\"constants\":[\n");
-    sym = head;
-    count = 0;
-    while (sym)
+    if (parts & DUMP_CONSTANTS)
     {
-        if (sym->tp == EQUATE)// && sym->name[0] && sym->name[0] != '=')
+        sym = head;
+        count = 0;
+        while (sym)
         {
-            if (count != 0)
-                fprintf(out, ",\n");
-            fprintf(out, "{");
-            fprintf(out, "\"name\":\"%s\"", bestNameForSymbol(sym) );
-            fprintf(out, ",\"addr\":%d", sym->addr & 0xffff);
-            fprintf(out, ",\"file\":\"%s\"", sym->ftrack ? sym->ftrack->name : "-");
-            fprintf(out, ",\"ln\":%d", sym->lineNr);
-            fprintf(out, "}");
-            ++count;
+            if (sym->tp == EQUATE)// && sym->name[0] && sym->name[0] != '=')
+            {
+                if (count != 0)
+                    fprintf(out, ",\n");
+                fprintf(out, "{");
+                fprintf(out, "\"name\":\"%s\"", bestNameForSymbol(sym));
+                fprintf(out, ",\"addr\":%d", sym->addr & 0xffff);
+                fprintf(out, ",\"file\":\"%s\"", sym->ftrack ? sym->ftrack->name : "-");
+                fprintf(out, ",\"ln\":%d", sym->lineNr);
+                fprintf(out, "}");
+                ++count;
+            }
+            sym = sym->lnk;
         }
-        sym = sym->lnk;
     }
     fprintf(out, "\n]\n");
 
+    // Labels
     fprintf(out, ",\"labels\":[\n");
-    sym = head;
-    count = 0;
-    while (sym)
+    if (parts & DUMP_LABELS)
     {
-        if (sym->tp == LABEL) // && sym->name[0] && sym->name[0] != '=')
+        sym = head;
+        count = 0;
+        while (sym)
         {
-            if (count != 0)
-                fprintf(out, ",\n");
-            fprintf(out, "{");
-            fprintf(out, "\"name\":\"%s\"", bestNameForSymbol(sym) );
-            fprintf(out, ",\"addr\":%d", sym->addr & 0xffff);
-            if (sym->lineNr > 0)
+            if (sym->tp == LABEL) // && sym->name[0] && sym->name[0] != '=')
             {
-                fprintf(out, ",\"file\":\"%s\"", sym->ftrack ? sym->ftrack->name : "-");
-                fprintf(out, ",\"ln\":%d", sym->lineNr);
-            }
-            else {
-                fprintf(out, ",\"cmdln\":\"%s\"", sym->orig);
+                if (count != 0)
+                    fprintf(out, ",\n");
+                fprintf(out, "{");
+                fprintf(out, "\"name\":\"%s\"", bestNameForSymbol(sym));
+                fprintf(out, ",\"addr\":%d", sym->addr & 0xffff);
+                if (sym->lineNr > 0)
+                {
+                    fprintf(out, ",\"file\":\"%s\"", sym->ftrack ? sym->ftrack->name : "-");
+                    fprintf(out, ",\"ln\":%d", sym->lineNr);
+                }
+                else {
+                    fprintf(out, ",\"cmdln\":\"%s\"", sym->orig);
+                }
+                fprintf(out, "}");
+                ++count;
             }
-            fprintf(out, "}");
-            ++count;
+            sym = sym->lnk;
         }
-        sym = sym->lnk;
     }
     fprintf(out, "\n]\n");
 
     /* MACROS */
     fprintf(out, ",\"macros\":[\n");
-    sym = head;
-    count = 0;
-    while (sym)
+    if (parts & DUMP_MACROS)
     {
-        if (sym->tp == MACRON) // && sym->name[0] && sym->name[0] != '=')
+        sym = head;
+        count = 0;
+        while (sym)
         {
-            if (count != 0)
-                fprintf(out, ",\n");
-            fprintf(out, "{");
-            fprintf(out, "\"name\":\"%s\"", bestNameForSymbol(sym));
-            fprintf(out, ",\"addr\":%d", sym->addr & 0xffff);
-            if (sym->lineNr > 0)
+            if (sym->tp == MACRON) // && sym->name[0] && sym->name[0] != '=')
             {
-                fprintf(out, ",\"file\":\"%s\"", sym->ftrack ? sym->ftrack->name : "-");
-                fprintf(out, ",\"ln\":%d", sym->lineNr);
+                if (count != 0)
+                    fprintf(out, ",\n");
+                fprintf(out, "{");
+                fprintf(out, "\"name\":\"%s\"", bestNameForSymbol(sym));
+                // fprintf(out, ",\"addr\":%d", sym->addr & 0xffff);
+                if (sym->lineNr > 0)
+                {
+                    fprintf(out, ",\"file\":\"%s\"", sym->ftrack ? sym->ftrack->name : "-");
+                    fprintf(out, ",\"ln\":%d", sym->lineNr);
+                }
+                fprintf(out, "}");
+                ++count;
             }
-            else {
-                fprintf(out, ",\"cmdln\":\"%s\"", sym->orig);
-            }
-            fprintf(out, "}");
-            ++count;
+            sym = sym->lnk;
         }
-        sym = sym->lnk;
     }
     fprintf(out, "\n]\n");
 
-    /* included files */
+    /* Included files */
     fprintf(out, ",\"includes\":[\n");
     sym = head;
     count = 0;

src/asm.c

@@ -22,11 +22,19 @@
 #define SYMBOL_H
 
 #define MAJOR_VER 1
-#define MINOR_VER 16
+#define MINOR_VER 17
 #define BETA_VER 0
 
-
  /*==========================================================================*/
+
+#define DUMP_NOTHING    0
+#define DUMP_CONSTANTS  1
+#define DUMP_LABELS     2
+#define DUMP_MACROS     4
+#define DUMP_ALL        (1|2|4)
+
+
+/*==========================================================================*/
 typedef struct file_tracking /* Track the filename */
 {
     char* name;
@@ -161,7 +169,7 @@ int dump_symbols();
 int dump_labels(char *fname);
 int dump_c_header(char *header_fname, char *asm_fname);
 int dump_assembler_header(char* header_fname);
-void dump_VSCode(file_tracking* trackedFiles);
+void dump_VSCode(file_tracking* trackedFiles, int partsToDump);
 macro_call *get_macro_call(char *name);
 int macro_subst(char *name, char *in, macro_line *cmd, int max);
 int create_macro(symbol *sym);

src/symbol.c

@@ -0,0 +1,10 @@
+#ifndef _INCMANY_ASM_
+#define _INCMANY_ASM_
+
+/* Constants */
+
+/* Labels */
+#define INCMANY_BOOT_THIS 0x2000 /* tests/incmany.asm @ 4 */
+#define INCMANY_STOREIT   0x203A /* " @ 21 */
+
+#endif

src/symbol.h

@@ -0,0 +1,6 @@
+
+; CONSTANTS
+
+; LABELS
+BOOT_THIS = $2000 ; tests/incmany.asm @ 4
+STOREIT   = $203A ; " @ 21

tests/incmany.asm.h

@@ -0,0 +1,50 @@
+mads (generated by atasm)
+
+Source: tests/incmany.asm
+5 2000  A9 00  BOOT_THIS 	lda #0
+6 2002  8D 3A 20 	sta StoreIt
+
+Source: incpart1.asm
+1 2005  A9 01    	lda #1
+2 2007  8D 3A 20 	sta StoreIt
+
+Source: incpart2.asm
+1 200A  A9 02    	lda #2
+2 200C  8D 3A 20 	sta StoreIt
+
+Source: incpart3.asm
+1 200F  A9 03    	lda #3
+2 2011  8D 3A 20 	sta StoreIt
+
+Source: incpart4.asm
+1 2014  A9 04    	lda #4
+2 2016  8D 3A 20 	sta StoreIt
+
+Source: incpart5.asm
+1 2019  A9 05    	lda #5
+2 201B  8D 3A 20 	sta StoreIt
+
+Source: incpart6.asm
+1 201E  A9 06    	lda #6
+2 2020  8D 3A 20 	sta StoreIt
+
+Source: incpart7.asm
+1 2023  A9 07    	lda #7
+2 2025  8D 3A 20 	sta StoreIt
+
+Source: incpart8.asm
+1 2028  A9 08    	lda #8
+2 202A  8D 3A 20 	sta StoreIt
+
+Source: incpart9.asm
+1 202D  A9 09    	lda #9
+2 202F  8D 3A 20 	sta StoreIt
+
+Source: incpart10.asm
+1 2032  A9 0A    	lda #10
+2 2034  8D 3A 20 	sta StoreIt
+
+Source: tests/incmany.asm
+18 2037  4C 00 20 	jmp BOOT_THIS
+22 203A  00  	.byte 0
+26 02E0  00 20  	.word BOOT_THIS