From b5582022a9e6bddd9074e229579d6a73d6124504 Mon Sep 17 00:00:00 2001 From: Mikael Pettersson Date: Sun, 9 Jul 2023 17:38:53 +0200 Subject: [PATCH] drop support for OTP < 24, remove escript_runtime:start/2 kludge --- erlang/apps/8to9/src/8to9.erl | 9 ++++----- erlang/apps/ar/src/ar.erl | 7 ++----- erlang/apps/as/src/as.erl | 7 ++----- erlang/apps/ld/src/ld.erl | 7 ++----- erlang/apps/lib/src/escript_runtime.erl | 15 +-------------- erlang/apps/nm/src/nm.erl | 7 ++----- erlang/apps/od/src/od.erl | 7 ++----- erlang/apps/readelf/src/readelf.erl | 7 ++----- erlang/apps/sim/src/sim.erl | 7 ++----- 9 files changed, 19 insertions(+), 54 deletions(-) diff --git a/erlang/apps/8to9/src/8to9.erl b/erlang/apps/8to9/src/8to9.erl index f1f0c93..33b5439 100644 --- a/erlang/apps/8to9/src/8to9.erl +++ b/erlang/apps/8to9/src/8to9.erl @@ -1,7 +1,7 @@ %%% -*- erlang-indent-level: 2 -*- %%% %%% 8to9 -- convert octet files to nonet files -%%% Copyright (C) 2013-2021 Mikael Pettersson +%%% Copyright (C) 2013-2023 Mikael Pettersson %%% %%% This file is part of pdp10-tools. %%% @@ -23,10 +23,8 @@ -record(args, {infile, outfile}). +-spec main([string()]) -> no_return(). main(Argv) -> - escript_runtime:start(fun main_/1, Argv). - -main_(Argv) -> case my_getopt:parse(Argv, "Vi:o:", [ {"version", 'no', $V} , {"infile", 'required', $i} @@ -37,7 +35,8 @@ main_(Argv) -> OutFile = get_outfile(Args), InFile = get_infile(Args), copy(InFile, OutFile), - pdp10_stdio:fclose(OutFile); + pdp10_stdio:fclose(OutFile), + halt(0); {ok, {_Options, [X | _]}} -> escript_runtime:errmsg("non-option parameter: ~s\n", [X]), usage(); diff --git a/erlang/apps/ar/src/ar.erl b/erlang/apps/ar/src/ar.erl index 4d74daa..a2bb035 100644 --- a/erlang/apps/ar/src/ar.erl +++ b/erlang/apps/ar/src/ar.erl @@ -1,7 +1,7 @@ %%% -*- erlang-indent-level: 2 -*- %%% %%% 'ar' clone for PDP10 -%%% Copyright (C) 2013-2020 Mikael Pettersson +%%% Copyright (C) 2013-2023 Mikael Pettersson %%% %%% This file is part of pdp10-tools. %%% @@ -94,11 +94,8 @@ %% Command-line interface ====================================================== +-spec main([string()]) -> no_return(). main(Argv) -> - escript_runtime:start(fun main_/1, Argv). - --spec main_([string()]) -> no_return(). -main_(Argv) -> case parse_argv(Argv) of {ok, {Opts, ArchiveFile, Files}} -> ar(Opts, ArchiveFile, Files), diff --git a/erlang/apps/as/src/as.erl b/erlang/apps/as/src/as.erl index 01afb07..d5026ea 100644 --- a/erlang/apps/as/src/as.erl +++ b/erlang/apps/as/src/as.erl @@ -1,7 +1,7 @@ %%% -*- erlang-indent-level: 2 -*- %%% %%% 'as' clone for pdp10-elf -%%% Copyright (C) 2013-2021 Mikael Pettersson +%%% Copyright (C) 2013-2023 Mikael Pettersson %%% %%% This file is part of pdp10-tools. %%% @@ -23,11 +23,8 @@ %% Command-line interface ====================================================== +-spec main([string()]) -> no_return(). main(Argv) -> - escript_runtime:start(fun main_/1, Argv). - --spec main_([string()]) -> no_return(). -main_(Argv) -> case my_getopt:parse(Argv, "vo:", [ {"version", no, version} ]) of diff --git a/erlang/apps/ld/src/ld.erl b/erlang/apps/ld/src/ld.erl index 94cfe32..e797ac5 100644 --- a/erlang/apps/ld/src/ld.erl +++ b/erlang/apps/ld/src/ld.erl @@ -1,7 +1,7 @@ %%% -*- erlang-indent-level: 2 -*- %%% %%% 'ld' clone for pdp10-elf -%%% Copyright (C) 2020-2021 Mikael Pettersson +%%% Copyright (C) 2020-2023 Mikael Pettersson %%% %%% This file is part of pdp10-tools. %%% @@ -40,11 +40,8 @@ %% Command-line interface ====================================================== +-spec main([string()]) -> no_return(). main(Argv) -> - escript_runtime:start(fun main_/1, Argv). - --spec main_([string()]) -> no_return(). -main_(Argv) -> case ld(Argv) of ok -> halt(0); {error, Reason} -> diff --git a/erlang/apps/lib/src/escript_runtime.erl b/erlang/apps/lib/src/escript_runtime.erl index 0dd87d6..7c60360 100644 --- a/erlang/apps/lib/src/escript_runtime.erl +++ b/erlang/apps/lib/src/escript_runtime.erl @@ -1,7 +1,7 @@ %%% -*- erlang-indent-level: 2 -*- %%% %%% Runtime support for stand-alone programs started as escripts. -%%% Copyright (C) 2018-2020 Mikael Pettersson +%%% Copyright (C) 2018-2023 Mikael Pettersson %%% %%% This file is part of pdp10-tools. %%% @@ -24,21 +24,8 @@ , fatal/2 , fmterr/2 , progname/0 - , start/2 ]). -%% TODO: remove when we're on OTP >= 24 -%% escript logs unhandled exceptions to standard output, but we want them to -%% end up on standard error --spec start(fun(([string()]) -> any()), [string()]) -> any(). -start(Main, Argv) -> - try - Main(Argv) - catch Class:Reason:Stacktrace -> - fmterr("~s: Unhandled exception ~p:~p\n~p\n", [progname(), Class, Reason, Stacktrace]), - halt(1) - end. - -spec fatal(io:format(), [term()]) -> no_return(). fatal(Fmt, Args) -> errmsg(Fmt, Args), diff --git a/erlang/apps/nm/src/nm.erl b/erlang/apps/nm/src/nm.erl index c906197..c19a02c 100644 --- a/erlang/apps/nm/src/nm.erl +++ b/erlang/apps/nm/src/nm.erl @@ -1,7 +1,7 @@ %%% -*- erlang-indent-level: 2 -*- %%% %%% 'nm' clone for pdp10-elf -%%% Copyright (C) 2013-2021 Mikael Pettersson +%%% Copyright (C) 2013-2023 Mikael Pettersson %%% %%% This file is part of pdp10-tools. %%% @@ -39,11 +39,8 @@ %% Command-line interface ====================================================== +-spec main([string()]) -> no_return(). main(Argv) -> - escript_runtime:start(fun main_/1, Argv). - --spec main_([string()]) -> no_return(). -main_(Argv) -> %% NYI options: %% -a / --debug-syms %% --demangle diff --git a/erlang/apps/od/src/od.erl b/erlang/apps/od/src/od.erl index c248bc0..3622198 100644 --- a/erlang/apps/od/src/od.erl +++ b/erlang/apps/od/src/od.erl @@ -1,7 +1,7 @@ %%% -*- erlang-indent-level: 2 -*- %%% %%% 'od' clone for files with 9-bit bytes -%%% Copyright (C) 2013-2021 Mikael Pettersson +%%% Copyright (C) 2013-2023 Mikael Pettersson %%% %%% This file is part of pdp10-tools. %%% @@ -38,11 +38,8 @@ %% Command-line interface ====================================================== +-spec main([string()]) -> no_return(). main(Argv) -> - escript_runtime:start(fun main_/1, Argv). - --spec main_([string()]) -> no_return(). -main_(Argv) -> case my_getopt:parse(Argv, "VbcdDiloOsxXA:j:N:t:w::", [ {"version", no, $V} , {"address-radix", required, $A} diff --git a/erlang/apps/readelf/src/readelf.erl b/erlang/apps/readelf/src/readelf.erl index edeb7bd..799c8b0 100644 --- a/erlang/apps/readelf/src/readelf.erl +++ b/erlang/apps/readelf/src/readelf.erl @@ -1,7 +1,7 @@ %%% -*- erlang-indent-level: 2 -*- %%% %%% 'readelf' clone for pdp10-elf -%%% Copyright (C) 2013-2021 Mikael Pettersson +%%% Copyright (C) 2013-2023 Mikael Pettersson %%% %%% This file is part of pdp10-tools. %%% @@ -46,11 +46,8 @@ %% Command-line interface ====================================================== +-spec main([string()]) -> no_return(). main(Argv) -> - escript_runtime:start(fun main_/1, Argv). - --spec main_([string()]) -> no_return(). -main_(Argv) -> case my_getopt:parse(Argv, "ahlSgtesnrudVADcIvW", [ %% long-only options diff --git a/erlang/apps/sim/src/sim.erl b/erlang/apps/sim/src/sim.erl index 8a2e321..5c621be 100644 --- a/erlang/apps/sim/src/sim.erl +++ b/erlang/apps/sim/src/sim.erl @@ -1,7 +1,7 @@ %%% -*- erlang-indent-level: 2 -*- %%% %%% simulator for pdp10-elf -%%% Copyright (C) 2020-2021 Mikael Pettersson +%%% Copyright (C) 2020-2023 Mikael Pettersson %%% %%% This file is part of pdp10-tools. %%% @@ -33,11 +33,8 @@ %% Command-line interface ====================================================== +-spec main([string()]) -> no_return(). main(Argv) -> - escript_runtime:start(fun main_/1, Argv). - --spec main_([string()]) -> no_return(). -main_(Argv) -> case sim(Argv) of ok -> halt(0); {error, Reason} ->