Allow ZeroPage at any 64K aligned address

Change ZeroPage calculation so that ZeroPage can be at any 64K aligned address. Version 6.47. Not tagged

Allow ZeroPage at any 64K aligned address
Change ZeroPage calculation so that ZeroPage can be at any 64K aligned address. Version 6.47. Not tagged
4341900a · Timothy E Baldwin · ROOL · 4a56c45f · 4341900a · 4341900a
Commit 4341900a authored 9 years ago by Timothy E Baldwin Committed by ROOL 4 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 10 deletions

VersionASM VersionASM +3 -3

VersionNum VersionNum +4 -4

s/Kernel s/Kernel +3 -3

No files found.
--- a/VersionASM
+++ b/VersionASM
@@ -12,9 +12,9 @@
 Module_MajorVersion     SETS    "6.47"
 Module_Version          SETA    647
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "19 Dec 2020"
-Module_ApplicationDate  SETS    "19-Dec-20"
+Module_Date             SETS    "16 Jan 2021"
+Module_ApplicationDate  SETS    "16-Jan-21"
 Module_ComponentName    SETS    "Kernel"
 Module_FullVersion      SETS    "6.47"
-Module_HelpVersion      SETS    "6.47 (19 Dec 2020)"
+Module_HelpVersion      SETS    "6.47 (16 Jan 2021)"
                        END
--- a/VersionNum
+++ b/VersionNum
@@ -5,17 +5,17 @@
 */
 #define Module_MajorVersion_CMHG        6.47
 #define Module_MinorVersion_CMHG
-#define Module_Date_CMHG                19 Dec 2020
+#define Module_Date_CMHG                16 Jan 2021

 #define Module_MajorVersion             "6.47"
 #define Module_Version                  647
 #define Module_MinorVersion             ""
-#define Module_Date                     "19 Dec 2020"
+#define Module_Date                     "16 Jan 2021"

-#define Module_ApplicationDate          "19-Dec-20"
+#define Module_ApplicationDate          "16-Jan-21"

 #define Module_ComponentName            "Kernel"

 #define Module_FullVersion              "6.47"
-#define Module_HelpVersion              "6.47 (19 Dec 2020)"
+#define Module_HelpVersion              "6.47 (16 Jan 2021)"
 #define Module_LibraryVersionInfo       "6:47"
--- a/s/Kernel
+++ b/s/Kernel
@@ -1076,9 +1076,9 @@ $l      ModSWIHashval   $swino, $startreg
 $l      ModSWIHashvalOffset $swino, $startreg
        ADD     $swino, $swino, #ModuleSWI_HashTab
      [ ZeroPage <> 0
-        ASSERT ZeroPage = &FFFF0000
-        ADD     $swino, $swino, #&FF000000
-        ADD     $swino, $swino, #&00FF0000
+        ASSERT  (ZeroPage :AND: &FFFF) = 0
+        ADD     $swino, $swino, #(ZeroPage :AND: &FF000000)
+        ADD     $swino, $swino, #(ZeroPage :AND: &00FF0000)
      ]
        MEND