finish arithmetic

diff --git a/hylo-lang/hylo-ir/src/lib.rs b/hylo-lang/hylo-ir/src/lib.rs
index a8aba878df6c31af681fafe7c317509ab4a41cc9..e1db8f771061a3ff4527154e03711614c10d5381 100644 (file)
--- a/hylo-lang/hylo-ir/src/lib.rs
+++ b/hylo-lang/hylo-ir/src/lib.rs
@@ -24,6 +24,7 @@ pub enum IR {
     SubtractU64,
     MultiplyU64,
     DivideU64,
+    ModU64,
     Equals,
     GreaterThan,
     BitwiseOr,

diff --git a/hylo-lang/hyloc/src/ir.rs b/hylo-lang/hyloc/src/ir.rs
index c96ee9a842db4b6615c9da7f0836eda3a284bed2..643dc8b5eef4a589e5f217fc294d166bb511a983 100644 (file)
--- a/hylo-lang/hyloc/src/ir.rs
+++ b/hylo-lang/hyloc/src/ir.rs
@@ -103,6 +103,7 @@ fn generate_internal(path: PathBuf, module: &Module, imported: &mut HashSet<Path
                         "-" => IR::SubtractU64,
                         "*" => IR::MultiplyU64,
                         "/" => IR::DivideU64,
+                        "%" => IR::ModU64,
                         "|" => IR::BitwiseOr,
                         "import" => IR::Import,
                         "sys0" => IR::Sys0,

diff --git a/hylo-lang/hyloc/src/riscv_asm_codegen.rs b/hylo-lang/hyloc/src/riscv_asm_codegen.rs
index 3da147d07d0a94062e83f9102b46601d1011303d..53e88faf14017fd7cede1d5821a6ed31d2f792b8 100644 (file)
--- a/hylo-lang/hyloc/src/riscv_asm_codegen.rs
+++ b/hylo-lang/hyloc/src/riscv_asm_codegen.rs
@@ -171,6 +171,24 @@ impl<'a> CodeGen<'a> {
                     self.line("sub t0, t0, t1");
                     self.push_from("t0");
                 },
+                IR::MultiplyU64 => {
+                    self.pop_to("t1");
+                    self.pop_to("t0");
+                    self.line("mul t0, t0, t1");
+                    self.push_from("t0");
+                },
+                IR::DivideU64 => {
+                    self.pop_to("t1");
+                    self.pop_to("t0");
+                    self.line("div t0, t0, t1");
+                    self.push_from("t0");
+                },
+                IR::ModU64 => {
+                    self.pop_to("t1");
+                    self.pop_to("t0");
+                    self.line("rem t0, t0, t1");
+                    self.push_from("t0");
+                },
                 IR::Dup => {
                     self.copy_top_stack_value_to("t0");
                     self.push_from("t0");