Commit ae6fe48b authored by ROOL's avatar ROOL 🤖
Browse files

Fix switch to wrong mode in AbortFindHandler

Detail:
  Was (trying to) clear the M32 flag in {CONFIG}=32.
  Ref: https://www.riscosopen.org/forum/forums/1/topics/15080?page=1#posts-99441
  Makefile updated to only pass rlib's txt switch when building rlib.

Version 6.05. Tagged as 'RISC_OSLib-6_05'
parent eef62ec8
......@@ -126,12 +126,11 @@ VPATH = @ kernel clib rlib
#
# Rule patterns
#
# Note
.c.o:; ${CC} ${CFLAGS} -fah ${CLFLAGS} -o $@ $<
.c.m_o:; ${CC} ${CFLAGS} -ffah -zM ${CLFLAGS} -o $@ $<
.c.rm_o:; ${CC} ${CFLAGS} -ffah -zm1 ${CSFLAGS} ${OPTIONS} -o $@ $<
.c.o_rl:; ${CC} ${CFLAGS} -fah ${DFLAGS} -o $@ $<
.c.m_o_rl:; ${CC} ${CFLAGS} -ffah ${DFLAGS} -zM -o $@ $<
.c.rm_o:; ${CC} ${CFLAGS} -ffah ${DFLAGS} -zm1 ${CSFLAGS} ${OPTIONS} -o $@ $<
.c.rm_o_rl:; ${CC} ${CFLAGS} -ffah ${DFLAGS} -zm1 ${CSFLAGS} ${OPTIONS} -o $@ $<
.s.o:; ${AS} ${AFLAGS} ${ALFLAGS} $< $@
.s.m_o:; ${AS} ${AFLAGS} ${ALFLAGS} $< $@
......
......@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
Module_MajorVersion SETS "6.04"
Module_Version SETA 604
Module_MajorVersion SETS "6.05"
Module_Version SETA 605
Module_MinorVersion SETS ""
Module_Date SETS "22 Apr 2020"
Module_ApplicationDate SETS "22-Apr-20"
Module_Date SETS "06 May 2020"
Module_ApplicationDate SETS "06-May-20"
Module_ComponentName SETS "RISC_OSLib"
Module_FullVersion SETS "6.04"
Module_HelpVersion SETS "6.04 (22 Apr 2020)"
Module_FullVersion SETS "6.05"
Module_HelpVersion SETS "6.05 (06 May 2020)"
END
/* (6.04)
/* (6.05)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 6.04
#define Module_MajorVersion_CMHG 6.05
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 22 Apr 2020
#define Module_Date_CMHG 06 May 2020
#define Module_MajorVersion "6.04"
#define Module_Version 604
#define Module_MajorVersion "6.05"
#define Module_Version 605
#define Module_MinorVersion ""
#define Module_Date "22 Apr 2020"
#define Module_Date "06 May 2020"
#define Module_ApplicationDate "22-Apr-20"
#define Module_ApplicationDate "06-May-20"
#define Module_ComponentName "RISC_OSLib"
#define Module_FullVersion "6.04"
#define Module_HelpVersion "6.04 (22 Apr 2020)"
#define Module_LibraryVersionInfo "6:4"
#define Module_FullVersion "6.05"
#define Module_HelpVersion "6.05 (06 May 2020)"
#define Module_LibraryVersionInfo "6:5"
......@@ -1116,7 +1116,7 @@ AbortFindHandler Keep
BICNE a1, a1, #PSRVBit
TEQP a1, #0
02
|
|
[ No32bitCode
TEQP pc, #PSRIBit:OR:PSRVBit ; user mode
|
......@@ -1124,9 +1124,9 @@ AbortFindHandler Keep
ORR a1, a1, #PSR32IBit ; may not need this
ORR a1, a1, #PSRVBit
[ {CONFIG}=26
BIC a1, a1, #PSR32Privileged ; into USR26 mode
BIC a1, a1, #PSR32Mode ; into USR26 mode
|
BIC a1, a1, #PSR32Mode ; into USR32 mode
BIC a1, a1, #PSR32Privileged ; into USR32 mode
]
MSR CPSR_cf, a1 ; switch to user mode
]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment