Getting ready to release v10.1...

vhelin · vhelin · commit 6060022b481e · 2022-02-19T18:56:25.000+02:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -3,7 +3,7 @@
 1... WLA GB-Z80/Z80/6502/65C02/65CE02/6510/65816/6800/6801/6809/8008/8080/HUC6280/SPC-700/SuperFX History
 ---------------------------------------------------------------------------------------------------------
 
-v10.1 (09-Feb-2022) [ALL] Arguments to .SECTION and .RAMSECTION can be now
+v10.1 (19-Feb-2022) [ALL] Arguments to .SECTION and .RAMSECTION can be now
                       given in any order, only the first argument must be the
                       section's name.
                     [ALL] A definition can be substituted with its value in
@@ -12,8 +12,8 @@ v10.1 (09-Feb-2022) [ALL] Arguments to .SECTION and .RAMSECTION can be now
                       works.
                     [ALL] Strings can be split to multiple lines using '\'.
                     [ALL] Added WINDOW and BITWINDOW to .SECTION and .RAMSECTION.
-                      These can be used to limit where the .SECTION and
-                      .RAMSECTION are placed.
+                      These can be used to limit where .SECTIONs and
+                      .RAMSECTIONs are placed.
                     [ALL] The assembler is now able to calculate A-B where
                       A and B are labels in the same section. Only the linker
                       used to be able to do this.
@@ -32,11 +32,12 @@ v10.1 (09-Feb-2022) [ALL] Arguments to .SECTION and .RAMSECTION can be now
                     [ALL] Sharing a namespace between sections should not make
                       WLA to crash at exit.
                     [ALL] MAX_NAME_LENGTH is now 2047 instead of 255. This
