harm: some relocations

Cargo.toml

@@ -6,6 +6,7 @@ members = [
    "aarchmrs-parser",
    "aarchmrs-types",
    "harm",
+   "harm-runtime",
    "harm-types",
    "tools/aarchmrs-generate",
    "tools/harm-asm-regen",

harm-runtime/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "harm-runtime"
+version = "0.1.0"
+edition = "2024"
+description = "AArch64 (ARM64) dynamic assembler runtime"
+license = "BSD-3-Clause"
+authors = ["Ivan Boldyrev <lispnik@gmail.com>"]
+repository = "https://github.com/monoid/harm/"
+keywords = ["arm", "aarch64", "aarchmrs", "assembler", "jit"]
+categories = ["compilers", "hardware-support"]
+publish = false
+
+[dependencies]
+harm = { workspace = true }
+memmap2 = "0.9.9"

harm-runtime/src/labels.rs

@@ -0,0 +1,13 @@
+/* Copyright (C) 2025 Ivan Boldyrev
+ *
+ * This document is licensed under the BSD 3-clause license.
+ */
+
+use harm::reloc::Offset;
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum LabelInfo {
+    Forward,
+    // TODO segment
+    Offset(Offset),
+}

harm-runtime/src/lib.rs

@@ -0,0 +1,6 @@
+/* Copyright (C) 2025 Ivan Boldyrev
+ *
+ * This document is licensed under the BSD 3-clause license.
+ */
+
+pub mod labels;

harm/src/instructions.rs

@@ -5,7 +5,7 @@
 
 use aarchmrs_types::InstructionCode;
 
-use crate::reloc::Reloc;
+use crate::reloc::Rel64;
 
 pub mod arith;
 pub mod control;
@@ -20,14 +20,14 @@ pub trait RawInstruction {
 }
 
 pub trait RelocatableInstruction {
-    fn to_code_with_reloc(&self) -> (InstructionCode, Option<Reloc>);
+    fn to_code_with_reloc(&self) -> (InstructionCode, Option<Rel64>);
 }
 
 impl<I> RelocatableInstruction for I
 where
     I: RawInstruction,
 {
-    fn to_code_with_reloc(&self) -> (InstructionCode, Option<Reloc>) {
+    fn to_code_with_reloc(&self) -> (InstructionCode, Option<Rel64>) {
         (self.to_code(), None)
     }
 }
@@ -42,7 +42,7 @@ where
 // When the bug is fixed, it can be changed to &self.
 // // OTOH, currently all implementations are `Copy`.
 pub trait InstructionSeq: Sized {
-    fn encode(self) -> impl Iterator<Item = (InstructionCode, Option<Reloc>)> + 'static;
+    fn encode(self) -> impl Iterator<Item = (InstructionCode, Option<Rel64>)> + 'static;
 
     #[inline]
     fn instructions(self) -> impl Iterator<Item = InstructionCode> + 'static {
@@ -60,7 +60,7 @@ impl<I> InstructionSeq for I
 where
     I: RelocatableInstruction,
 {
-    fn encode(self) -> impl Iterator<Item = (InstructionCode, Option<Reloc>)> + 'static {
+    fn encode(self) -> impl Iterator<Item = (InstructionCode, Option<Rel64>)> + 'static {
         let code = self.to_code_with_reloc();
         core::iter::once(code)
     }