Commit 7439cb45 authored by Robert Sprowson's avatar Robert Sprowson Committed by ROOL
Browse files

Fix abort after translating error

Reporting invalid parameters to OS_Pointer and OS_ConvertDateAndTime could wander off to bad places due to corrupt LR and/or stack imbalance.
parent 81b079e8
...@@ -735,12 +735,9 @@ NetStation_Code ROUT ...@@ -735,12 +735,9 @@ NetStation_Code ROUT
40 40
[ International [ International
BL TranslateError BL TranslateError
]
Pull "r1, r9, lr" Pull "r1, r9, lr"
B SLVK_SetV B SLVK_SetV
|
Pull "r1, r9, lr"
B SLVK_SetV
]
NetToDec NetToDec
Push "lr" Push "lr"
...@@ -817,6 +814,7 @@ DateTime_Code ...@@ -817,6 +814,7 @@ DateTime_Code
[ International [ International
BL TranslateError BL TranslateError
] ]
Pull "R3-R4, R14"
B SLVK_SetV B SLVK_SetV
END END
...@@ -332,7 +332,9 @@ PointerSWI ...@@ -332,7 +332,9 @@ PointerSWI
10 10
ADRL r0, ErrorBlock_BadParameters ADRL r0, ErrorBlock_BadParameters
[ International [ International
Push "lr"
BL TranslateError BL TranslateError
Pull "lr"
] ]
B SLVK_SetV B SLVK_SetV
......
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