From f1af0f6de39341e5161a2056fbe3e19372866253 Mon Sep 17 00:00:00 2001 From: Ville Helin Date: Fri, 24 Jun 2022 17:50:10 +0300 Subject: [PATCH] This is v10.2 release commit --- CHANGELOG | 6 +-- README.md | 2 +- doc/conf.py | 4 +- historical/amiga | 129 +++++++++++++++++++++++++++++------------------ main.c | 4 +- wlalink/main.c | 4 +- 6 files changed, 90 insertions(+), 59 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 876254f0..db959cc8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,7 +3,7 @@ 1... WLA GB-Z80/Z80/6502/65C02/65CE02/65816/6800/6801/6809/8008/8080/HUC6280/SPC-700/SuperFX History ---------------------------------------------------------------------------------------------------- -v10.2 (20-Jun-2022) [ALL] Added SIZE to .RAMSECTION. +v10.2 (24-Jun-2022) [ALL] Added SIZE to .RAMSECTION. [ALL] Added -d to disable WLA's ability to calculate A-B where A and B are labels. [ALL] If SIZE is used with a .SECTION or .RAMSECTION and @@ -1384,7 +1384,7 @@ v1.0 (10-Jul-2000) The first public release. ------------------------------------------------------------------------------ -v5.17 (05-Jun-2022) Added SIZE to [sections] and [ramsections]. +v5.17 (24-Jun-2022) Added SIZE to [sections] and [ramsections]. Added -R (file paths inside link file are relative to linkfile's location). WLALINK's summary is now printed to stdout instead of @@ -1407,7 +1407,7 @@ v5.17 (05-Jun-2022) Added SIZE to [sections] and [ramsections]. We now skip the generated RAM_USAGE_SLOT_* labels when trying to automatically find load address for a CBMPRG. -v5.16 (19-Feb-2021) Added support for WINDOW and BITWINDOW in .SECTION and +v5.16 (19-Feb-2022) Added support for WINDOW and BITWINDOW in .SECTION and .RAMSECTION. Fixed multiple memory leaks. Should now work better on an Amiga. diff --git a/README.md b/README.md index f13e9571..d42befa2 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ memory map (that should be shared across all object and library files). Supported architectures are: * Z80 -* GB (Z80-GB) +* GB (GB-Z80) * 6502 * 65C02 * 65CE02 diff --git a/doc/conf.py b/doc/conf.py index 63e5bb51..4a023989 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -16,9 +16,9 @@ #source_encoding = 'utf-8-sig' master_doc = 'wla-dx' project = u'wla-dx' -copyright = u'2021, vhelin' +copyright = u'1998, vhelin' version = '10.2' # The short X.Y version, can be used with |version| -release = '10.2a' # The full version, including alpha/beta/rc tags, |release| +release = '10.2' # The full version, including alpha/beta/rc tags, |release| language = None #today = '' #today_fmt = '%B %d, %Y' diff --git a/historical/amiga b/historical/amiga index 603730e0..c2c0b10f 100644 --- a/historical/amiga +++ b/historical/amiga @@ -94,6 +94,19 @@ delete instruction_table_generator main.o /instructions_superfx.o cd / +if not exists binaries + makedir binaries +endif +if not exists binaries/68000 + makedir binaries/68000 +endif +if not exists binaries/68020 + makedir binaries/68020 +endif +if not exists binaries/68040 + makedir binaries/68040 +endif + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WLA-GB ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -102,19 +115,19 @@ copy makefiles/smake.gb to smakefile copy makefiles/scoptions.020 to scoptions smake clean smake -copy wla to binaries/wla-gb.020 +copy wla to binaries/68020/wla-gb copy makefiles/smake.gb to smakefile copy makefiles/scoptions.040 to scoptions smake clean smake -copy wla to binaries/wla-gb.040 +copy wla to binaries/68040/wla-gb copy makefiles/smake.gb to smakefile copy makefiles/scoptions.000 to scoptions smake clean smake -copy wla to binaries/wla-gb.000 +copy wla to binaries/68000/wla-gb ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WLA-SUPERFX @@ -124,19 +137,19 @@ copy makefiles/smake.superfx to smakefile copy makefiles/scoptions.020 to scoptions smake clean smake -copy wla to binaries/wla-superfx.020 +copy wla to binaries/68020/wla-superfx copy makefiles/smake.superfx to smakefile copy makefiles/scoptions.040 to scoptions smake clean smake -copy wla to binaries/wla-superfx.040 +copy wla to binaries/68040/wla-superfx copy makefiles/smake.superfx to smakefile copy makefiles/scoptions.000 to scoptions smake clean smake -copy wla to binaries/wla-superfx.000 +copy wla to binaries/68000/wla-superfx ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WLA-Z80 @@ -146,19 +159,19 @@ copy makefiles/smake.z80 to smakefile copy makefiles/scoptions.020 to scoptions smake clean smake -copy wla to binaries/wla-z80.020 +copy wla to binaries/68020/wla-z80 copy makefiles/smake.z80 to smakefile copy makefiles/scoptions.040 to scoptions smake clean smake -copy wla to binaries/wla-z80.040 +copy wla to binaries/68040/wla-z80 copy makefiles/smake.z80 to smakefile copy makefiles/scoptions.000 to scoptions smake clean smake -copy wla to binaries/wla-z80.000 +copy wla to binaries/68000/wla-z80 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WLA-6502 @@ -168,19 +181,19 @@ copy makefiles/smake.6502 to smakefile copy makefiles/scoptions.020 to scoptions smake clean smake -copy wla to binaries/wla-6502.020 +copy wla to binaries/68020/wla-6502 copy makefiles/smake.6502 to smakefile copy makefiles/scoptions.040 to scoptions smake clean smake -copy wla to binaries/wla-6502.040 +copy wla to binaries/68040/wla-6502 copy makefiles/smake.6502 to smakefile copy makefiles/scoptions.000 to scoptions smake clean smake -copy wla to binaries/wla-6502.000 +copy wla to binaries/68000/wla-6502 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WLA-65C02 @@ -190,19 +203,19 @@ copy makefiles/smake.65c02 to smakefile copy makefiles/scoptions.020 to scoptions smake clean smake -copy wla to binaries/wla-65c02.020 +copy wla to binaries/68020/wla-65c02 copy makefiles/smake.65c02 to smakefile copy makefiles/scoptions.040 to scoptions smake clean smake -copy wla to binaries/wla-65c02.040 +copy wla to binaries/68040/wla-65c02 copy makefiles/smake.65c02 to smakefile copy makefiles/scoptions.000 to scoptions smake clean smake -copy wla to binaries/wla-65c02.000 +copy wla to binaries/68000/wla-65c02 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WLA-65CE02 @@ -212,19 +225,19 @@ copy makefiles/smake.65ce02 to smakefile copy makefiles/scoptions.020 to scoptions smake clean smake -copy wla to binaries/wla-65ce02.020 +copy wla to binaries/68020/wla-65ce02 copy makefiles/smake.65ce02 to smakefile copy makefiles/scoptions.040 to scoptions smake clean smake -copy wla to binaries/wla-65ce02.040 +copy wla to binaries/68040/wla-65ce02 copy makefiles/smake.65ce02 to smakefile copy makefiles/scoptions.000 to scoptions smake clean smake -copy wla to binaries/wla-65ce02.000 +copy wla to binaries/68000/wla-65ce02 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WLA-6800 @@ -234,19 +247,19 @@ copy makefiles/smake.6800 to smakefile copy makefiles/scoptions.020 to scoptions smake clean smake -copy wla to binaries/wla-6800.020 +copy wla to binaries/68020/wla-6800 copy makefiles/smake.6800 to smakefile copy makefiles/scoptions.040 to scoptions smake clean smake -copy wla to binaries/wla-6800.040 +copy wla to binaries/68040/wla-6800 copy makefiles/smake.6800 to smakefile copy makefiles/scoptions.000 to scoptions smake clean smake -copy wla to binaries/wla-6800.000 +copy wla to binaries/68000/wla-6800 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WLA-6801 @@ -256,19 +269,19 @@ copy makefiles/smake.6801 to smakefile copy makefiles/scoptions.020 to scoptions smake clean smake -copy wla to binaries/wla-6801.020 +copy wla to binaries/68020/wla-6801 copy makefiles/smake.6801 to smakefile copy makefiles/scoptions.040 to scoptions smake clean smake -copy wla to binaries/wla-6801.040 +copy wla to binaries/68040/wla-6801 copy makefiles/smake.6801 to smakefile copy makefiles/scoptions.000 to scoptions smake clean smake -copy wla to binaries/wla-6801.000 +copy wla to binaries/68000/wla-6801 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WLA-6809 @@ -278,19 +291,19 @@ copy makefiles/smake.6809 to smakefile copy makefiles/scoptions.020 to scoptions smake clean smake -copy wla to binaries/wla-6809.020 +copy wla to binaries/68020/wla-6809 copy makefiles/smake.6809 to smakefile copy makefiles/scoptions.040 to scoptions smake clean smake -copy wla to binaries/wla-6809.040 +copy wla to binaries/68040/wla-6809 copy makefiles/smake.6809 to smakefile copy makefiles/scoptions.000 to scoptions smake clean smake -copy wla to binaries/wla-6809.000 +copy wla to binaries/68000/wla-6809 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WLA-8008 @@ -300,19 +313,19 @@ copy makefiles/smake.8008 to smakefile copy makefiles/scoptions.020 to scoptions smake clean smake -copy wla to binaries/wla-8008.020 +copy wla to binaries/68020/wla-8008 copy makefiles/smake.8008 to smakefile copy makefiles/scoptions.040 to scoptions smake clean smake -copy wla to binaries/wla-8008.040 +copy wla to binaries/68040/wla-8008 copy makefiles/smake.8008 to smakefile copy makefiles/scoptions.000 to scoptions smake clean smake -copy wla to binaries/wla-8008.000 +copy wla to binaries/68000/wla-8008 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WLA-8080 @@ -322,19 +335,19 @@ copy makefiles/smake.8080 to smakefile copy makefiles/scoptions.020 to scoptions smake clean smake -copy wla to binaries/wla-8080.020 +copy wla to binaries/68020/wla-8080 copy makefiles/smake.8080 to smakefile copy makefiles/scoptions.040 to scoptions smake clean smake -copy wla to binaries/wla-8080.040 +copy wla to binaries/68040/wla-8080 copy makefiles/smake.8080 to smakefile copy makefiles/scoptions.000 to scoptions smake clean smake -copy wla to binaries/wla-8080.000 +copy wla to binaries/68000/wla-8080 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WLA-65816 @@ -344,19 +357,19 @@ copy makefiles/smake.65816 to smakefile copy makefiles/scoptions.020 to scoptions smake clean smake -copy wla to binaries/wla-65816.020 +copy wla to binaries/68020/wla-65816 copy makefiles/smake.65816 to smakefile copy makefiles/scoptions.040 to scoptions smake clean smake -copy wla to binaries/wla-65816.040 +copy wla to binaries/68040/wla-65816 copy makefiles/smake.65816 to smakefile copy makefiles/scoptions.000 to scoptions smake clean smake -copy wla to binaries/wla-65816.000 +copy wla to binaries/68000/wla-65816 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WLA-SPC700 @@ -366,19 +379,19 @@ copy makefiles/smake.spc700 to smakefile copy makefiles/scoptions.020 to scoptions smake clean smake -copy wla to binaries/wla-spc700.020 +copy wla to binaries/68020/wla-spc700 copy makefiles/smake.spc700 to smakefile copy makefiles/scoptions.040 to scoptions smake clean smake -copy wla to binaries/wla-spc700.040 +copy wla to binaries/68040/wla-spc700 copy makefiles/smake.spc700 to smakefile copy makefiles/scoptions.000 to scoptions smake clean smake -copy wla to binaries/wla-spc700.000 +copy wla to binaries/68000/wla-spc700 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WLA-HUC6280 @@ -388,19 +401,19 @@ copy makefiles/smake.huc6280 to smakefile copy makefiles/scoptions.020 to scoptions smake clean smake -copy wla to binaries/wla-huc6280.020 +copy wla to binaries/68020/wla-huc6280 copy makefiles/smake.huc6280 to smakefile copy makefiles/scoptions.040 to scoptions smake clean smake -copy wla to binaries/wla-huc6280.040 +copy wla to binaries/68040/wla-huc6280 copy makefiles/smake.huc6280 to smakefile copy makefiles/scoptions.000 to scoptions smake clean smake -copy wla to binaries/wla-huc6280.000 +copy wla to binaries/68000/wla-huc6280 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; WLALINK @@ -411,28 +424,46 @@ cd wlalink copy /makefiles/scoptions.020 to scoptions smake clean smake -copy wlalink to /binaries/wlalink.020 +copy wlalink to /binaries/68020/wlalink copy /makefiles/scoptions.040 to scoptions smake clean smake -copy wlalink to /binaries/wlalink.040 +copy wlalink to /binaries/68040/wlalink copy /makefiles/scoptions.000 to scoptions smake clean smake -copy wlalink to /binaries/wlalink.000 +copy wlalink to /binaries/68000/wlalink + +smake clean +cd / ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; CLEAN +; BYTE_TESTER ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +cd byte_tester + +copy /makefiles/scoptions.020 to scoptions smake clean -cd / +smake +copy byte_tester to /binaries/68020/byte_tester + +copy /makefiles/scoptions.040 to scoptions +smake clean +smake +copy byte_tester to /binaries/68040/byte_tester + +copy /makefiles/scoptions.000 to scoptions smake clean +smake +copy byte_tester to /binaries/68000/byte_tester ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; ARCHIVE +; CLEAN ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -lha a ram:wla.lha binaries/#? +smake clean +cd / +smake clean diff --git a/main.c b/main.c index f1881319..c943bb60 100644 --- 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.2a (20.6.2022)"; +char g_version_string[] = "$VER: wla-" WLA_NAME " 10.2 (24.6.2022)"; char g_wla_version[] = "10.2"; char g_tmp_name[MAX_NAME_LENGTH + 1], g_makefile_tmp_name[MAX_NAME_LENGTH + 1]; @@ -187,7 +187,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.2a"; + char title[] = "WLA " ARCH_STR " Macro Assembler v10.2"; int length, left, right; length = (int)strlen(title); diff --git a/wlalink/main.c b/wlalink/main.c index 1e9e6fe9..31869d3c 100644 --- a/wlalink/main.c +++ b/wlalink/main.c @@ -32,7 +32,7 @@ #define WLALINK_DEBUG */ -char g_version_string[] = "$VER: wlalink 5.17a (5.6.2022)"; +char g_version_string[] = "$VER: wlalink 5.17 (24.6.2022)"; #ifdef AMIGA __near long __stack = 200000; @@ -282,7 +282,7 @@ int main(int argc, char *argv[]) { i = FAILED; if (i == FAILED) { - char title[] = "WLALINK - WLA DX Macro Assembler Linker v5.17a"; + char title[] = "WLALINK - WLA DX Macro Assembler Linker v5.17"; int length, left, right; length = (int)strlen(title);