[xcc,sim,opcodes] added c.addiw

3 files changed, 4 insertions, 26 deletions

diff --git a/inst.v b/inst.v
index 95b4cd4..e857c8e 100644
--- a/inst.v
+++ b/inst.v
@@ -261,3 +261,4 @@
 `define C_SUB3     32'b00000000000000000000000000000000
 `define C_OR3      32'b00000000000000000000000000000000
 `define C_AND3     32'b00000000000000000000000000000000
+`define C_ADDIW    32'b00000000000000000000000000000000
diff --git a/opcodes b/opcodes
index 364d289..6404e27 100644
--- a/opcodes
+++ b/opcodes
@@ -354,3 +354,5 @@ c.add3 crds crs1s crs2bs 9..8=0 4..0=28
 c.sub3 crds crs1s crs2bs 9..8=1 4..0=28
 c.or3  crds crs1s crs2bs 9..8=2 4..0=28
 c.and3 crds crs1s crs2bs 9..8=3 4..0=28
+
+c.addiw cimm6 crd 4..0=29
diff --git a/parse-opcodes b/parse-opcodes
index bd120fd..c1d1845 100755
--- a/parse-opcodes
+++ b/parse-opcodes
@@ -112,42 +112,17 @@ def make_switch(match,mask):
         break
 
     if not done:
-      print '    switch((insn.bits >> 0x%x) & 0x%x)' % (funct_base,(1<<funct_size)-1)
-      print '    {'
-      for funct in range(0,1<<funct_size):
-        has_some_instruction = 0
-        for name in match.iterkeys():
-          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
-        print '      {'
-        done = 0
-        for name in match.iterkeys():
-          name2 = name.replace('.','_')
-          # case 1: opcode + funct code completely describe insn
-          if ((opc << opcode_base | funct << funct_base) & mask[name]) == match[name] and ((opcode_mask | funct_mask) & mask[name]) == mask[name]:
-            print '        #include "insns/%s.h"' % name2
-            print '        break;'
-            done = 1
-            break
         if not done:
           for name in match.iterkeys():
             name2 = name.replace('.','_')
             # case 2: general case: opcode + funct incompletely describe insn
-            if ((opc << opcode_base | funct << funct_base) & mask[name]) == (match[name] & (opcode_mask | funct_mask)):
+            if ((opc << opcode_base) & mask[name]) == (match[name] & opcode_mask):
               print '        if((insn.bits & 0x%x) == 0x%x)' % (mask[name],match[name])
               print '        {'
               print '          #include "insns/%s.h"' % name2
               print '          break;'
               print '        }'
           print '        throw trap_illegal_instruction;'
-        print '      }'
-      print '      default:'
-      print '      {'
-      print '        throw trap_illegal_instruction;'
-      print '      }'
-      print '    }'
     print '    break;'
     print '  }'
   print '  default:'