pr 58
This commit is contained in:
@@ -6,4 +6,4 @@ license.workspace = true
|
||||
repository.workspace = true
|
||||
|
||||
[dependencies]
|
||||
# No dependencies for now
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
|
||||
@@ -43,6 +43,11 @@ pub fn update_pc_by_operand(initial_pc: u32, operands: &Vec<Operand>) -> u32 {
|
||||
pcp
|
||||
}
|
||||
|
||||
pub struct AssembleResult {
|
||||
pub code: Vec<u8>,
|
||||
pub unresolved_labels: HashMap<String, Vec<u32>>,
|
||||
}
|
||||
|
||||
/// Converts a list of assembly instructions into raw ROM bytes.
|
||||
///
|
||||
/// The assembly process is done in two passes:
|
||||
@@ -51,6 +56,15 @@ pub fn update_pc_by_operand(initial_pc: u32, operands: &Vec<Operand>) -> u32 {
|
||||
/// 2. **Code Generation**: Translates each OpCode and its operands (resolving labels using the map)
|
||||
/// into the final binary format.
|
||||
pub fn assemble(instructions: &[Asm]) -> Result<Vec<u8>, String> {
|
||||
let res = assemble_with_unresolved(instructions)?;
|
||||
if !res.unresolved_labels.is_empty() {
|
||||
let labels: Vec<_> = res.unresolved_labels.keys().cloned().collect();
|
||||
return Err(format!("Undefined labels: {:?}", labels));
|
||||
}
|
||||
Ok(res.code)
|
||||
}
|
||||
|
||||
pub fn assemble_with_unresolved(instructions: &[Asm]) -> Result<AssembleResult, String> {
|
||||
let mut labels = HashMap::new();
|
||||
let mut current_pc = 0u32;
|
||||
|
||||
@@ -69,27 +83,52 @@ pub fn assemble(instructions: &[Asm]) -> Result<Vec<u8>, String> {
|
||||
|
||||
// Second pass: generate bytes
|
||||
let mut rom = Vec::new();
|
||||
let mut unresolved_labels: HashMap<String, Vec<u32>> = HashMap::new();
|
||||
let mut pc = 0u32;
|
||||
|
||||
for instr in instructions {
|
||||
match instr {
|
||||
Asm::Label(_) => {}
|
||||
Asm::Op(opcode, operands) => {
|
||||
write_u16_le(&mut rom, *opcode as u16).map_err(|e| e.to_string())?;
|
||||
pc += 2;
|
||||
for operand in operands {
|
||||
match operand {
|
||||
Operand::U32(v) => write_u32_le(&mut rom, *v).map_err(|e| e.to_string())?,
|
||||
Operand::I32(v) => write_u32_le(&mut rom, *v as u32).map_err(|e| e.to_string())?,
|
||||
Operand::I64(v) => write_i64_le(&mut rom, *v).map_err(|e| e.to_string())?,
|
||||
Operand::F64(v) => write_f64_le(&mut rom, *v).map_err(|e| e.to_string())?,
|
||||
Operand::Bool(v) => rom.push(if *v { 1 } else { 0 }),
|
||||
Operand::U32(v) => {
|
||||
write_u32_le(&mut rom, *v).map_err(|e| e.to_string())?;
|
||||
pc += 4;
|
||||
}
|
||||
Operand::I32(v) => {
|
||||
write_u32_le(&mut rom, *v as u32).map_err(|e| e.to_string())?;
|
||||
pc += 4;
|
||||
}
|
||||
Operand::I64(v) => {
|
||||
write_i64_le(&mut rom, *v).map_err(|e| e.to_string())?;
|
||||
pc += 8;
|
||||
}
|
||||
Operand::F64(v) => {
|
||||
write_f64_le(&mut rom, *v).map_err(|e| e.to_string())?;
|
||||
pc += 8;
|
||||
}
|
||||
Operand::Bool(v) => {
|
||||
rom.push(if *v { 1 } else { 0 });
|
||||
pc += 1;
|
||||
}
|
||||
Operand::Label(name) => {
|
||||
let addr = labels.get(name).ok_or(format!("Undefined label: {}", name))?;
|
||||
write_u32_le(&mut rom, *addr).map_err(|e| e.to_string())?;
|
||||
if let Some(addr) = labels.get(name) {
|
||||
write_u32_le(&mut rom, *addr).map_err(|e| e.to_string())?;
|
||||
} else {
|
||||
unresolved_labels.entry(name.clone()).or_default().push(pc);
|
||||
write_u32_le(&mut rom, 0).map_err(|e| e.to_string())?; // Placeholder
|
||||
}
|
||||
pc += 4;
|
||||
}
|
||||
Operand::RelLabel(name, base) => {
|
||||
let addr = labels.get(name).ok_or(format!("Undefined label: {}", name))?;
|
||||
let base_addr = labels.get(base).ok_or(format!("Undefined base label: {}", base))?;
|
||||
let rel_addr = (*addr as i64) - (*base_addr as i64);
|
||||
write_u32_le(&mut rom, rel_addr as u32).map_err(|e| e.to_string())?;
|
||||
pc += 4;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -97,5 +136,8 @@ pub fn assemble(instructions: &[Asm]) -> Result<Vec<u8>, String> {
|
||||
}
|
||||
}
|
||||
|
||||
Ok(rom)
|
||||
Ok(AssembleResult {
|
||||
code: rom,
|
||||
unresolved_labels,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
pub mod linker;
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
use crate::opcode::OpCode;
|
||||
use crate::abi::SourceSpan;
|
||||
|
||||
@@ -8,7 +9,7 @@ use crate::abi::SourceSpan;
|
||||
/// The Constant Pool is a table of unique values used by the program.
|
||||
/// Instead of embedding large data (like strings) directly in the instruction stream,
|
||||
/// the bytecode uses `PushConst <index>` to load these values onto the stack.
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub enum ConstantPoolEntry {
|
||||
/// Reserved index (0). Represents a null/undefined value.
|
||||
Null,
|
||||
@@ -39,7 +40,7 @@ pub enum LoadError {
|
||||
UnexpectedEof,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Default, PartialEq)]
|
||||
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
|
||||
pub struct FunctionMeta {
|
||||
pub code_offset: u32,
|
||||
pub code_len: u32,
|
||||
|
||||
Reference in New Issue
Block a user