[opcodes,pk,sim,xcc] great renumbering of 2011, part deux

1 files changed, 22 insertions, 23 deletions

diff --git a/parse-opcodes b/parse-opcodes
index c8ab9e2..911c60e 100755
--- a/parse-opcodes
+++ b/parse-opcodes
@@ -21,33 +21,32 @@ arglut['imm20'] = (26,7)
 arglut['imm12'] = (21,10)
 arglut['imm12hi'] = (31,27)
 arglut['imm12lo'] = (16,10)
-arglut['shamt'] = (21,16)
-arglut['shamtw'] = (20,16)
+arglut['shamt'] = (15,10)
+arglut['shamtw'] = (14,10)
 
 typelut = {} # 0=unimp,1=j,2=lui,3=imm,4=r,5=r4,6=ish,7=ishw,10=b
 typelut[0x00] = 0
-typelut[0x60] = 1
-typelut[0x61] = 1
-typelut[0x62] = 3
+typelut[0x67] = 1
+typelut[0x6F] = 1
+typelut[0x6B] = 3
 typelut[0x63] = 10
-typelut[0x71] = 2
-typelut[0x74] = 3
-typelut[0x75] = 4
-typelut[0x76] = 3
-typelut[0x77] = 4
-typelut[0x78] = 3
-typelut[0x79] = 10
-typelut[0x7a] = 4
-typelut[0x7b] = 4
-typelut[0x67] = 4
-typelut[0x68] = 3
-typelut[0x69] = 10
-typelut[0x6a] = 4
-typelut[0x6b] = 4
-typelut[0x6c] = 5
-typelut[0x6d] = 5
-typelut[0x6e] = 5
-typelut[0x6f] = 5
+typelut[0x37] = 2
+typelut[0x13] = 3
+typelut[0x33] = 4
+typelut[0x1B] = 3
+typelut[0x3B] = 4
+typelut[0x03] = 3
+typelut[0x23] = 10
+typelut[0x27] = 4
+typelut[0x17] = 4
+typelut[0x07] = 3
+typelut[0x27] = 10
+typelut[0x53] = 4
+typelut[0x43] = 5
+typelut[0x47] = 5
+typelut[0x4B] = 5
+typelut[0x4F] = 5
+typelut[0x7F] = 4
 
 def binary(n, digits=0):
   rep = bin(n)[2:]