feat: support pc offset arguments for get and set

rozukke · Dec 20, 2024 · 66524cf · 66524cf
1 parent 13934c7
commit 66524cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/src/debugger/command.rs b/src/debugger/command.rs
@@ -76,17 +76,12 @@ impl fmt::Display for CommandName {
 }
 
 /// Register or memory location.
-/// `Location::Memory(MemoryLocation::PC)` is valid, but should not be
-/// constructed, as it would imply using `get`/`set` with the PC, which is not
-/// possible.
 #[derive(Debug)]
 pub enum Location {
     Register(Register),
     Memory(MemoryLocation),
 }
 
-// TODO(feat): Offset from PC. Eg. `~3`, `~-x3`. Useful for `jump`
-
 #[derive(Debug)]
 pub enum MemoryLocation {
     PCOffset(i16),

diff --git a/src/debugger/parse.rs b/src/debugger/parse.rs
@@ -256,14 +256,9 @@ impl<'a> CommandIter<'a> {
 
             Some(Argument::Label(label)) => Ok(Location::Memory(MemoryLocation::Label(label))),
 
-            // TODO(feat): Accept pc offset arguments ?
-            Some(value) => Err(ArgumentError::InvalidValue {
-                argument_name,
-                error: ValueError::MismatchedType {
-                    expected_type: "register, address, or label",
-                    actual_type: value.kind(),
-                },
-            }),
+            Some(Argument::PCOffset(offset)) => {
+                Ok(Location::Memory(MemoryLocation::PCOffset(offset)))
+            }
 
             None => Err(ArgumentError::MissingArgument {
                 argument_name,