miloignis/kraken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Struct copying should work. Now it's just making them be parameters and return values

Browse Source
This commit is contained in:
Nathan Braswell
2018-03-16 01:20:44 -04:00
parent 5ebb6d5482
commit eaa22e1d11
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
stdlib/bytecode_generator.krak
View File

@@ -381,7 +381,10 @@ obj bytecode_generator (Object) {
functions.last().var_to_frame_offset[identifier] = -functions.last().frame_size functions.last().var_to_frame_offset[identifier] = -functions.last().frame_size
if (node->declaration_statement.expression) { if (node->declaration_statement.expression) {
// STRUCT HERE // STRUCT HERE
emit_str(1, functions.last().var_to_frame_offset[identifier], generate(node->declaration_statement.expression), size_to_operand_size(type_size(get_ast_type(identifier)))) if (ident_type->is_object() && ident_type->indirection == 0)
emit_struct_copy(1, functions.last().var_to_frame_offset[identifier], generate(node->declaration_statement.expression), 0, get_ast_type(identifier))
else
emit_str(1, functions.last().var_to_frame_offset[identifier], generate(node->declaration_statement.expression), size_to_operand_size(type_size(get_ast_type(identifier))))
reset_reg() reset_reg()
} }
return -1 return -1
@@ -389,8 +392,12 @@ obj bytecode_generator (Object) {
fun generate_assignment_statement(node: *ast_node): int { fun generate_assignment_statement(node: *ast_node): int {
var from = generate(node->assignment_statement.from) var from = generate(node->assignment_statement.from)
var to = generate(node->assignment_statement.to, true) var to = generate(node->assignment_statement.to, true)
var var_type = get_ast_type(node->assignment_statement.to)
// STRUCT HERE // STRUCT HERE
emit_str(to, 0, from, size_to_operand_size(type_size(get_ast_type(node->assignment_statement.to)))) if (var_type->is_object() && var_type->indirection == 0)
emit_struct_copy(to, 0, from, 0, var_type)
else
emit_str(to, 0, from, size_to_operand_size(type_size(var_type)))
reset_reg() reset_reg()
return -1 return -1
} }
@@ -695,6 +702,19 @@ obj bytecode_generator (Object) {
ast_name_map.set(node, result) ast_name_map.set(node, result)
return result return result
} }
fun emit_struct_copy(to: int, to_offset: int, from: int, from_offset: int, t: *type) {
for (var i = 0; i < t->type_def->type_def.variables.size; i++;) {
var member_var = t->type_def->type_def.variables[i]->declaration_statement.identifier
var member_type = get_ast_type(member_var)
var member_offset = offset_into_struct(t, member_var)
if (member_type->is_object() && member_type->indirection == 0) {
emit_struct_copy(to, (to_offset + member_offset) cast int, from, (from_offset + member_offset) cast int, member_type)
} else {
var member_size = size_to_operand_size(type_size(member_type))
emit_str(to, (to_offset + member_offset) cast int, emit_ldr(from, (from_offset + member_offset) cast int, member_size), member_size)
}
}
}
fun emit_imm(value: ulong): int { return emit_imm((value) cast int); } fun emit_imm(value: ulong): int { return emit_imm((value) cast int); }
fun emit_imm(value: int): int { fun emit_imm(value: int): int {
var i: imm var i: imm