From 418955c6229576f583cb2fb84038d45aa679ad1e Mon Sep 17 00:00:00 2001 From: Goren Barak Date: Tue, 21 Nov 2023 09:32:46 -0500 Subject: [PATCH] Got function calls working! --- src/codegen/fasm.rs | 75 +++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/src/codegen/fasm.rs b/src/codegen/fasm.rs index 2ac116e..224c5cd 100644 --- a/src/codegen/fasm.rs +++ b/src/codegen/fasm.rs @@ -12,42 +12,42 @@ pub fn fasm_codegen(exprs: &Vec, not_a_function: bool) -> String { asm_data.push_str("\nsegment readable writable\n"); } - let topush = if not_a_function { &mut asm_start } else { &mut asm_text }; + for expr in exprs.iter() { + // println!("{:?}", expr); - for mut expr in exprs.iter() { - match &mut expr { + match expr { Expr::MathExpr(e) => { - topush.push_str(format!("\tmov r10, {}\n", e.left.unwrap()).as_str()); - topush.push_str(format!("\tmov r11, {}\n", e.right.unwrap()).as_str()); + asm_start.push_str(format!("\tmov r10, {}\n", e.left.unwrap()).as_str()); + asm_start.push_str(format!("\tmov r11, {}\n", e.right.unwrap()).as_str()); match e.operator { // If the operator is addition. MathOperator::OP_ADD => { - topush.push_str("\tadd r10, r11\n"); - topush.push_str("\tmov rax, r10\n"); + asm_start.push_str("\tadd r10, r11\n"); + asm_start.push_str("\tmov rax, r10\n"); }, // If the operator is multiplication. MathOperator::OP_MULT => { - topush.push_str("\timul r10, r11\n"); - topush.push_str("\tmov rax, r10\n"); + asm_start.push_str("\timul r10, r11\n"); + asm_start.push_str("\tmov rax, r10\n"); }, // If the operator is division. MathOperator::OP_DIV => { - topush.push_str("\tmov rax, r10\n"); - topush.push_str("\txor rdx, rdx\n"); - topush.push_str("\tidiv r11\n"); + asm_start.push_str("\tmov rax, r10\n"); + asm_start.push_str("\txor rdx, rdx\n"); + asm_start.push_str("\tidiv r11\n"); // The quotient is now stored in %rax. }, // If the operators is subtraction. MathOperator::OP_SUB => { - topush.push_str("\tsub r10, r11\n"); - topush.push_str("\tmov rax, r10\n"); + asm_start.push_str("\tsub r10, r11\n"); + asm_start.push_str("\tmov rax, r10\n"); }, // If the operator is modulo. MathOperator::OP_MOD => { - topush.push_str("\tmov rax, r10\n"); - topush.push_str("\txor rdx, rdx\n"); - topush.push_str("\tidiv r11\n"); - topush.push_str("\tmov rax, rdx\n"); + asm_start.push_str("\tmov rax, r10\n"); + asm_start.push_str("\txor rdx, rdx\n"); + asm_start.push_str("\tidiv r11\n"); + asm_start.push_str("\tmov rax, rdx\n"); // The remainder will now be stored in the %rax register. } } @@ -58,71 +58,72 @@ pub fn fasm_codegen(exprs: &Vec, not_a_function: bool) -> String { match i { 0 => { // First parameter. Put in %rdi. - topush.push_str(format!("\tmov rdi, {}\n", p.value.unwrap()).as_str()); + asm_start.push_str(format!("\tmov rdi, {}\n", p.value.unwrap()).as_str()); }, 1 => { // Second parameter. Put in %rsi. - topush.push_str(format!("\tmov rsi, {}\n", p.value.unwrap()).as_str()); + asm_start.push_str(format!("\tmov rsi, {}\n", p.value.unwrap()).as_str()); }, 2 => { // Third parameter. Put in %rdx. - topush.push_str(format!("\tmov rdx, {}\n", p.value.unwrap()).as_str()); + asm_start.push_str(format!("\tmov rdx, {}\n", p.value.unwrap()).as_str()); }, 3 => { // Fourth parameter. Put in %rcx. - topush.push_str(format!("\tmov rcx, {}\n", p.value.unwrap()).as_str()); + asm_start.push_str(format!("\tmov rcx, {}\n", p.value.unwrap()).as_str()); }, 4 => { // Fifth parameter. Put in %r8. - topush.push_str(format!("\tmov r8, {}\n", p.value.unwrap()).as_str()); + asm_start.push_str(format!("\tmov r8, {}\n", p.value.unwrap()).as_str()); }, 5 => { // Sixth parameter. Put in %r9. - topush.push_str(format!("\tmov r9, {}\n", p.value.unwrap()).as_str()); + asm_start.push_str(format!("\tmov r9, {}\n", p.value.unwrap()).as_str()); }, _ => { // Parameters after the sixth parameter are pushed to the stack. - topush.push_str(format!("\tpush {}\n", p.value.unwrap()).as_str()); + asm_start.push_str(format!("\tpush {}\n", p.value.unwrap()).as_str()); } } } - topush.push_str(format!("call {}", e.name).as_str()); + asm_start.push_str(format!("call {}", e.name).as_str()); }, Expr::VarDefinition(e) => { asm_data.push_str(format!("\t{} dq {}", e.name, e.value.unwrap()).as_str()); }, - Expr::FunDefinition(e) => { - topush.push_str(format!("{}:\n", e.name).as_str()); - topush.push_str(fasm_codegen(&e.contents, false).as_str()); + Expr::Breakpoint => { + asm_start.push_str("\tint3\n"); }, Expr::Return(e) => { - topush.push_str(format!("mov rax, {}", e.unwrap()).as_str()); + asm_start.push_str(format!("mov rax, {}", e.unwrap()).as_str()); }, - Expr::Breakpoint => { - topush.push_str("\tint3\n"); - }, + Expr::FunDefinition(e) => { + asm_text.push_str(format!("{}:\n", e.name).as_str()); + asm_text.push_str(fasm_codegen(&e.contents, false).as_str()); + } - _ => unimplemented!("sorry unimplemented"), + _ => break, } + } - + if not_a_function { asm_start.push_str("\tmov rax, 60 ; 60 is the system call number for exit.\n"); asm_start.push_str("\txor rdi, rdi ; 0 is the exit code we want.\n"); - asm_start.push_str("\tsyscall ; this is the instruction to actually perform the system call."); + asm_start.push_str("\tsyscall ; this is the instruction to actually perform the system call.\n"); } - + let asm = format!("{}{}{}", asm_start, asm_text, asm_data); asm }