-                      change allows to longer strings/labels (NOTE: On Amiga
+                      change allows longer strings/labels (NOTE: On Amiga
                       and MSDOS the limit is 511, due to limited stack).
                     [ALL] Turned some huge stack allocations into heap
                       allocations.
                     [ALL] \@ should now work in .IFs.
+                    [ALL] __label__ should now work better in calculations.
                     [658] The maximum SRAMSIZE in SNES ROM header is now 7
                       instead of 3.
                     [SFX] Fixed "MOVE (xx),Rn" macro instruction parsing. And
@@ -1336,7 +1337,7 @@ v1.0 (10-Jul-2000) The first public release.
 ------------------------------------------------------------------------------
 
 
-v5.16 (14-Feb-2021) Added support for WINDOW and BITWINDOW in .SECTION and
+v5.16 (19-Feb-2021) Added support for WINDOW and BITWINDOW in .SECTION and
                       .RAMSECTION.
                     Fixed multiple memory leaks. Should now work better
                       on an Amiga.
diff --git a/byte_tester/main.c b/byte_tester/main.c
@@ -230,7 +230,11 @@ int main(int argc, char *argv[]) {
   
   if (argc < 2 || argc > 3 || argv == NULL) {
     fprintf(stderr, "\n");
+#ifdef AMIGACPU
+    fprintf(stderr, "Byte tester 2.0 (" AMIGACPU ")\n");
+#else
     fprintf(stderr, "Byte tester 2.0\n");
+#endif
     fprintf(stderr, "\n");
     fprintf(stderr, "USAGE: %s [-s] <TESTS FILE / SOURCE FILE>\n", argv[0]);
     fprintf(stderr, "\n");
diff --git a/doc/conf.py b/doc/conf.py
@@ -18,7 +18,7 @@
 project = u'wla-dx'
 copyright = u'2021, vhelin'
 version = '10.1' # The short X.Y version, can be used with |version|
-release = '10.1a' # The full version, including alpha/beta/rc tags, |release|
+release = '10.1' # The full version, including alpha/beta/rc tags, |release|
 language = None
 #today = ''
 #today_fmt = '%B %d, %Y'
diff --git a/doc/man/wlab.rst b/doc/man/wlab.rst
@@ -33,7 +33,7 @@ Choose one:
 DESCRIPTION
 -----------
 
-:manpage:`wla(1)` converts binary files to WLA's byte definition strings and
+:manpage:`wlab(1)` converts binary files to WLA's byte definition strings and
 print it to the standard output.
 
 
diff --git a/historical/SCOPTIONS b/historical/SCOPTIONS
@@ -8,4 +8,4 @@ STRIPDEBUG
 OPTIMIZERSCHEDULER
 NOVERSION
 OPTIMIZERTIME
-
+DEFINE=AMIGACPU="68020"
diff --git a/historical/amiga b/historical/amiga
@@ -110,6 +110,12 @@ smake clean
 smake
 copy wla to binaries/wla-gb.020
 
+copy makefiles/smake.gb to smakefile
+copy makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wla to binaries/wla-gb.040
+
 copy makefiles/smake.gb to smakefile
 copy makefiles/scoptions.000 to scoptions
 smake clean
@@ -126,6 +132,12 @@ smake clean
 smake
 copy wla to binaries/wla-superfx.020
 
+copy makefiles/smake.superfx to smakefile
+copy makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wla to binaries/wla-superfx.040
+
 copy makefiles/smake.superfx to smakefile
 copy makefiles/scoptions.000 to scoptions
 smake clean
@@ -142,6 +154,12 @@ smake clean
 smake
 copy wla to binaries/wla-z80.020
 
+copy makefiles/smake.z80 to smakefile
+copy makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wla to binaries/wla-z80.040
+
 copy makefiles/smake.z80 to smakefile
 copy makefiles/scoptions.000 to scoptions
 smake clean
@@ -158,6 +176,12 @@ smake clean
 smake
 copy wla to binaries/wla-6502.020
 
+copy makefiles/smake.6502 to smakefile
+copy makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wla to binaries/wla-6502.040
+
 copy makefiles/smake.6502 to smakefile
 copy makefiles/scoptions.000 to scoptions
 smake clean
@@ -174,6 +198,12 @@ smake clean
 smake
 copy wla to binaries/wla-6510.020
 
+copy makefiles/smake.6510 to smakefile
+copy makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wla to binaries/wla-6510.040
+
 copy makefiles/smake.6510 to smakefile
 copy makefiles/scoptions.000 to scoptions
 smake clean
@@ -190,6 +220,12 @@ smake clean
 smake
 copy wla to binaries/wla-65c02.020
 
+copy makefiles/smake.65c02 to smakefile
+copy makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wla to binaries/wla-65c02.040
+
 copy makefiles/smake.65c02 to smakefile
 copy makefiles/scoptions.000 to scoptions
 smake clean
@@ -206,6 +242,12 @@ smake clean
 smake
 copy wla to binaries/wla-65ce02.020
 
+copy makefiles/smake.65ce02 to smakefile
+copy makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wla to binaries/wla-65ce02.040
+
 copy makefiles/smake.65ce02 to smakefile
 copy makefiles/scoptions.000 to scoptions
 smake clean
@@ -222,6 +264,12 @@ smake clean
 smake
 copy wla to binaries/wla-6800.020
 
+copy makefiles/smake.6800 to smakefile
+copy makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wla to binaries/wla-6800.040
+
 copy makefiles/smake.6800 to smakefile
 copy makefiles/scoptions.000 to scoptions
 smake clean
@@ -238,6 +286,12 @@ smake clean
 smake
 copy wla to binaries/wla-6801.020
 
+copy makefiles/smake.6801 to smakefile
+copy makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wla to binaries/wla-6801.040
+
 copy makefiles/smake.6801 to smakefile
 copy makefiles/scoptions.000 to scoptions
 smake clean
@@ -254,6 +308,12 @@ smake clean
 smake
 copy wla to binaries/wla-6809.020
 
+copy makefiles/smake.6809 to smakefile
+copy makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wla to binaries/wla-6809.040
+
 copy makefiles/smake.6809 to smakefile
 copy makefiles/scoptions.000 to scoptions
 smake clean
@@ -270,6 +330,12 @@ smake clean
 smake
 copy wla to binaries/wla-8008.020
 
+copy makefiles/smake.8008 to smakefile
+copy makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wla to binaries/wla-8008.040
+
 copy makefiles/smake.8008 to smakefile
 copy makefiles/scoptions.000 to scoptions
 smake clean
@@ -286,6 +352,12 @@ smake clean
 smake
 copy wla to binaries/wla-8080.020
 
+copy makefiles/smake.8080 to smakefile
+copy makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wla to binaries/wla-8080.040
+
 copy makefiles/smake.8080 to smakefile
 copy makefiles/scoptions.000 to scoptions
 smake clean
@@ -302,6 +374,12 @@ smake clean
 smake
 copy wla to binaries/wla-65816.020
 
+copy makefiles/smake.65816 to smakefile
+copy makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wla to binaries/wla-65816.040
+
 copy makefiles/smake.65816 to smakefile
 copy makefiles/scoptions.000 to scoptions
 smake clean
@@ -318,6 +396,12 @@ smake clean
 smake
 copy wla to binaries/wla-spc700.020
 
+copy makefiles/smake.spc700 to smakefile
+copy makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wla to binaries/wla-spc700.040
+
 copy makefiles/smake.spc700 to smakefile
 copy makefiles/scoptions.000 to scoptions
 smake clean
@@ -334,6 +418,12 @@ smake clean
 smake
 copy wla to binaries/wla-huc6280.020
 
+copy makefiles/smake.huc6280 to smakefile
+copy makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wla to binaries/wla-huc6280.040
+
 copy makefiles/smake.huc6280 to smakefile
 copy makefiles/scoptions.000 to scoptions
 smake clean
@@ -345,9 +435,26 @@ copy wla to binaries/wla-huc6280.000
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 cd wlalink
+
+copy /makefiles/scoptions.020 to scoptions
 smake clean
 smake
-copy wlalink to /binaries/
+copy wlalink to /binaries/wlalink.020
+
+copy /makefiles/scoptions.040 to scoptions
+smake clean
+smake
+copy wlalink to /binaries/wlalink.040
+
+copy /makefiles/scoptions.000 to scoptions
+smake clean
+smake
+copy wlalink to /binaries/wlalink.000
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; CLEAN
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 smake clean
 cd /
 smake clean
diff --git a/historical/byte_tester/SCOPTIONS b/historical/byte_tester/SCOPTIONS
@@ -9,3 +9,4 @@ NOVERSION
 OPTIMIZERTIME
 CODE=FAR
 DATA=FAR
+DEFINE=AMIGACPU="68000"
diff --git a/historical/makefiles/scoptions.000 b/historical/makefiles/scoptions.000
@@ -9,3 +9,4 @@ NOVERSION
 OPTIMIZERTIME
 CODE=FAR
 DATA=FAR
+DEFINE=AMIGACPU="68000"
diff --git a/historical/makefiles/scoptions.020 b/historical/makefiles/scoptions.020
@@ -9,3 +9,4 @@ NOVERSION
 OPTIMIZERTIME
 CODE=FAR
 DATA=FAR
+DEFINE=AMIGACPU="68020"
diff --git a/historical/makefiles/scoptions.040 b/historical/makefiles/scoptions.040
@@ -0,0 +1,12 @@
+CPU=68040
+PARAMETERS=REGISTERS
+ANSI
+NOMULTIPLEINCLUDES
+OPTIMIZE
+VERBOSE
+OPTIMIZERSCHEDULER
+NOVERSION
+OPTIMIZERTIME
+CODE=FAR
+DATA=FAR
+DEFINE=AMIGACPU="68040"
diff --git a/main.c b/main.c
@@ -42,7 +42,7 @@ FILE *g_file_out_ptr = NULL;
 __near long __stack = 200000;
 #endif
 
-char g_version_string[] = "$VER: wla-" WLA_NAME " 10.1a (9.2.2022)";
+char g_version_string[] = "$VER: wla-" WLA_NAME " 10.1 (19.2.2022)";
 char g_wla_version[] = "10.1";
 
 char g_tmp_name[MAX_NAME_LENGTH + 1], g_makefile_tmp_name[MAX_NAME_LENGTH + 1];
@@ -185,7 +185,7 @@ int main(int argc, char *argv[]) {
   }
   
   if (g_output_format == OUTPUT_NONE || parse_flags_result == FAILED) {
-    char title[] = "WLA " ARCH_STR " Macro Assembler v10.1a";
+    char title[] = "WLA " ARCH_STR " Macro Assembler v10.1";
     int length, left, right;
 
     length = (int)strlen(title);
@@ -201,6 +201,9 @@ int main(int argc, char *argv[]) {
       printf(" ");
     printf("---\n");
     printf("----------------------------------------------------------------------\n");
+#ifdef AMIGACPU
+    printf("                         Compiled for " AMIGACPU "\n");
+#endif
     printf("                Programmed by Ville Helin in 1998-2008\n");
     printf("        In GitHub since 2014: https://github.com/vhelin/wla-dx\n");
 
diff --git a/run_tests.bsh b/run_tests.bsh
@@ -25,14 +25,15 @@ while arch < archcount
     cd $tests[$t]
 
     # Run test
-    rm *.o *.sym *.rom *.prg
+	make clean
     make -f makefile
-    rm *.o *.sym *.rom *.prg
 
     if -f testsfile
       byte_tester testsfile
     endif
 
+	make clean
+	
     t++
     cd ..
   endwhile
diff --git a/tests/6502/features_test/main.s b/tests/6502/features_test/main.s
@@ -210,5 +210,12 @@ boot_rst_\1_?1:
         .DB 0b00000000000000000000000000000011 - 0b00000000000000000000000000000001 ; @BT 02
         .DB "<18"               ; @BT END
         
-
-        
+        .bank 1 slot 0
+        .org 0
+
+this_is_the_longest_label_for_a_while:
+        .db "19>"               ; @BT TEST-19 19 START
+this_is_a_long_label:
+        .dw __label__           ; @BT 03 80
+        .dw __label__ + $2000   ; @BT 03 A0
+        .db "<19"               ; @BT END
diff --git a/wlalink/main.c b/wlalink/main.c
