From 474eb8f8c73714e74d0075a588ff75b5d6636b2a Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@s144.Millennium.Berkeley.EDU>
Date: Thu, 7 Apr 2011 15:41:00 -0700
Subject: [pk,sim] fixed parse-opcodes bug

was causing spurious illegal instruction traps
---
 parse-opcodes | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parse-opcodes b/parse-opcodes
index 7ba1bbe..6857c58 100755
--- a/parse-opcodes
+++ b/parse-opcodes
@@ -102,7 +102,7 @@ def make_switch(match,mask):
       for funct in range(0,1<<funct_size):
         has_some_instruction = 0
         for name in match.iterkeys():
-          if (opc << opcode_base | funct << funct_base) == (match[name] & (opcode_mask | funct_mask)):
+          if ((opc << opcode_base | funct << funct_base) & mask[name]) == (match[name] & (opcode_mask | funct_mask)):
             has_some_instruction = 1
         if not has_some_instruction: continue
         print '      case 0x%x:' % funct
@@ -120,7 +120,7 @@ def make_switch(match,mask):
           for name in match.iterkeys():
             name2 = name.replace('.','_')
             # case 2: general case: opcode + funct incompletely describe insn
-            if (opc << opcode_base | funct << funct_base) == (match[name] & (opcode_mask | funct_mask)):
+            if ((opc << opcode_base | funct << funct_base) & mask[name]) == (match[name] & (opcode_mask | funct_mask)):
               print '        if((insn.bits & 0x%x) == 0x%x)' % (mask[name],match[name])
               print '        {'
               print '          #include "insns/%s.h"' % name2
-- 
cgit v1.1