OSS/elna
1
0
Fork 0
Code Issues Releases Activity

Use add_ptr instruction for array access expressions

Browse Source
This commit is contained in:
Eugen Wissner
2026-04-08 22:07:00 +02:00
parent 4fb6b702b4
commit d11579d041
1 changed files with 35 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
boot/stage21/cl.elna
View File

@@ -990,18 +990,18 @@ proc elna_rtl_add_ptr(instructions: ^ElnaList, tac_instruction: ^ElnaTacInstruct
var var
result: ^ElnaRtlInstruction; result: ^ElnaRtlInstruction;
rtl_operand: ElnaRtlOperand; rtl_operand: ElnaRtlOperand;
intermediate: ElnaRtlOperand;
begin begin
elna_rtl_generate_pseudo(@intermediate, variable_map);
result := elna_rtl_instruction_create(ElnaRtlOperator.li); result := elna_rtl_instruction_create(ElnaRtlOperator.li);
elna_rtl_instruction_set_operand(result, 1, ElnaRtlKind.pseudo, elna_rtl_instruction_set_operand(result, 1, intermediate.kind, intermediate.value, intermediate.length, 0);
tac_instruction^.operands[4].value, tac_instruction^.operands[4].length, 0);
elna_rtl_instruction_set_operand(result, 2, ElnaRtlKind.immediate, tac_instruction^.operands[3].value, 0, 0); elna_rtl_instruction_set_operand(result, 2, ElnaRtlKind.immediate, tac_instruction^.operands[3].value, 0, 0);
elna_list_append(instructions, result); elna_list_append(instructions, result);
result := elna_rtl_instruction_create(ElnaRtlOperator.mul); result := elna_rtl_instruction_create(ElnaRtlOperator.mul);
elna_rtl_instruction_set_operand(result, 1, ElnaRtlKind.pseudo, elna_rtl_instruction_set_operand(result, 1, intermediate.kind, intermediate.value, intermediate.length, 0);
tac_instruction^.operands[4].value, tac_instruction^.operands[4].length, 0); elna_rtl_instruction_set_operand(result, 2, intermediate.kind, intermediate.value, intermediate.length, 0);
elna_rtl_instruction_set_operand(result, 2, ElnaRtlKind.pseudo,
tac_instruction^.operands[4].value, tac_instruction^.operands[4].length, 0);
elna_rtl_operand_value(instructions, @tac_instruction^.operands[2], variable_map, @rtl_operand); elna_rtl_operand_value(instructions, @tac_instruction^.operands[2], variable_map, @rtl_operand);
elna_rtl_instruction_set_operand(result, 3, rtl_operand.kind, rtl_operand.value, rtl_operand.length, 0); elna_rtl_instruction_set_operand(result, 3, rtl_operand.kind, rtl_operand.value, rtl_operand.length, 0);
elna_list_append(instructions, result); elna_list_append(instructions, result);
@@ -1011,9 +1011,7 @@ begin
tac_instruction^.operands[4].value, tac_instruction^.operands[4].length, 0); tac_instruction^.operands[4].value, tac_instruction^.operands[4].length, 0);
elna_rtl_operand_value(instructions, @tac_instruction^.operands[1], variable_map, @rtl_operand); elna_rtl_operand_value(instructions, @tac_instruction^.operands[1], variable_map, @rtl_operand);
elna_rtl_instruction_set_operand(result, 2, rtl_operand.kind, rtl_operand.value, rtl_operand.length, 0); elna_rtl_instruction_set_operand(result, 2, rtl_operand.kind, rtl_operand.value, rtl_operand.length, 0);
elna_rtl_instruction_set_operand(result, 3, ElnaRtlKind.pseudo, elna_rtl_instruction_set_operand(result, 3, intermediate.kind, intermediate.value, intermediate.length, 0);
tac_instruction^.operands[4].value, tac_instruction^.operands[4].length, 0);
elna_list_append(instructions, result) elna_list_append(instructions, result)
end; end;
@@ -1243,7 +1241,6 @@ var
target_operand: ElnaRtlOperand; target_operand: ElnaRtlOperand;
pseudo_symbol: ^ElnaRtlInfo; pseudo_symbol: ^ElnaRtlInfo;
begin begin
if tac_instruction^.operands[2].kind = ElnaTacKind.variable then
elna_rtl_operand_value(instructions, @tac_instruction^.operands[1], variable_map, @source_operand); elna_rtl_operand_value(instructions, @tac_instruction^.operands[1], variable_map, @source_operand);
pseudo_symbol := elna_symbol_table_lookup(variable_map, pseudo_symbol := elna_symbol_table_lookup(variable_map,
tac_instruction^.operands[2].value, tac_instruction^.operands[2].length); tac_instruction^.operands[2].value, tac_instruction^.operands[2].length);
@@ -1268,7 +1265,6 @@ begin
elna_rtl_instruction_set_operand(instruction, 2, source_operand.kind, source_operand.value, source_operand.length, 0); elna_rtl_instruction_set_operand(instruction, 2, source_operand.kind, source_operand.value, source_operand.length, 0);
elna_list_append(instructions, instruction); elna_list_append(instructions, instruction);
end end
end
end; end;
proc elna_rtl_instruction(instructions: ^ElnaList, tac_instruction: ^ElnaTacInstruction, variable_map: ^ElnaSymbolTable); proc elna_rtl_instruction(instructions: ^ElnaList, tac_instruction: ^ElnaTacInstruction, variable_map: ^ElnaSymbolTable);
@@ -2290,10 +2286,7 @@ var
instruction: ^ElnaTacInstruction; instruction: ^ElnaTacInstruction;
begin begin
if operand_result^.kind = ElnaTacOperandType.dereferenced_pointer then if operand_result^.kind = ElnaTacOperandType.dereferenced_pointer then
instruction := elna_tac_instruction_create(ElnaTacOperator.copy); memmove(to, from, #size(ElnaTacOperand))
elna_tac_instruction_set_operand(instruction, 1, from^.kind, from^.value, from^.length);
elna_tac_instruction_set_operand(instruction, 2, to^.kind, to^.value, to^.length);
elna_list_append(instructions, instruction)
elsif operand_result^.kind = ElnaTacOperandType.sub_object then elsif operand_result^.kind = ElnaTacOperandType.sub_object then
instruction := elna_tac_instruction_create(ElnaTacOperator.get_address); instruction := elna_tac_instruction_create(ElnaTacOperator.get_address);
elna_tac_instruction_set_operand(instruction, 1, from^.kind, from^.value, from^.length); elna_tac_instruction_set_operand(instruction, 1, from^.kind, from^.value, from^.length);
@@ -2844,9 +2837,7 @@ var
instruction: ^ElnaTacInstruction; instruction: ^ElnaTacInstruction;
operand_result: ElnaTacOperandResult; operand_result: ElnaTacOperandResult;
inter_operand: ElnaTacOperand; inter_operand: ElnaTacOperand;
index_type: Word; index_operand: ElnaTacOperand;
index_value: Word;
index_length: Word;
aggregate_type: ^ElnaTypeArray; aggregate_type: ^ElnaTypeArray;
designator_base: ^ElnaTreeExpression; designator_base: ^ElnaTreeExpression;
element_type: ^ElnaType; element_type: ^ElnaType;
@@ -2856,31 +2847,24 @@ begin
element_type := aggregate_type^.base; element_type := aggregate_type^.base;
elna_tac_binary_expression(instructions, array_access_expression^.index, symbol_table, @inter_operand); elna_tac_binary_expression(instructions, array_access_expression^.index, symbol_table, @inter_operand);
elna_tac_make_variable(@index_type, @index_value, @index_length, symbol_table); elna_tac_make_variable(@index_operand.kind, @index_operand.value, @index_operand.length, symbol_table);
instruction := elna_tac_instruction_create(ElnaTacOperator.subtract); instruction := elna_tac_instruction_create(ElnaTacOperator.subtract);
elna_tac_instruction_set_operand(instruction, 1, index_type, index_value, index_length); elna_tac_instruction_set_operand(instruction, 1, index_operand.kind, index_operand.value, index_operand.length);
elna_tac_instruction_set_operand(instruction, 2, inter_operand.kind, inter_operand.value, inter_operand.length); elna_tac_instruction_set_operand(instruction, 2, inter_operand.kind, inter_operand.value, inter_operand.length);
elna_tac_instruction_set_operand(instruction, 3, ElnaTacKind.constant, 1, 0); elna_tac_instruction_set_operand(instruction, 3, ElnaTacKind.constant, 1, 0);
elna_list_append(instructions, instruction); elna_list_append(instructions, instruction);
instruction := elna_tac_instruction_create(ElnaTacOperator.multiply);
elna_tac_instruction_set_operand(instruction, 1, index_type, index_value, index_length);
elna_tac_instruction_set_operand(instruction, 2, index_type, index_value, index_length);
elna_tac_instruction_set_operand(instruction, 3, ElnaTacKind.constant, element_type^.size, 0);
elna_list_append(instructions, instruction);
elna_tac_designator(instructions, array_access_expression^.array, elna_tac_designator(instructions, array_access_expression^.array,
symbol_table, @operand_result, @inter_operand); symbol_table, @operand_result, @inter_operand);
elna_tac_make_variable(@operand^.kind, @operand^.value, @operand^.length, symbol_table); elna_tac_make_variable(@operand^.kind, @operand^.value, @operand^.length, symbol_table);
elna_tac_copy_address(instructions, @operand_result, @inter_operand, operand); elna_tac_copy_address(instructions, @operand_result, @inter_operand, operand);
instruction := elna_tac_instruction_create(ElnaTacOperator.add); instruction := elna_tac_instruction_create(ElnaTacOperator.add_ptr);
elna_tac_instruction_set_operand(instruction, 1, operand^.kind, operand^.value, operand^.length); elna_tac_instruction_set_operand(instruction, 1, operand^.kind, operand^.value, operand^.length);
elna_tac_instruction_set_operand(instruction, 2, operand^.kind, operand^.value, operand^.length); elna_tac_instruction_set_operand(instruction, 2, index_operand.kind, index_operand.value, index_operand.length);
elna_tac_instruction_set_operand(instruction, 3, index_type, index_value, index_length); elna_tac_instruction_set_operand(instruction, 3, ElnaTacKind.constant, element_type^.size, 0);
elna_tac_instruction_set_operand(instruction, 4, operand^.kind, operand^.value, operand^.length);
elna_list_append(instructions, instruction) elna_list_append(instructions, instruction)
end; end;