Simplify stacktrace_build

Signed-off-by: Davide Bettio <[email protected]>

Author: bettio

src/libAtomVM/context.c

@@ -1163,7 +1163,7 @@ COLD_FUNC void context_dump(Context *ctx)
     fprintf(stderr, "\n");
 
     fprintf(stderr, "\nStacktrace:\n");
-    term_display(stderr, stacktrace_build(ctx, &ctx->exception_stacktrace, 3), ctx);
+    term_display(stderr, stacktrace_build(ctx), ctx);
     fprintf(stderr, "\n\n");
 
     {

src/libAtomVM/opcodesswitch.h

@@ -4063,8 +4063,7 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
                             break;
 
                         case ERROR_ATOM_INDEX: {
-                            x_regs[2] = ctx->exception_stacktrace;
-                            x_regs[2] = stacktrace_build(ctx, &x_regs[2], 3);
+                            x_regs[2] = stacktrace_build(ctx);
                             // MEMORY_CAN_SHRINK because catch_end is classified as gc in beam_ssa_codegen.erl
                             if (UNLIKELY(memory_ensure_free_with_roots(ctx, TUPLE_SIZE(2) * 2, 2, x_regs + 1, MEMORY_CAN_SHRINK) != MEMORY_GC_OK)) {
                                 RAISE_ERROR(OUT_OF_MEMORY_ATOM);
@@ -6574,8 +6573,7 @@ HOT_FUNC int scheduler_entry_point(GlobalContext *glb)
                 TRACE("build_stacktrace/0\n");
 
                 #ifdef IMPL_EXECUTE_LOOP
-                    x_regs[0] = ctx->exception_stacktrace;
-                    x_regs[0] = stacktrace_build(ctx, &x_regs[0], 1);
+                    x_regs[0] = stacktrace_build(ctx);
                 #endif
                 break;
             }

src/libAtomVM/stacktrace.c

@@ -33,7 +33,7 @@ term stacktrace_create_raw(Context *ctx, Module *mod, int current_offset, term e
     return exception_class;
 }
 
-term stacktrace_build(Context *ctx, term *stack_info, uint32_t live)
+term stacktrace_build(Context *ctx)
 {
     UNUSED(ctx);
     UNUSED(stack_info);
@@ -257,38 +257,41 @@ static term find_path_created(const void *key, struct ModulePathPair *module_pat
     return term_invalid_term();
 }
 
-term stacktrace_build(Context *ctx, term *stack_info, uint32_t live)
+term stacktrace_build(Context *ctx)
 {
     GlobalContext *glb = ctx->global;
 
-    if (*stack_info == OUT_OF_MEMORY_ATOM) {
-        return *stack_info;
+    term stack_info = ctx->exception_stacktrace;
+
+    if (stack_info == OUT_OF_MEMORY_ATOM) {
+        return stack_info;
     }
-    if (!term_is_tuple(*stack_info)) {
+    if (!term_is_tuple(stack_info)) {
         return UNDEFINED_ATOM;
     }
 
-    int num_frames = term_to_int(term_get_tuple_element(*stack_info, 0));
-    int num_aux_terms = term_to_int(term_get_tuple_element(*stack_info, 1));
-    int filename_lens = term_to_int(term_get_tuple_element(*stack_info, 2));
-    int num_mods = term_to_int(term_get_tuple_element(*stack_info, 3));
+    int num_frames = term_to_int(term_get_tuple_element(stack_info, 0));
+    int num_aux_terms = term_to_int(term_get_tuple_element(stack_info, 1));
+    int filename_lens = term_to_int(term_get_tuple_element(stack_info, 2));
+    int num_mods = term_to_int(term_get_tuple_element(stack_info, 3));
 
     struct ModulePathPair *module_paths = malloc(num_mods * sizeof(struct ModulePathPair));
     if (IS_NULL_PTR(module_paths)) {
         fprintf(stderr, "Unable to allocate space for module paths.  Returning raw stacktrace.\n");
-        return *stack_info;
+        return stack_info;
     }
 
     //
     // [{module, function, arity, [{file, string()}, {line, int}]}, ...]
     //
     size_t requested_size = (TUPLE_SIZE(4) + 2) * num_frames + num_aux_terms * (4 + 2 * TUPLE_SIZE(2)) + 2 * filename_lens;
-    if (UNLIKELY(memory_ensure_free_with_roots(ctx, requested_size, live, ctx->x, MEMORY_CAN_SHRINK) != MEMORY_GC_OK)) {
+    if (UNLIKELY(memory_ensure_free_opt(ctx, requested_size, MEMORY_CAN_SHRINK) != MEMORY_GC_OK)) {
         free(module_paths);
         return OUT_OF_MEMORY_ATOM;
     }
+    stack_info = ctx->exception_stacktrace;
 
-    term raw_stacktrace = term_get_tuple_element(*stack_info, 4);
+    term raw_stacktrace = term_get_tuple_element(stack_info, 4);
 
     term stacktrace = term_nil();
     term el = raw_stacktrace;

src/libAtomVM/stacktrace.h

@@ -37,7 +37,7 @@ term stacktrace_create_raw(Context *ctx, Module *mod, int current_offset, term e
  * @param live          number of x registers to preserve, which should include stack_info
  * @return the built stack trace
  */
-term stacktrace_build(Context *ctx, term *stack_info, uint32_t live);
+term stacktrace_build(Context *ctx);
 term stacktrace_exception_class(term stack_info);
 
 #ifdef __cplusplus