diff --git a/VersionNum b/VersionNum index e65c4a11b5080497d826117dbb65f4f9574d79a2..db70fe72ff7e3582d5401cc90ad92f4f92975164 100644 --- a/VersionNum +++ b/VersionNum @@ -1,23 +1,21 @@ -/* (1.38) +/* (1.39) * * This file is automatically maintained by srccommit, do not edit manually. - * Last processed by srccommit version: 1.1. * */ -#define Module_MajorVersion_CMHG 1.38 -#define Module_MinorVersion_CMHG -#define Module_Date_CMHG 29 Mar 2015 +#define Module_MajorVersion_CMHG 1.39 +#define Module_MinorVersion_CMHG +#define Module_Date_CMHG 02 Jan 2021 -#define Module_MajorVersion "1.38" -#define Module_Version 138 +#define Module_MajorVersion "1.39" +#define Module_Version 139 #define Module_MinorVersion "" -#define Module_Date "29 Mar 2015" +#define Module_Date "02 Jan 2021" -#define Module_ApplicationDate "29-Mar-15" +#define Module_ApplicationDate "02-Jan-21" -#define Module_ComponentName "Patch" -#define Module_ComponentPath "castle/RiscOS/Sources/Utilities/Patches/Patch" +#define Module_ComponentName "PatchesPatch" -#define Module_FullVersion "1.38" -#define Module_HelpVersion "1.38 (29 Mar 2015)" -#define Module_LibraryVersionInfo "1:38" +#define Module_FullVersion "1.39" +#define Module_HelpVersion "1.39 (02 Jan 2021)" +#define Module_LibraryVersionInfo "1:39" diff --git a/s/Help b/s/Help deleted file mode 100644 index 088bab5a8b52d5471c1d975984923de89053c6c3..0000000000000000000000000000000000000000 --- a/s/Help +++ /dev/null @@ -1,17 +0,0 @@ -; Copyright 1996 Acorn Computers Ltd -; -; Licensed under the Apache License, Version 2.0 (the "License"); -; you may not use this file except in compliance with the License. -; You may obtain a copy of the License at -; -; http://www.apache.org/licenses/LICENSE-2.0 -; -; Unless required by applicable law or agreed to in writing, software -; distributed under the License is distributed on an "AS IS" BASIS, -; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -; See the License for the specific language governing permissions and -; limitations under the License. -; -# UnSqueeze *Help Messages file - -UnSqueeze:*UnSqueeze unsqueezes an application. diff --git a/s/Syntax b/s/Syntax deleted file mode 100644 index c2396a4269f7da7d878e99ebab1a226a30f8cb18..0000000000000000000000000000000000000000 --- a/s/Syntax +++ /dev/null @@ -1,17 +0,0 @@ -; Copyright 1996 Acorn Computers Ltd -; -; Licensed under the Apache License, Version 2.0 (the "License"); -; you may not use this file except in compliance with the License. -; You may obtain a copy of the License at -; -; http://www.apache.org/licenses/LICENSE-2.0 -; -; Unless required by applicable law or agreed to in writing, software -; distributed under the License is distributed on an "AS IS" BASIS, -; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -; See the License for the specific language governing permissions and -; limitations under the License. -; -# UnSqueeze Syntax Messages file - -UnSqueeze:Syntax: *UnSqueeze [] diff --git a/s/UnSqueeze b/s/UnSqueeze index 5562add555936deb7fa4cc61296d5d5da6857de9..7190919953797f23d95bd1c4f7fdea1065a35cbb 100644 --- a/s/UnSqueeze +++ b/s/UnSqueeze @@ -62,7 +62,7 @@ UnSqueeze_Title DCB "UnSqueeze", 0 UnSqueeze_HelpStr - DCB "UnSqueeze", 9, "1.28 (29 Mar 2015)", 0 + DCB "UnSqueeze", 9, "1.29 (28 Dec 2020)", 0 GET TokHelpSrc.s @@ -235,6 +235,8 @@ load_slot_ok LDR r0, bl_decompress ; Instruction TEQ r0, #&FB000000 ; Code if not squeezed + LDRNE r1, my_nop + TEQNE r0, r1 ; Alternative NOP code if not squeezed BEQ error_not_squeezed ; Check if it is a BL instruction. @@ -555,6 +557,8 @@ ldr_pc_pc_minus_4 LDR pc, [pc, #-4] ; Gets us back into module code my_swi_exit SWI OS_Exit ; Checked against in AIF image +my_nop + MOV r0, r0 ; Checked against in AIF image ; --------------------------------------------------------------------------