Addressing review comments

Author: artkhyzha

herd/AArch64Sem.ml

@@ -1374,9 +1374,6 @@ module Make
             fun (r,_) -> M.unitT r
         else m
 
-      let set_elr_el1 v ii =
-        write_reg AArch64Base.elr_el1 v ii
-
       let lift_kvm dir updatedb mop ma an ii mphy =
         let lbl_v = get_instr_label ii in
         let mfault ma a ft =
@@ -3615,7 +3612,6 @@ Arguments:
             >>= do_indirect_jump test [] i ii
 
         | I_ERET ->
-           let open Constant in
            let eret_to_addr v =
               match v2tgt v with
               | Some tgt -> B.faultRetT tgt

herd/mem.ml

@@ -263,7 +263,7 @@ module Make(C:Config) (S:Sem.Semantics) : S with module S = S	=
                     locs
                   else
                     let sym = Constant.mk_sym_virtual s in
-                      A.Location_global (A.V.Val sym)::locs
+                    A.Location_global (A.V.Val sym)::locs
               | None -> locs
             with V.Undetermined -> locs)
           init [] in

litmus/archExtra_litmus.ml

@@ -116,7 +116,7 @@ module Make(O:Config)(I:I) : S with module I = I
   let tr_global (c:ParsedConstant.v) =
     let open Constant in
     match c with
-    | Symbolic sym when not (is_label c) -> Global_litmus.get_base_symbol sym
+    | Symbolic sym when not (is_label c) -> Global_litmus.tr_symbol sym
     | Symbolic _| Tag _| Concrete _| ConcreteVector _| ConcreteRecord _
     | PteVal _| AddrReg _| Instruction _
     | Frozen _