feat(memory) Implemented memory instruction format.

Author: x4exr

src/instruction.rs

@@ -1,7 +1,11 @@
+pub mod branch;
+pub mod memory;
+pub mod register;
+pub mod flag;
+
 use crate::num;
-use crate::operation::branch;
-use crate::state::flag::Flag;
-use crate::state::register::Register;
+use flag::Flag;
+use register::Register;
 
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum RegisterOperation {
@@ -10,16 +14,11 @@ pub enum RegisterOperation {
 
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum SizedRegisterOperation {
-    
-}
 
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum DualSizedRegisterOperation {
-    
 }
 
 #[derive(Debug, Clone, Copy, PartialEq)]
-pub enum ConditionalBranchOperation {
+pub enum DualSizedRegisterOperation {
 
 }
 
@@ -28,14 +27,18 @@ pub enum Instruction {
     Nothing,
     WaitForInterrupt,
     Register { operation: RegisterOperation, register: Register },
-    SizedRegister { 
-        operation: SizedRegisterOperation, 
+    SizedRegister {
+        operation: SizedRegisterOperation,
         size: num::Size, register: Register },
     DualSizedRegister {
         operation: DualSizedRegisterOperation,
         size: num::Size, registers: [Register; 2] },
-    ConditionalBranch {
-        operation: ConditionalBranchOperation,
+    Branch {
+        operation: branch::Operation,
         condition: Option<Flag>, hint: branch::Hint,
-        address: branch::Address }
-}
+        address: branch::Address },
+    Memory {
+        operation: memory::Operation,
+        size: num::Size, register: Register,
+        address: memory::Address }
+}

src/operation/branch.rs src/instruction/branch.rs

@@ -1,6 +1,11 @@
 use crate::num;
-use crate::state::flag::Flag;
-use crate::state::register::Register;
+use crate::instruction::flag::Flag;
+use crate::instruction::register::Register;
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Operation {
+
+}
 
 /// Hint to suggest whether the branch might be taken.
 pub type Hint = Option<bool>;
@@ -33,7 +38,7 @@ pub type ConditionCode = num::MaskedU8<CONDITION_MASK>;
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub struct ConditionMapping {
     pub code: ConditionCode,
-    pub variant: Condition 
+    pub variant: Condition
 }
 
 impl Condition {
@@ -46,17 +51,17 @@ impl Condition {
         Condition(Some(Flag::Parity    )),
         Condition(Some(Flag::Auxiliary ))
     ];
-    
-    pub fn from_code(code: ConditionCode) -> Option<Self> {
-        Self::MAPPINGS.get(code.get() as usize).copied()
+
+    pub fn from_code(code: ConditionCode) -> Self {
+        *Self::MAPPINGS
+            .get(code.get() as usize)
+            .unwrap_or(&Self::MAPPINGS[0])
     }
-    
+
     pub fn to_code(self) -> ConditionCode {
-        ConditionCode::new(
-            Self::MAPPINGS
-                .iter()
-                .position(|&mapping| mapping == self)
-                .unwrap() as u8,
-        )
+        ConditionCode::new(Self::MAPPINGS
+            .iter()
+            .position(|&mapping| mapping == self)
+            .unwrap() as u8)
     }
 }

src/state/flag.rs src/instruction/flag.rs

@@ -0,0 +1,45 @@
+use crate::instruction::register::Register;
+use crate::num;
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Operation {
+
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Mode {
+    Absolute,
+    Relative
+}
+
+pub const BASE_IMMEDIATE_OFFSET_MASK: u16 = 0x0C;
+pub type BaseImmediateOffset = num::MaskedU16<BASE_IMMEDIATE_OFFSET_MASK>;
+pub type BaseIndexImmediateOffset = u8;
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum IndexMode {
+    Offset(BaseIndexImmediateOffset),
+    RegisterOffset(Register)
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum BaseMode {
+    Offset(BaseImmediateOffset),
+    RegisterOffset(Register),
+    Index {
+        mode: IndexMode,
+        index: Register }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Address {
+    Immediate {
+        mode: Mode,
+        immediate: u16 },
+    Register {
+        mode: Mode,
+        register: Register },
+    Base {
+        mode: BaseMode,
+        base: Register }
+}

src/instruction/memory.rs

@@ -1 +0,0 @@
-pub mod branch;