]> sigrok.org Git - libsigrokdecode.git/commitdiff
spiflash: Perf tweak: Build handler lookup table once per decoder
authorAngus Gratton <redacted>
Sun, 22 May 2016 01:47:57 +0000 (11:47 +1000)
committerUwe Hermann <redacted>
Wed, 22 Jun 2016 17:59:05 +0000 (19:59 +0200)
decoders/spiflash/pd.py

index 8a0b0e323be1bddd86fd3caba8e53041d4249632..03e16e20e7f2ded76d566728a1c0642a0e6dbc83 100644 (file)
@@ -90,6 +90,14 @@ class Decoder(srd.Decoder):
         self.on_end_transaction = None
         self.end_current_transaction()
 
+        # Build dict mapping command keys to handler functions. Each
+        # command in 'cmds' (defined in lists.py) has a matching
+        # handler self.handle_<shortname>.
+        def get_handler(cmd):
+            s = 'handle_%s' % cmds[cmd][0].lower().replace('/', '_')
+            return getattr(self, s)
+        self.cmd_handlers = dict((cmd, get_handler(cmd)) for cmd in cmds.keys())
+
     def end_current_transaction(self):
         if self.on_end_transaction is not None: # Callback for CS# transition.
             self.on_end_transaction()
@@ -373,10 +381,8 @@ class Decoder(srd.Decoder):
             self.cmdstate = 1
 
         # Handle commands.
-        if self.state in cmds:
-            s = 'handle_%s' % cmds[self.state][0].lower().replace('/', '_')
-            handle_reg = getattr(self, s)
-            handle_reg(mosi, miso)
-        else:
+        try:
+            self.cmd_handlers[self.state](mosi, miso)
+        except KeyError:
             self.putx([24, ['Unknown command: 0x%02x' % mosi]])
             self.state = None