@@ -75,12 +75,9 @@ def ArithNCommEncoding : OpcodeEncoding; // opcode src dst swap set_flags ⇒ op
7575let SrcMultiplier = 8, DstMultiplier = 2, IndexOfStackDstUse = 2 in
7676def ArithPtrEncoding : OpcodeEncoding; // opcode src dst swap ⇒ opcode + 8 × src + 2 × dst + swap
7777def FarCallEncoding : OpcodeEncoding; // opcode is_shard is_static ⇒ opcode + 2 × is_static + is_shard
78- def RetEncoding : OpcodeEncoding; // opcode to_label ⇒ opcode + to_label
7978let SrcMultiplier = 1 in
8079def JumpEncoding : OpcodeEncoding; // opcode src ⇒ opcode + 1 × src
81- def LoadPtrEncoding : OpcodeEncoding; // opcode inc ⇒ opcode + inc
8280def HeapOpEncoding : OpcodeEncoding; // opcode src_special inc ⇒ opcode + 10 × src_special + inc
83- def LogEncoding : OpcodeEncoding; // opcode is_first ⇒ opcode + is_first
8481def StaticOpEncoding : OpcodeEncoding; // opcode src_special inc ⇒ opcode + 2 × src_special + inc
8582
8683class ArithOpcEncoder<OpcodeEncoding encoding, bits<11> BaseOpcode,
@@ -110,7 +107,7 @@ class JumpOpcEncoder<bits<11> BaseOpcode,
110107class UMAOpcEncoder<OpcodeEncoding encoding, bits<11> BaseOpcode,
111108 SrcSpecialMode src> {
112109 bits<11> Opcode =
113- !cond(!eq(encoding, LoadPtrEncoding) : BaseOpcode,
110+ !cond(!eq(encoding, DirectEncoding) : BaseOpcode,
114111 !eq(encoding, HeapOpEncoding) : !add(BaseOpcode, !mul(10, src.Value)),
115112 !eq(encoding, StaticOpEncoding): !add(BaseOpcode, !mul(2, src.Value)),
116113 true : -1);
@@ -200,8 +197,8 @@ def OpStaticReadInc : EraVMOpcode<"ldmi.st", 1097, StaticOpEncoding>;
200197def OpStaticWrite : EraVMOpcode<"stm.st", 1100, StaticOpEncoding>; // src inc ⇒ 1100 + 2 × src + inc
201198def OpStaticWriteInc : EraVMOpcode<"stmi.st", 1101, StaticOpEncoding>;
202199
203- def OpLoadPtr : EraVMOpcode<"ld", 1083, LoadPtrEncoding >; // inc ⇒ 1083 + inc
204- def OpLoadPtrInc : EraVMOpcode<"ld.inc", 1084, LoadPtrEncoding >;
200+ def OpLoadPtr : EraVMOpcode<"ld", 1083, DirectEncoding >; // inc ⇒ 1083 + inc
201+ def OpLoadPtrInc : EraVMOpcode<"ld.inc", 1084, DirectEncoding >;
205202
206203def OpDecommit : EraVMOpcode<"log.decommit", 1093, DirectEncoding>;
207204def OpTransientLoad : EraVMOpcode<"tload", 1094, DirectEncoding>;
0 commit comments