diff --git a/.dockerignore b/.dockerignore index 84ab1203..16ed54d3 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,7 +1,3 @@ -# This file is part of RGBDS. -# -# Copyright (c) 2018-2019, Phil Smith and RGBDS contributors. -# # SPDX-License-Identifier: MIT .git docs diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 4d079de3..00000000 --- a/AUTHORS +++ /dev/null @@ -1,21 +0,0 @@ -# This is the list of RGBDS's significant contributors. -# -# This does not necessarily list everyone who has contributed code. -# To see the full list of contributors, see the revision history in -# source control. - -Anthony J. Bentley -Antonio Niño Díaz -Antonio Vivace -Ben Hetherington (Ben10do) -Carsten Sørensen -David Brotz -Eldred Habert (ISSOtm) -Jakub Kądziołka -James Larrowe (JL2210) -Justin Lloyd (Otaku no Zoku) -Sanqui -stag019 -Sylvie Oukaour (Rangi42) -Vegard Nossum -yenatch (padz) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab83a7ef..0720d148 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,4 @@ -# -# This file is part of RGBDS. -# -# Copyright (c) 2020 RGBDS contributors. -# # SPDX-License-Identifier: MIT -# # 3.9 required for LTO checks cmake_minimum_required(VERSION 3.9 FATAL_ERROR) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 4b2341a8..16eed0b1 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -21,7 +21,7 @@ Main contributors - Eldred "ISSOtm" Habert -- Rangi +- Sylvie "Rangi" Oukaour Other contributors ------------------ diff --git a/Makefile b/Makefile index d654b280..6e28b5b3 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,4 @@ -# -# This file is part of RGBDS. -# -# Copyright (c) 1997-2018, Carsten Sorensen and RGBDS contributors. -# # SPDX-License-Identifier: MIT -# .SUFFIXES: .SUFFIXES: .cpp .y .o @@ -140,7 +134,7 @@ test/gfx/rgbgfx_test: test/gfx/rgbgfx_test.cpp # We want the Bison invocation to pass through our rules, not default ones .y.o: -# Bison-generated C files have an accompanying header +# Bison-generated C++ files have an accompanying header src/asm/parser.hpp: src/asm/parser.cpp $Qtouch $@ diff --git a/README.rst b/README.rst index 8b4c58ac..6edad107 100644 --- a/README.rst +++ b/README.rst @@ -95,7 +95,7 @@ The RGBDS source code file structure somewhat resembles the following: * ``bash_compl`` contains tab completion scripts for use with bash. Run them with ``source`` somewhere in your ``.bashrc``, and they should load every time you open a shell. -- ``include/`` - header files for each respective C files in `src`. +- ``include/`` - header files for the respective source files in `src`. - ``man/`` - manual pages. @@ -106,13 +106,13 @@ The RGBDS source code file structure somewhat resembles the following: - ``test/`` - testing framework used to verify that changes to the code don't break or modify the behavior of RGBDS. -- ``.clang-format`` - code style for automated formatting with |clang-format|_. The C code does not currently follow this style, but all C++ code should. +- ``.clang-format`` - code style for automated C++ formatting with |clang-format|_. 3. History ---------- - Around 1997, Carsten Sørensen (AKA SurfSmurf) writes ASMotor as a - general-purpose assembler/linker system for DOS/Win32 + general-purpose assembler/linker system for DOS/Win32. - Around 1999, Justin Lloyd (AKA Otaku no Zoku) adapts ASMotor to read and produce GBZ80 assembly/machine code, and releases this version as RGBDS. @@ -122,7 +122,7 @@ The RGBDS source code file structure somewhat resembles the following: `GitHub `__. - 2010, Anthony J. Bentley forks that repository. The fork becomes the reference - implementation of rgbds. + implementation of RGBDS. - 2017, Bentley's repository is moved to a neutral name. diff --git a/contrib/checkdiff.bash b/contrib/checkdiff.bash index f9a2ed86..18abb1c9 100755 --- a/contrib/checkdiff.bash +++ b/contrib/checkdiff.bash @@ -1,26 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: MIT -# -# Copyright (c) 2021 Rangi -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. declare -A FILES while read -r -d '' file; do diff --git a/contrib/gbdiff.bash b/contrib/gbdiff.bash index 96430c56..9d852937 100755 --- a/contrib/gbdiff.bash +++ b/contrib/gbdiff.bash @@ -1,26 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: MIT -# -# Copyright (c) 2020 Eldred Habert -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. STATE=0 diff <(xxd "$1") <(xxd "$2") | while read -r LINE; do diff --git a/include/extern/getopt.hpp b/include/extern/getopt.hpp index af238ec2..ad353dda 100644 --- a/include/extern/getopt.hpp +++ b/include/extern/getopt.hpp @@ -1,25 +1,4 @@ -/* - * Copyright © 2005-2020 Rich Felker, et al. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ +/* SPDX-License-Identifier: MIT */ /* This implementation was taken from musl and modified for RGBDS */ diff --git a/src/extern/getopt.cpp b/src/extern/getopt.cpp index e065a744..0a79c767 100644 --- a/src/extern/getopt.cpp +++ b/src/extern/getopt.cpp @@ -1,8 +1,4 @@ -/* - * Copyright (c) 2005-2020 Rich Felker, et al. - * - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: MIT */ /* This implementation was taken from musl and modified for RGBDS */ diff --git a/src/extern/utf8decoder.cpp b/src/extern/utf8decoder.cpp index 7bc95f2a..0898dd4f 100644 --- a/src/extern/utf8decoder.cpp +++ b/src/extern/utf8decoder.cpp @@ -1,12 +1,6 @@ -/* - * Copyright (c) 2008-2009, Björn Höhrmann - * - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: MIT */ -/* - * UTF-8 decoder: http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ - */ +/* UTF-8 decoder: http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ */ #include diff --git a/src/opmath.cpp b/src/opmath.cpp index 14fa650e..df283363 100644 --- a/src/opmath.cpp +++ b/src/opmath.cpp @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ -// Mathematical operators that don't reuse C's behavior +// Mathematical operators that don't reuse C++'s behavior #include @@ -74,7 +74,7 @@ int32_t op_shift_right(int32_t value, int32_t amount) // 1->0x80000000, 2->0xC0000000, ..., 31->0xFFFFFFFE uint32_t amount_high_bits = -(UINT32_C(1) << (32 - amount)); - // The C standard leaves shifting right negative values + // The C++ standard leaves shifting right negative values // undefined, so use a left shift manually sign-extended return ((uint32_t)value >> amount) | amount_high_bits; }