From 39ac76aa4fe5299fb898a8c1266f9a7a03200049 Mon Sep 17 00:00:00 2001 From: Loic Nageleisen Date: Mon, 9 Apr 2012 15:32:14 +0200 Subject: [PATCH] exception isolation --- dcpu_16.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dcpu_16.py b/dcpu_16.py index 92f6102..48402d7 100644 --- a/dcpu_16.py +++ b/dcpu_16.py @@ -378,10 +378,11 @@ class CPU(object): op = _opcode_map[opcode] try: op = op[a_code] - args = (c._pointer(b_code),) except TypeError: args = (c._pointer(a_code), c._pointer(b_code)) + else: + args = (c._pointer(b_code),) except KeyError: raise Exception('Invalid opcode %s at PC=%04X' % (["%02X"%x for x in opcode], c.pc)) return op, args