diff --git a/third_party/fasm b/third_party/fasm
index f78c27ec..b7a57855 160000
--- a/third_party/fasm
+++ b/third_party/fasm
@@ -1 +1 @@
-Subproject commit f78c27ecc34236df3cd4c845c13bdf279d30608c
+Subproject commit b7a578552669954050f3700ced243b9d9e12d649
diff --git a/tools/frame_address_decoder.cc b/tools/frame_address_decoder.cc
index f9943ba1..4f577934 100644
--- a/tools/frame_address_decoder.cc
+++ b/tools/frame_address_decoder.cc
@@ -6,15 +6,7 @@
 
 namespace xc7series = prjxray::xilinx::xc7series;
 
-int main(int argc, char* argv[]) {
-	std::istream* input_stream = &std::cin;
-	if (argc > 1) {
-		auto file_stream = std::ifstream(argv[1]);
-		if (file_stream) {
-			input_stream = &file_stream;
-		}
-	}
-
+void frame_address_decode(std::istream * input_stream) {
 	for (uint32_t frame_address_raw;
 	     (*input_stream) >> std::setbase(0) >> frame_address_raw;) {
 		xc7series::FrameAddress frame_address(frame_address_raw);
@@ -31,6 +23,18 @@ int main(int argc, char* argv[]) {
 		          << " Type=" << frame_address.block_type()
 		          << std::endl;
 	}
+}
+
+int main(int argc, char* argv[]) {
+	if (argc > 1) {
+		std::ifstream file_stream(argv[1]);
+		if (file_stream) {
+			frame_address_decode(&file_stream);
+			return 0;
+		}
+	}
+
+	frame_address_decode(&std::cin);
 
 	return 0;
 }