Merge pull request #266 from NoxHarmonium/toolchain-printer

feat(toolchain): start writing AST printers

examples/hardware-exception/data.asm

@@ -32,6 +32,3 @@
 .DW #33
 .DW #10
 .DW #0
-
-; TODO: Why do I need this here to make this file parse???
-NOOP

sirc-vm/sirc-vm/src/lib.rs

@@ -21,7 +21,6 @@ use std::{cell::RefCell, collections::HashSet, fs::File, io::Write, path::PathBu
 
 use debug_adapter::types::{BreakpointRef, VmChannels};
 use debugger::yield_to_debugger;
-use device_video::VSYNC_INTERRUPT;
 use log::{error, info};
 use peripheral_bus::{
     device::{BusAssertions, Device},
@@ -30,6 +29,11 @@ use peripheral_bus::{
 use peripheral_cpu::CpuPeripheral;
 use utils::{cpu_from_bus::cpu_from_bus, frame_reporter::start_loop};
 
+#[cfg(feature = "video")]
+use device_video::VSYNC_INTERRUPT;
+#[cfg(not(feature = "video"))]
+const VSYNC_INTERRUPT: u8 = 0x0;
+
 #[derive(Debug)]
 #[allow(clippy::struct_excessive_bools)]
 pub struct DebugState {

sirc-vm/toolchain/src/bin/assembler.rs

@@ -19,12 +19,13 @@ use nom_supreme::error::ErrorTree;
 use nom_supreme::final_parser::{final_parser, Location};
 
 use toolchain::data::object::build_object;
-use toolchain::parsers::instruction::{parse_tokens, Token};
 
 use core::panic;
 use std::fs::{read_to_string, write};
 use std::io;
 use std::path::PathBuf;
+use toolchain::parsers::shared::parse_tokens;
+use toolchain::types::shared::Token;
 
 #[derive(Parser, Debug)]
 #[clap(author, version, about, long_about = None)]

sirc-vm/toolchain/src/bin/linker.rs

@@ -112,9 +112,6 @@ fn main() -> io::Result<()> {
                     i16::MAX
                 )
             }) as u16,
-            RefType::SmallOffset => {
-                panic!("SmallOffset RefType is only supported by the LDMR/STMR instructions")
-            }
             // TODO: Check that the linker RefTypes are correct
             // category=Toolchain
             // I think LowerWord and UpperWord should be absolute, not relative?

sirc-vm/toolchain/src/data/object.rs

@@ -1,6 +1,6 @@
-use crate::parsers::data::DataType;
-use crate::parsers::instruction::{DataToken, Token};
+use crate::types::data::{DataToken, DataType, DB_VALUE, DQ_VALUE, DW_VALUE};
 use crate::types::object::{ObjectDefinition, SymbolDefinition, SymbolRef};
+use crate::types::shared::Token;
 
 use peripheral_cpu::coprocessors::processing_unit::definitions::{
     ImmediateInstructionData, InstructionData, ShortImmediateInstructionData,
@@ -11,6 +11,7 @@ use sirc_vm::debug_adapter::types::ObjectDebugInfo;
 
 use sha2::{Digest, Sha256};
 
+use crate::types::shared::NumberToken;
 use std::collections::HashMap;
 
 fn resolve_placeholder(
@@ -61,19 +62,19 @@ fn inject_data_value(
     placeholders: &HashMap<String, u32>,
 ) {
     match data.value {
-        DataType::Value(value) => {
+        DataType::Value(NumberToken { value, .. }) => {
             // TODO: Make packing smaller data sizes in assembled binaries more efficient
             // category=Toolchain
             // E.g. put 4 DBs in one 32 bit chunk
             // TODO: Clean up the data packing code in the Assembler
             // category=Refactoring
             let bytes: [u8; 4] = match data.size_bytes {
-                1 => [0x0, 0x0, 0x0, value as u8],
-                2 => {
+                DB_VALUE => [0x0, 0x0, 0x0, value as u8],
+                DW_VALUE => {
                     let word_bytes = u16::to_be_bytes(value as u16);
                     [0x0, 0x0, word_bytes[0], word_bytes[1]]
                 }
-                4 => u32::to_be_bytes(value),
+                DQ_VALUE => u32::to_be_bytes(value),
                 _ => panic!("Unsupported data size bytes {}", data.size_bytes),
             };
 
@@ -158,7 +159,7 @@ pub fn build_object(
                 name: data.name,
                 offset,
             }),
-            Token::Comment => {
+            Token::Comment(_) => {
                 // Do nothing.
             }
             Token::Origin(data) => {
@@ -177,7 +178,7 @@ pub fn build_object(
                 offset += INSTRUCTION_SIZE_BYTES;
             }
             Token::Equ(data) => {
-                placeholders.insert(data.placeholder_name, data.value);
+                placeholders.insert(data.placeholder_name, data.number_token.value);
             }
         }
     }

sirc-vm/toolchain/src/lib.rs

@@ -17,4 +17,5 @@
 
 pub mod data;
 pub mod parsers;
+pub mod printers;
 pub mod types;