From b7a14aa41c9934dc5ccc9fcbbb70a61f486a80a5 Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Wed, 10 Apr 2024 13:36:52 -0700 Subject: [PATCH] explicitly show error if decoding line machine code or line info fails --- src/df/core/df_core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/df/core/df_core.c b/src/df/core/df_core.c index 74740ff8..dee9b54a 100644 --- a/src/df/core/df_core.c +++ b/src/df/core/df_core.c @@ -7378,10 +7378,17 @@ df_core_begin_frame(Arena *arena, DF_CmdList *cmds, F32 dt) { df_ctrl_run(DF_RunKind_Step, thread, 0, &traps); } - if(good && traps.count == 0) + if(good && traps.count == 0 && core_cmd_kind == DF_CoreCmdKind_StepIntoInst) { df_ctrl_run(DF_RunKind_SingleStep, thread, 0, &traps); } + if(good && traps.count == 0 && core_cmd_kind != DF_CoreCmdKind_StepIntoInst) + { + DF_CmdParams p = params; + p.string = str8_lit("Could not read the instruction pointer's current line information."); + df_cmd_params_mark_slot(&p, DF_CmdParamSlot_String); + df_cmd_list_push(arena, cmds, &p, df_cmd_spec_from_core_cmd_kind(DF_CoreCmdKind_Error)); + } } }break; case DF_CoreCmdKind_Halt: