summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-12-06 03:16:13 -0500
committerJune McEnroe <june@causal.agency>2019-12-06 03:16:13 -0500
commitc1293f280fef0eb4fa50393738ef32688682af10 (patch)
tree741081c16b71da6c7aaab460416873d0d4dffe77
parentSolve day 5 part 1 (diff)
downloadaoc-c1293f280fef0eb4fa50393738ef32688682af10.tar.gz
aoc-c1293f280fef0eb4fa50393738ef32688682af10.zip
Solve day 5 part 2
-rw-r--r--2019/day05.c28
1 files changed, 15 insertions, 13 deletions
diff --git a/2019/day05.c b/2019/day05.c
index 3b38124..ec8c471 100644
--- a/2019/day05.c
+++ b/2019/day05.c
@@ -1,13 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
-
-static int input(void) {
-	return 1;
-}
-
-static void output(int x) {
-	printf("%d\n", x);
-}
+#include <string.h>
 
 static int ip;
 static int mem[1024];
@@ -16,7 +9,7 @@ static int *p(int mode, int param) {
 	return (mode ? &mem[ip + param] : &mem[mem[ip + param]]);
 }
 
-static void run(void) {
+static void run(int input) {
 	while (mem[ip] != 99) {
 		int op = mem[ip] % 100;
 		int m1 = mem[ip] / 100 % 10;
@@ -25,14 +18,23 @@ static void run(void) {
 		switch (op) {
 			break; case 1: *p(m3, 3) = *p(m1, 1) + *p(m2, 2); ip += 4;
 			break; case 2: *p(m3, 3) = *p(m1, 1) * *p(m2, 2); ip += 4;
-			break; case 3: *p(m1, 1) = input(); ip += 2;
-			break; case 4: output(*p(m1, 1)); ip += 2;
+			break; case 3: *p(m1, 1) = input; ip += 2;
+			break; case 4: printf("%d\n", *p(m1, 1)); ip += 2;
+			break; case 5: ip = (*p(m1, 1) ? *p(m2, 2) : ip + 3);
+			break; case 6: ip = (*p(m1, 1) ? ip + 3 : *p(m2, 2));
+			break; case 7: *p(m3, 3) = (*p(m1, 1) < *p(m2, 2)); ip += 4;
+			break; case 8: *p(m3, 3) = (*p(m1, 1) == *p(m2, 2)); ip += 4;
 			break; default: abort();
 		}
 	}
 }
 
 int main(void) {
-	for (int i = 0; EOF != scanf("%d,", &mem[i]); ++i);
-	run();
+	int a[1024];
+	for (int i = 0; EOF != scanf("%d,", &a[i]); ++i);
+	memcpy(mem, a, sizeof(mem));
+	run(1);
+	memcpy(mem, a, sizeof(mem));
+	ip = 0;
+	run(5);
 }
" (ignored), red, green, blue. Separates byte-order and bit-order. Much more flexible, but now won't render CARDS.DLL graphics properly due to the skip bit being not where it expects. Also mmaps the file instead of reading it all in. And the default palette and sampling got removed again for now, since it's too awkward to use. 2018-02-05Add flip option to gfxxJune McEnroe This handles upside-down graphics much better than reverse did. 2018-02-05Remove gfxx reverse optionJune McEnroe 2018-02-04Fix gfxx draw stop conditionJune McEnroe Would not draw the last partially visible column when mirrored. 2018-02-04Reuse CGColorSpace and CGDataProvider in gfcocoaJune McEnroe 2018-02-04Mark mac target phonyJune McEnroe 2018-02-04Set up Makefile for gfxx-cocoa or gfxx-fbJune McEnroe 2018-02-04Avoid doing excessive work in gfxxJune McEnroe By stopping when the next column would be off the edge of the buffer. 2018-02-04Handle window resizing in gfcocoaJune McEnroe 2018-02-04Set cinoptionsJune McEnroe 2018-02-04Tweak colorscheme moreJune McEnroe 2018-02-04Color MatchParen DarkYellowJune McEnroe White is not obvious enough. 2018-02-04Add palette sampling to gfxxJune McEnroe 2018-02-04Add 4-bit RGB to gfxxJune McEnroe Replace default palette with alternating black and white. 2018-02-04Add Quit menu item to gfcocoaJune McEnroe 2018-02-04Switch back to sane Objective-C styleJune McEnroe 2018-02-04Quit gfcocoa when window closesJune McEnroe 2018-02-03Apparently this is how people write Objective-CJune McEnroe