boots: report some example locations

dinfuehr · Aug 5, 2023 · fe4b580 · fe4b580
1 parent d3dd061
commit fe4b580
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 8 deletions.
diff --git a/dora-boots/assembler/arm64.dora b/dora-boots/assembler/arm64.dora
@@ -197,6 +197,10 @@ impl AssemblerArm64 {
         self.buffer.createAndBindLabel()
     }
 
+    pub fn position(): Int32 {
+        self.buffer.position().toInt32()
+    }
+
     pub fn add(rd: Register, rn: Register, rm: Register) {
         if rd == REG_SP || rn == REG_SP {
             self.add_ext(rd, rn, rm, Extend::UXTX, 0i32);

diff --git a/dora-boots/assembler/x64.dora b/dora-boots/assembler/x64.dora
@@ -87,6 +87,10 @@ impl AssemblerX64 {
         self.buffer.createAndBindLabel()
     }
 
+    pub fn position(): Int32 {
+        self.buffer.position().toInt32()
+    }
+
     pub fn addl_ri(dest: Register, imm: Immediate) {
         self.emitAlu32Imm(dest, imm, 0b000i32, 0x05u8);
     }

diff --git a/dora-boots/codegen/arm64.dora b/dora-boots/codegen/arm64.dora
@@ -1,5 +1,5 @@
 use package::interface::{Architecture, CompilationInfo, config, TRAP_DIV0};
-use package::codegen::{CodeGen, CodeDescriptor, CommentTable, LocationTable};
+use package::codegen::{CodeGen, CodeDescriptor, CommentTable, Location, LocationTable};
 use package::assembler::arm64::AssemblerArm64;
 use package::assembler::arm64::{R0, R1, R2, R3, R4, R5, R6, R7, R10, R11};
 use package::assembler::arm64::{REG_FP, REG_SP, REG_LR};
@@ -9,11 +9,18 @@ use package::graph::{Inst, Op, LocationData};
 pub class CodeGenArm64 {
     info: CompilationInfo,
     asm: AssemblerArm64,
+    locations: LocationTable,
+    comments: CommentTable,
 }
 
 impl CodeGenArm64 {
     pub static fn new(info: CompilationInfo): CodeGenArm64 {
-        CodeGenArm64(info, AssemblerArm64::new())
+        CodeGenArm64(
+            info,
+            AssemblerArm64::new(),
+            LocationTable::new(),
+            CommentTable::new(),
+        )
     }
 
     pub fn generate(): Array[UInt8] {
@@ -31,6 +38,7 @@ impl CodeGenArm64 {
         self.asm.movz(CCALL_REG_PARAMS(0), trap, 0i32);
         self.mov_imm(tmp, config.trap_trampoline.toInt64());
         self.asm.bl_r(tmp);
+        self.locations.insert(self.asm.position(), Location(5i32, 10i32));
     }
 
     fn mov_imm(dest: Register, imm: Int64) {
@@ -147,8 +155,8 @@ impl CodeGen for CodeGenArm64 {
 
         CodeDescriptor(
             code,
-            CommentTable::new(),
-            LocationTable::new(),
+            self.comments,
+            self.locations,
         )
     }
 }
diff --git a/dora-boots/codegen/x64.dora b/dora-boots/codegen/x64.dora
@@ -2,18 +2,25 @@ use package::assembler::x64::{AssemblerX64, Address, Condition, Immediate, Scale
 use package::assembler::x64::{RAX, RDI, RDX, RCX, RSI, RBP, RSP};
 use package::assembler::x64::{R8, R9, R10, R11};
 use package::assembler::{Register, RegSet};
-use package::codegen::{CodeGen, CodeDescriptor, CommentTable, LocationTable};
+use package::codegen::{CodeGen, CodeDescriptor, CommentTable, Location, LocationTable};
 use package::interface::{Architecture, CompilationInfo, config, TRAP_DIV0};
 use package::graph::{Inst, Op, LocationData};
 
 pub class CodeGenX64 {
     info: CompilationInfo,
     asm: AssemblerX64,
+    locations: LocationTable,
+    comments: CommentTable,
 }
 
 impl CodeGenX64 {
     pub static fn new(info: CompilationInfo): CodeGenX64 {
-        CodeGenX64(info, AssemblerX64::new())
+        CodeGenX64(
+            info,
+            AssemblerX64::new(),
+            LocationTable::new(),
+            CommentTable::new(),
+        )
     }
 
     fn epilog() {
@@ -26,6 +33,7 @@ impl CodeGenX64 {
         self.asm.movl_ri(CCALL_REG_PARAMS(0), Immediate(trap.toInt64()));
         self.asm.movq_ri(tmp, Immediate(config.trap_trampoline.toInt64()));
         self.asm.call_r(tmp);
+        self.locations.insert(self.asm.position(), Location(5i32, 1i32));
     }
 }
 
@@ -150,8 +158,8 @@ impl CodeGen for CodeGenX64 {
 
         CodeDescriptor(
             code,
-            CommentTable::new(),
-            LocationTable::new(),
+            self.comments,
+            self.locations,
         )
     }
 }
diff --git a/dora-boots/graph.dora b/dora-boots/graph.dora
@@ -563,6 +563,7 @@ pub class Inst {
     block: Option[Block],
 
     _op: Option[Op],
+    bytecode_position: Option[Int32],
 
     aux: Int64,
 
@@ -587,6 +588,7 @@ impl Inst {
             None[Int32],
             None[Block],
             None[Op],
+            None[Int32],
             0,
             None[Inst],
             None[Inst],
@@ -608,6 +610,14 @@ impl Inst {
         self._op.getOrPanic()
     }
 
+    pub fn bytecode_position(): Option[Int32] {
+        self.bytecode_position
+    }
+
+    pub fn set_bytecode_position(pos: Int32) {
+        self.bytecode_position = Some(pos);
+    }
+
     pub fn getBlock(): Block {
         self.block.getOrPanic()
     }

diff --git a/dora-boots/graph_builder.dora b/dora-boots/graph_builder.dora
@@ -536,6 +536,7 @@ impl SsaGen {
         }
 
         let destInst = createBinaryInst(op, ty, lhsInst, rhsInst);
+        destInst.set_bytecode_position(self.offset);
         self.current().appendInst(destInst);
         self.writeVariable(dest, self.current(), destInst);
     }