From f372849bc00646e8f5dcab0b223e792156c7d694 Mon Sep 17 00:00:00 2001
From: Keith Rothman <537074+litghost@users.noreply.github.com>
Date: Wed, 6 Feb 2019 17:12:01 -0800
Subject: [PATCH] Update FASM to version that includes output sorting.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
---
 third_party/fasm  |  2 +-
 utils/bit2fasm.py | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/third_party/fasm b/third_party/fasm
index b7a57855..ece57149 160000
--- a/third_party/fasm
+++ b/third_party/fasm
@@ -1 +1 @@
-Subproject commit b7a578552669954050f3700ced243b9d9e12d649
+Subproject commit ece57149c96cea82ab155af3bba04e76eee4ab6a
diff --git a/utils/bit2fasm.py b/utils/bit2fasm.py
index 9cac3733..74caeb69 100755
--- a/utils/bit2fasm.py
+++ b/utils/bit2fasm.py
@@ -50,16 +50,12 @@ def bits_to_fasm(db_root, bits_file, verbose, canonical):
         return not any_bits
 
     model = fasm.output.merge_and_sort(
-            disassembler.find_features_in_bitstream(bitdata, verbose=verbose),
-            zero_function=is_zero_feature,
-            sort_key=grid.tile_key,
-            )
+        disassembler.find_features_in_bitstream(bitdata, verbose=verbose),
+        zero_function=is_zero_feature,
+        sort_key=grid.tile_key,
+    )
 
-    print(
-        fasm.fasm_tuple_to_string(
-            model,
-            canonical=canonical),
-        end='')
+    print(fasm.fasm_tuple_to_string(model, canonical=canonical), end='')
 
 
 def main():