diff options
| -rw-r--r-- | assembler.c | 15 | ||||
| -rw-r--r-- | parser.c | 33 |
2 files changed, 27 insertions, 21 deletions
diff --git a/assembler.c b/assembler.c index 36cd2c0..df92f1e 100644 --- a/assembler.c +++ b/assembler.c @@ -120,12 +120,15 @@ void asm_translate_nodes(buffer_t **asm_buffer, struct PResult nodes, const char *src_name) { // First pass: Setup the ASM label array - struct Label labels[nodes.labels * 2]; - u64 label_ptr = 0; - for (size_t i = 0; i < nodes.size; ++i) - if (nodes.nodes[i].type == LIN || nodes.nodes[i].type == LOUT) - labels[label_ptr++] = - (struct Label){.cur = i, .next = nodes.nodes[i].loop_ref}; + struct Label labels[nodes.labels ? nodes.labels * 2 : 1]; + if (nodes.labels) + { + u64 label_ptr = 0; + for (size_t i = 0; i < nodes.size; ++i) + if (nodes.nodes[i].type == LIN || nodes.nodes[i].type == LOUT) + labels[label_ptr++] = + (struct Label){.cur = i, .next = nodes.nodes[i].loop_ref}; + } // Second pass: Translating to assembly for (size_t i = 0; i < nodes.size; ++i) @@ -121,26 +121,29 @@ struct PResult parse_buffer(buffer_t *buffer) } // Third pass: setup loop references - node_t *stack[loops]; - memset(stack, 0, loops); size_t stackptr = 0; - for (size_t i = 0; i < usable; ++i) + if (loops) { - node_t *node = nodes + i; - if (node->type == LIN) - stack[stackptr++] = node; - else if (node->type == LOUT) + node_t *stack[loops]; + memset(stack, 0, loops); + for (size_t i = 0; i < usable; ++i) { - if (stackptr == 0) + node_t *node = nodes + i; + if (node->type == LIN) + stack[stackptr++] = node; + else if (node->type == LOUT) { - print_error(buffer->name, node->row, node->col, - "ERROR: Unbalanced square brackets!"); - goto error; + if (stackptr == 0) + { + print_error(buffer->name, node->row, node->col, + "ERROR: Unbalanced square brackets!"); + goto error; + } + // Access last IN loop + --stackptr; + node->loop_ref = stack[stackptr] - nodes; + stack[stackptr]->loop_ref = i; } - // Access last IN loop - --stackptr; - node->loop_ref = stack[stackptr] - nodes; - stack[stackptr]->loop_ref = i; } } |