Fix for garbled 'No such SWI' message

Remember to fill in the module title for %0.

Fix for garbled 'No such SWI' message
Remember to fill in the module title for %0.
72147877 · Robert Sprowson · ROOL · f49f2d8c · 72147877 · 72147877
Commit 72147877 authored May 25, 2021 by Robert Sprowson Committed by ROOL Jun 23, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 6 deletions

s/Errors s/Errors +0 -4

s/Module s/Module +9 -2

No files found.
--- a/s/Errors
+++ b/s/Errors
@@ -37,8 +37,4 @@
        MakeInternatErrorBlock  VFPSupport_Instanced,,E06
        MakeInternatErrorBlock  VFPSupport_BadFlags,,E07

-; Other errors
-
-        MakeInternatErrorBlock  ModuleBadSWI
-
        END
--- a/s/Module
+++ b/s/Module
@@ -633,8 +633,15 @@ JumpTable
 EndOfJumpTable

 UnknownSWI
-        ADRL    r0, ErrorBlock_ModuleBadSWI
-        B       ReturnError_LR
+        Push    "r1-r2,r4,lr"
+        ADR     r0, ErrorBlock_ModuleBadSWI
+        MOV     r1, #0 ; Global messages
+        MOV     r2, #0 ; Internal buffer
+        ADRL    r4, ModuleTitle
+        SWI     XMessageTrans_ErrorLookup ; Sets V
+        Pull    "r1-r2,r4,pc"
+
+        MakeErrorBlock ModuleBadSWI

 SWI_CheckContext
 ;  in: R0 = flags