Commit 98350188 authored by Jeffrey Lee's avatar Jeffrey Lee

Fix truncated error messages in annotated exception dumps. Fix Debugger$DumpOptions syntax error.

Detail:
  c/exc - The error message was being shoved into a 64 byte buffer, causing truncation. Rather than making the buffer bigger (trying to keep stack usage to a minimum), bypass the buffer and write the message straight to the output. Also add an extra newline at the end of DescribeBlocks so that the output doesn't run directly into the annotated R15/R14 that are output by AnnotateAll.
  Resources/Germany/Messages, Resources/UK/Messages - Update EXC_MSG_ERROR (X18) for the above. Remove Debugger$RawFile and Debugger$AnnotatedFile hint text from Debugger$DumpOptions syntax error message - CopyError wasn't causing the magic newline codes to be translated, and the error buffer (aka StringBuffer) is too small for such a long message anyway.
Admin:
  Tested on Raspberry Pi


Version 1.93. Tagged as 'Debugger-1_93'
parent 5e1d6cfb
No preview for this file type
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.92"
Module_Version SETA 192
Module_MajorVersion SETS "1.93"
Module_Version SETA 193
Module_MinorVersion SETS ""
Module_Date SETS "05 Apr 2016"
Module_ApplicationDate SETS "05-Apr-16"
Module_Date SETS "06 Apr 2016"
Module_ApplicationDate SETS "06-Apr-16"
Module_ComponentName SETS "Debugger"
Module_ComponentPath SETS "castle/RiscOS/Sources/Programmer/Debugger"
Module_FullVersion SETS "1.92"
Module_HelpVersion SETS "1.92 (05 Apr 2016)"
Module_FullVersion SETS "1.93"
Module_HelpVersion SETS "1.93 (06 Apr 2016)"
END
/* (1.92)
/* (1.93)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.92
#define Module_MajorVersion_CMHG 1.93
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 05 Apr 2016
#define Module_Date_CMHG 06 Apr 2016
#define Module_MajorVersion "1.92"
#define Module_Version 192
#define Module_MajorVersion "1.93"
#define Module_Version 193
#define Module_MinorVersion ""
#define Module_Date "05 Apr 2016"
#define Module_Date "06 Apr 2016"
#define Module_ApplicationDate "05-Apr-16"
#define Module_ApplicationDate "06-Apr-16"
#define Module_ComponentName "Debugger"
#define Module_ComponentPath "castle/RiscOS/Sources/Programmer/Debugger"
#define Module_FullVersion "1.92"
#define Module_HelpVersion "1.92 (05 Apr 2016)"
#define Module_LibraryVersionInfo "1:92"
#define Module_FullVersion "1.93"
#define Module_HelpVersion "1.93 (06 Apr 2016)"
#define Module_LibraryVersionInfo "1:93"
......@@ -939,8 +939,10 @@ static bool DescribeBlocks(exc_context_t *ctx)
}
break;
case ExcDump_Chunk_Error:
snprintf(temp,sizeof(temp),ExcGetMsg(ctx,EXC_MSG_BLOCK_ERROR), pos[2], (char*)&pos[3]);
snprintf(temp,sizeof(temp),ExcGetMsg(ctx,EXC_MSG_BLOCK_ERROR), pos[2]);
ctx->print(ctx->print_param,temp);
ctx->print(ctx->print_param,(char *) &pos[3]);
ctx->print(ctx->print_param,"\n");
break;
case ExcDump_Chunk_OSMem16:
for(int i=0;i<((blocklen-12)/4);i+=3)
......@@ -956,6 +958,7 @@ static bool DescribeBlocks(exc_context_t *ctx)
pos += blocklen/4;
len -= blocklen;
}
ctx->print(ctx->print_param,"\n");
return true;
}
......
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