wezm/advent-of-code
1
0
Fork 0
mirror of https://github.com/wezm/advent-of-code.git synced 2024-09-19 21:28:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement input and output instructions

Browse source
This commit is contained in:
Wesley Moore 2019-12-07 13:58:11 +11:00
parent e657f6ec9f
commit c32aac3153
No known key found for this signature in database
GPG key ID: BF67766C0BC2D0EE
1 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
2019/src/computer.rs
View file

@ -1,10 +1,14 @@
use std::io;
use std::io::Write;
use std::str::FromStr;
type Address = i32; type Address = i32;
#[derive(Debug, Eq, PartialEq)] #[derive(Debug, Eq, PartialEq)]
enum Instruction { enum Instruction {
Add(Mode, Mode), Add(Mode, Mode),
Multiply(Mode, Mode), Multiply(Mode, Mode),
Input(Mode), Input,
Output(Mode), Output(Mode),
Halt, Halt,
} }
@ -15,7 +19,7 @@ enum Mode {
Address, Address,
} }
struct Memory<'a> { pub struct Memory<'a> {
mem: &'a mut [i32], mem: &'a mut [i32],
} }
@ -35,7 +39,7 @@ fn decode(mut instruction: i32) -> Instruction {
Mode::from(divmod(&mut instruction, 10)), Mode::from(divmod(&mut instruction, 10)),
Mode::from(divmod(&mut instruction, 10)), Mode::from(divmod(&mut instruction, 10)),
), ),
3 => Instruction::Input(Mode::from(divmod(&mut instruction, 10))), 3 => Instruction::Input,
4 => Instruction::Output(Mode::from(divmod(&mut instruction, 10))), 4 => Instruction::Output(Mode::from(divmod(&mut instruction, 10))),
99 => Instruction::Halt, 99 => Instruction::Halt,
_ => panic!("Invalid opcode: {}", opcode), _ => panic!("Invalid opcode: {}", opcode),
@ -47,10 +51,10 @@ impl<'a> Memory<'a> {
Memory { mem } Memory { mem }
} }
pub fn read(&self, value: i32, mode: Mode) -> i32 { fn read(&self, value: i32, mode: Mode) -> i32 {
match mode { match mode {
Mode::Immediate => value, Mode::Immediate => self.mem[value as usize],
Mode::Address => self.mem[value as usize], Mode::Address => self.mem[self.mem[value as usize] as usize],
} }
} }
@ -58,27 +62,43 @@ impl<'a> Memory<'a> {
self.mem[address as usize] = value; self.mem[address as usize] = value;
} }
fn run(&mut self, noun: i32, verb: i32) { pub fn run(&mut self, noun: Option<i32>, verb: Option<i32>) {
if let Some(noun) = noun {
self.write(1, noun); self.write(1, noun);
}
if let Some(verb) = verb {
self.write(2, verb); self.write(2, verb);
}
let mut ip = 0; // instruction pointer let mut ip = 0; // instruction pointer
loop { loop {
match decode(self.read(ip, Mode::Address)) { match decode(self.read(ip, Mode::Immediate)) {
Instruction::Add(mode1, mode2) => { Instruction::Add(mode1, mode2) => {
let result = self.read(ip + 1, mode1) + self.read(ip + 1, mode2); let result = self.read(ip + 1, mode1) + self.read(ip + 2, mode2);
self.write(ip + 3, result); self.write(self.read(ip + 3, Mode::Immediate), result);
ip += 4; ip += 4;
} }
Instruction::Multiply(mode1, mode2) => { Instruction::Multiply(mode1, mode2) => {
let result = self.read(ip + 1, mode1) * self.read(ip + 1, mode2); let result = self.read(ip + 1, mode1) * self.read(ip + 2, mode2);
self.write(ip + 3, result); self.write(self.read(ip + 3, Mode::Immediate), result);
ip += 4; ip += 4;
} }
Instruction::Input(mode) => { Instruction::Input => {
let mut input = String::new();
print!("Input integer: ");
io::stdout().flush().unwrap();
match io::stdin().read_line(&mut input) {
Ok(_) => {
let integer = i32::from_str(input.trim()).expect("invalid integer");
self.write(self.read(ip + 1, Mode::Immediate), integer);
}
Err(error) => panic!("error: {}", error),
}
ip += 2; ip += 2;
} }
Instruction::Output(mode) => { Instruction::Output(mode) => {
let value = self.read(ip + 1, mode);
println!("{}", value);
ip += 2; ip += 2;
} }
Instruction::Halt => break, Instruction::Halt => break,
@ -117,13 +137,14 @@ mod tests {
) )
} }
#[test]
fn test_day2() { fn test_day2() {
let input = fs::read_to_string("input/day2.txt").unwrap(); let input = fs::read_to_string("input/day2.txt").unwrap();
let mut data = input::read_separated_line(',', &input).unwrap(); let mut data = input::read_separated_line(',', &input).unwrap();
let mut program = Memory::new(&mut data); let mut program = Memory::new(&mut data);
// Check that day2 still works wirh run through this implementation // Check that day2 still works wirh run through this implementation
program.run(12, 2); program.run(Some(12), Some(2));
assert_eq!(program.read(0, Mode::Address), 4138658); assert_eq!(program.read(0, Mode::Immediate), 4138658);
} }
} }