Add day5a

Author: ishanpranav

.gitignore

@@ -1,5 +1,5 @@
 a.out
-a.csv
+[0-9].csv
 *.exe
 *.o
 .vscode/

Makefile

@@ -6,8 +6,6 @@ TWOS_COMPLEMENT = -fno-strict-overflow -fwrapv
 
 all: \
 day02a day02b \
-day03a day03b \
-day04a day04b \
 day05a day05b \
 day06a day06b \
 day07a day07b \
@@ -44,20 +42,8 @@ day02a: src/day02a.c emulator parser
 day02b: src/day02b.c emulator parser
 $(CC) $(CFLAGS) $< -o $@.o emulator.o parser.o
 
-day03a: src/day03a.c
-$(CC) $(CFLAGS) $< -o $@.o
-
-day03b: src/day03b.c
-$(CC) $(CFLAGS) $< -o $@.o
-
-day04a: src/day04a.c
-$(CC) $(CFLAGS) $< -o $@.o
-
-day04b: src/day04b.c
-$(CC) $(CFLAGS) $< -o $@.o
-
-day05a: src/day05a.c
-$(CC) $(CFLAGS) $< -o $@.o
+day05a: src/day05a.c emulator parser
+$(CC) $(CFLAGS) $< -o $@.o emulator.o parser.o
 
 day05b: src/day05b.c
 $(CC) $(CFLAGS) $(TWOS_COMPLEMENT) $< -o $@.o

lib/emulator.c

@@ -1,36 +1,91 @@
+#include <stdio.h>
 #include "emulator.h"
-#include "opcode.h"
 
-void emulator_execute(Word memory[])
+enum Opcode
 {
- Word* instruction = memory;
+ OPCODE_ADD = 1,
+ OPCODE_MULTIPLY = 2,
+ OPCODE_INPUT = 3,
+ OPCODE_OUTPUT = 4,
+ OPCODE_TERMINATE = 99
+};
+
+typedef enum Opcode Opcode;
+
+Word emulator_load(Emulator instance, Word* instruction, int slot)
+{
+ int denominator = 100;
+
+ for (int i = 0; i < slot - 1; i++)
+ {
+ denominator *= 10;
+ }
+
+ Word value = instruction[slot];
+
+ if ((*instruction / denominator) % 10 == 0)
+ {
+ return instance->memory[value];
+ }
+
+ return value;
+}
+
+void emulator_execute(Emulator instance)
+{
+ Word* instruction = instance->memory;
 
  for (;;)
  {
- switch (*instruction)
+ Opcode opcode = *instruction % 100;
+
+ switch (opcode)
  {
  case OPCODE_ADD:
  {
- Word* a = memory + instruction[1];
- Word* b = memory + instruction[2];
- Word* result = memory + instruction[3];
+ Word a = emulator_load(instance, instruction, 1);
+ Word b = emulator_load(instance, instruction, 2);
+ Word* result = instance->memory + instruction[3];
 
- *result = *a + *b;
+ *result = a + b;
  instruction += 4;
  }
  break;
 
  case OPCODE_MULTIPLY:
  {
- Word* a = memory + instruction[1];
- Word* b = memory + instruction[2];
- Word* result = memory + instruction[3];
+ Word a = emulator_load(instance, instruction, 1);
+ Word b = emulator_load(instance, instruction, 2);
+ Word* result = instance->memory + instruction[3];
 
- *result = *a * *b;
+ *result = a * b;
  instruction += 4;
  }
  break;
 
+ case OPCODE_INPUT:
+ {
+ Word* result = instance->memory + instruction[1];
+
+ if (scanf(WORD_FORMAT, result) != 1)
+ {
+ return;
+ }
+
+ instruction += 2;
+ }
+ break;
+
+ case OPCODE_OUTPUT:
+ {
+ Word value = emulator_load(instance, instruction, 1);
+
+ printf(WORD_FORMAT "\n", value);
+
+ instruction += 2;
+ }
+ break;
+
  case OPCODE_TERMINATE: return;
  }
  }

lib/emulator.h

@@ -1,3 +1,12 @@
 #include "word.h"
 
-void emulator_execute(Word memory[]);
+struct Emulator
+{
+ FILE* input;
+ FILE* output;
+ Word* memory;
+};
+
+typedef struct Emulator* Emulator;
+
+void emulator_execute(Emulator instance);

lib/opcode.h

@@ -11,14 +11,18 @@
 int main(void)
 {
  Word memory[MEMORY];
+ struct Emulator emulator =
+ {
+ .memory = memory
+ };
  clock_t start = clock();
 
  parser_parse(stdin, memory);
 
  memory[1] = 12;
  memory[2] = 2;
 
- emulator_execute(memory);
+ emulator_execute(&emulator);
  printf(
  "02a " WORD_FORMAT " %lf\n",
  memory[0],

src/day02a.c

@@ -37,6 +37,10 @@ static Word scan(Word clean[], int length)
 int main(void)
 {
  Word memory[MEMORY];
+ struct Emulator emulator =
+ {
+ .memory = memory
+ };
  clock_t start = clock();
  Word product = scan(memory, parser_parse(stdin, memory));
 

src/day02b.c

@@ -0,0 +1,40 @@
+// Licensed under the MIT license.
+
+// Sunny with a Chance of Asteroids Part 1
+
+#include <stdio.h>
+#include <time.h>
+#include "../lib/emulator.h"
+#include "../lib/parser.h"
+#define MEMORY 100000
+
+int main(int count, ZString args[])
+{
+ if (count < 2)
+ {
+ printf("Usage: day05a <program>\n");
+
+ return 1;
+ }
+
+ Word memory[MEMORY];
+ struct Emulator emulator =
+ {
+ .input = stdin,
+ .output = stdout,
+ .memory = memory
+ };
+ clock_t start = clock();
+
+ if (!parser_parse_file(args[1], memory))
+ {
+ fprintf(stderr, "Error: I/O.\n");
+
+ return 1;
+ }
+
+ emulator_execute(&emulator);
+ printf("05a %lf", (double)(clock() - start) / CLOCKS_PER_SEC);
+
+ return 0;
+}