diff --git a/VersionASM b/VersionASM index 832f0fd2f251be06a6deafd409b765b63dd79f80..56d2cc5f34194b06f69406fc4b8721d1c8ced83e 100644 --- a/VersionASM +++ b/VersionASM @@ -6,9 +6,9 @@ GBLS Module_MinorVersion GBLS Module_Date GBLS Module_FullVersion -Module_MajorVersion SETS "5.10" -Module_Version SETA 510 +Module_MajorVersion SETS "5.11" +Module_Version SETA 511 Module_MinorVersion SETS "" Module_Date SETS "26 Jan 2000" -Module_FullVersion SETS "5.10" +Module_FullVersion SETS "5.11" END diff --git a/VersionNum b/VersionNum index 0704e737524ba21f836a5d4bc7bbd14be70fe431..c4ee4dccae2a6809610f551696c263b4c98f7e56 100644 --- a/VersionNum +++ b/VersionNum @@ -1,15 +1,15 @@ -/* (5.10) +/* (5.11) * * This file is automatically maintained by srccommit, do not edit manually. * */ -#define Module_MajorVersion_CMHG 5.10 +#define Module_MajorVersion_CMHG 5.11 #define Module_MinorVersion_CMHG #define Module_Date_CMHG 26 Jan 2000 -#define Module_MajorVersion "5.10" -#define Module_Version 510 +#define Module_MajorVersion "5.11" +#define Module_Version 511 #define Module_MinorVersion "" #define Module_Date "26 Jan 2000" -#define Module_FullVersion "5.10" +#define Module_FullVersion "5.11" diff --git a/s/vdu/vdupal20 b/s/vdu/vdupal20 index 0aa8ab873eac49671152195baf32e4a28fb3959f..fa0d7ef802f9619b2f22176258b387dfc51e52e0 100644 --- a/s/vdu/vdupal20 +++ b/s/vdu/vdupal20 @@ -824,8 +824,8 @@ PV_BulkRead ROUT ; 24 (read border colour) ; 25 (read cursor colour) ; -; out: R2 = first flash setting (BBGGRRS0), supremacy bit 7 -; R3 = second flash setting (BBGGRRS0), supremacy bit 7 +; out: R2 = first flash setting (BBGGRRS0), supremacy bits 4-7 +; R3 = second flash setting (BBGGRRS0), supremacy bits 4-7 ; PV_ReadPalette ROUT @@ -850,17 +850,19 @@ PV_ReadPalette ROUT ; note no need to fudge 256-colour modes, since we have the correct full 256 entry palette +; bjga: changed to handle 4 bits of supremacy (BulkRead already does) + LDR r10, [WsPtr, #FirPalAddr] LDR r10, [r10, r11, LSL #2] ; r10 := 1st XSBBGGRR MOV r2, r10, LSL #8 ; r2 := 1st BBGGRR00 - TST r10, #1 :SHL: 27 - ORRNE r2, r2, #&80 ; r2 := 1st BBGGRRS0 + AND r10, r10, #&0F000000 ; r10 := 1st 0S000000 + ORR r2, r2, r10, LSR #20 ; r2 := 1st BBGGRRS0 LDR r10, [WsPtr, #SecPalAddr] LDR r10, [r10, r11, LSL #2] ; r10 := 2nd XSBBGGRR MOV r3, r10, LSL #8 ; r3 := 2nd BBGGRR00 - TST r10, #1 :SHL: 27 - ORRNE r3, r3, #&80 ; r3 := 2nd BBGGRRS0 + AND r10, r10, #&0F000000 ; r10 := 2nd 0S000000 + ORR r3, r3, r10, LSR #20 ; r3 := 2nd BBGGRRS0 99 MOV r4, #0 Pull "r10, r11, pc"