45c45
< svcIop = InstObjParams("svc", "Svc64", "ArmStaticInst",
---
> svcIop = InstObjParams("svc", "Svc64", "ImmOp64",
48,49c48,49
< header_output = BasicDeclare.subst(svcIop)
< decoder_output = BasicConstructor64.subst(svcIop)
---
> header_output = ImmOp64Declare.subst(svcIop)
> decoder_output = ImmOp64Constructor.subst(svcIop)
63c63
< hvcIop = InstObjParams("hvc", "Hvc64", "ArmStaticInst",
---
> hvcIop = InstObjParams("hvc", "Hvc64", "ImmOp64",
66,67c66,67
< header_output += BasicDeclare.subst(hvcIop)
< decoder_output += BasicConstructor64.subst(hvcIop)
---
> header_output += ImmOp64Declare.subst(hvcIop)
> decoder_output += ImmOp64Constructor.subst(hvcIop)
82c82
< smcIop = InstObjParams("smc", "Smc64", "ArmStaticInst",
---
> smcIop = InstObjParams("smc", "Smc64", "ImmOp64",
84,85c84,85
< header_output += BasicDeclare.subst(smcIop)
< decoder_output += BasicConstructor64.subst(smcIop)
---
> header_output += ImmOp64Declare.subst(smcIop)
> decoder_output += ImmOp64Constructor.subst(smcIop)
172c172
< brkIop = InstObjParams("brk", "Brk64", "ArmStaticInst",
---
> brkIop = InstObjParams("brk", "Brk64", "ImmOp64",
174,175c174,175
< header_output += BasicDeclare.subst(brkIop)
< decoder_output += BasicConstructor64.subst(brkIop)
---
> header_output += ImmOp64Declare.subst(brkIop)
> decoder_output += ImmOp64Constructor.subst(brkIop)
191c191
< hltIop = InstObjParams("hlt", "Hlt64", "ArmStaticInst",
---
> hltIop = InstObjParams("hlt", "Hlt64", "ImmOp64",
193,194c193,194
< header_output += BasicDeclare.subst(hltIop)
< decoder_output += BasicConstructor64.subst(hltIop)
---
> header_output += ImmOp64Declare.subst(hltIop)
> decoder_output += ImmOp64Constructor.subst(hltIop)