Fix backwards relative labels

assembler/assembler.c

@@ -72,10 +72,8 @@ void transform_local_labels(tokenized_expression_t *expression, const char *last
 	}
 }
 
-void transform_relative_labels(tokenized_expression_t *expression, int last_relative_label) {
-	int i;
-	for(i = 0; i < expression->tokens->length; i++) {
-		fflush(stderr);
+void transform_relative_labels(tokenized_expression_t *expression, int last_relative_label, const char *const file_name) {
+	for(int i = 0; i < expression->tokens->length; i++) {
 		expression_token_t *token = expression->tokens->items[i];
 		if (token->type != SYMBOL || strcmp(token->symbol, "_")) {
 			continue;
@@ -85,17 +83,27 @@ void transform_relative_labels(tokenized_expression_t *expression, int last_rela
 		int offset = get_relative_label_offset(expression, &j);
 		int relative_label = offset + last_relative_label;
 
-		const char *fmtstring = "relative@%d";
+		const char *fmtstring = "relative:%d@%s";
 		int len = log10_u64(relative_label);
-		const int size = strlen(fmtstring) - 2 + len + 1;
+		const int size = strlen(fmtstring) - 2 + len - 2 + strlen(file_name) + 1;
 		free(token->symbol);
 		token->symbol = malloc(size);
-		if (snprintf(token->symbol, size, fmtstring, relative_label) != size - 1) {
+		if (snprintf(token->symbol, size, fmtstring, relative_label, file_name) != size - 1) {
 			scas_log(L_ERROR, "UNREACHABLE");
 			exit(1);
 		}
 
 		scas_log(L_DEBUG, "Transformed relative label with offset %d to %s, %d - %d", offset, token->symbol, i, j);
+		while (i + 1 < expression->tokens->length) {
+			expression_token_t *next = expression->tokens->items[i + 1];
+			if (next->type == OPERATOR && next->operator == 1) {
+			free_expression_token(next);
+			list_del(expression->tokens, i + 1);
+			}
+			else {
+			break;
+			}
+		}
 	}
 }
 
@@ -344,15 +352,16 @@ int try_add_label(struct assembler_state *state, char **line) {
 		scas_log(L_DEBUG, "Adding ASxxxx local label %s", sym->name);
 		free(temp);
 	} else if (strncmp("_", *line, i) == 0) {
-		const char *fmtstring = "relative@%d";
+		const char *file_name = stack_peek(state->file_name_stack);
+		const char *fmtstring = "relative:%d@%s";
 		int len = log10_u64(state->last_relative_label);
-		const int size = strlen(fmtstring) - 2 + len + 1;
+		const int size = strlen(fmtstring) - 2 + len - 2 + strlen(file_name) + 1;
 		sym->name = malloc(size);
 		if (!sym->name) {
 			scas_log(L_ERROR, "OOM");
 			exit(1);
 		}
-		if (snprintf(sym->name, size, fmtstring, state->last_relative_label++) != size - 1) {
+		if (snprintf(sym->name, size, fmtstring, state->last_relative_label++, file_name) != size - 1) {
 			scas_log(L_ERROR, "Unreachable.");
 			exit(1);
 		}
@@ -425,7 +434,8 @@ int try_match_instruction(struct assembler_state *state, char **_line) {
 					state->line, state->column, stack_peek(state->file_name_stack));
 			} else {
 				transform_local_labels(expression, state->last_global_label);
-				transform_relative_labels(expression, state->last_relative_label);
+				const char *file_name = stack_peek(state->file_name_stack);
+				transform_relative_labels(expression, state->last_relative_label, file_name);
 				result = evaluate_expression(expression, state->equates, &error, &symbol);
 				if (error == EXPRESSION_BAD_SYMBOL) {
 					if (scas_runtime.options.explicit_import && strcmp(symbol, "$") != 0) {
@@ -437,7 +447,7 @@ int try_match_instruction(struct assembler_state *state, char **_line) {
 						unresolved_sym->file_name = strdup(stack_peek(state->file_name_stack));
 						list_add(state->object->unresolved, unresolved_sym);
 					}
-					scas_log(L_DEBUG, "Postponing evaluation of '%s' to linker", ref->value_provided);
+					scas_log(L_DEBUG, "Postponing evaluation of '%s' to linker (type %d)", ref->value_provided, imm->type);
 					late_immediate_t *late_imm = malloc(sizeof(late_immediate_t));
 					late_imm->instruction_address = state->current_area->data_length;
 					late_imm->base_address = state->PC + (match->instruction->width / 8);

include/assembler.h

@@ -30,7 +30,7 @@ struct assembler_state {
 	list_t *errors;
 	list_t *warnings;
 	list_t *extra_lines;
-    bool expanding_macro;
+	bool expanding_macro;
 	char *line;
 	int column;
 	instruction_set_t *instruction_set;
@@ -44,8 +44,8 @@ struct assembler_state {
 	char *last_global_label;
 	assembler_settings_t *settings;
 	macro_t *most_recent_macro;
-    bool auto_source_maps;
-    uint64_t last_relative_label;
+	bool auto_source_maps;
+	uint64_t last_relative_label;
 };
 
 object_t *assemble(FILE *file, const char *file_name, assembler_settings_t *settings);

linker/linker.c

@@ -52,6 +52,7 @@ void resolve_immediate_values(list_t *symbols, area_t *area, list_t *errors) {
 		int error;
 		char *symbol;
 		uint64_t result = evaluate_expression(imm->expression, symbols, &error, &symbol);
+
 		list_del(symbols, symbols->length - 1); // Remove $
 		if (error == EXPRESSION_BAD_SYMBOL) {
 			scas_log(L_ERROR, "Unable to find symbol for expression");