1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715
|
(****************************************************************************)
(* the diy toolsuite *)
(* *)
(* Jade Alglave, University College London, UK. *)
(* Luc Maranget, INRIA Paris-Rocquencourt, France. *)
(* *)
(* Copyright 2013-present Institut National de Recherche en Informatique et *)
(* en Automatique, ARM Ltd and the authors. All rights reserved. *)
(* *)
(* This software is governed by the CeCILL-B license under French law and *)
(* abiding by the rules of distribution of free software. You can use, *)
(* modify and/ or redistribute the software under the terms of the CeCILL-B *)
(* license as circulated by CEA, CNRS and INRIA at the following URL *)
(* "http://www.cecill.info". We also give a copy in LICENSE.txt. *)
(****************************************************************************)
(** Check an event structure against a machine model *)
module type Config = sig
val fname : string
val m : AST.t
val bell_model_info : (string * BellModel.info) option
(* Include events from the same instance in po, essential for the LKMM *)
val wide_po : bool
include Model.Config
end
module Make
(O:Config)
(S:Sem.Semantics)
=
struct
let do_deps = O.variant Variant.Deps
let morello = O.variant Variant.Morello
let mixed = O.variant Variant.Mixed || morello
let memtag = O.variant Variant.MemTag
let kvm = O.variant Variant.VMSA
let self = O.variant Variant.Ifetch
let asl = S.A.arch = `ASL
let optacetrue =
let open OptAce in
match O.optace with
| True -> true
| False|Iico -> false
let bell_fname = Misc.app_opt (fun (x,_) -> x) O.bell_model_info
let bell_info = Misc.app_opt (fun (_,x) -> x) O.bell_model_info
let tr_proc =
let open DirtyBit in
match O.dirty with
| None ->
fun _ ->
let f () = false in
{ my_ha=f; my_hd=f; }
| Some dirty ->
fun proc ->
let my_ha () = dirty.ha proc
and my_hd () = dirty.hd proc in
{ my_ha; my_hd; }
module IConfig = struct
let bell = false
let bell_fname = bell_fname
let compat =
match S.A.arch with
| `LISA -> O.variant Variant.BackCompat
| _ -> false
include O
let doshow = S.O.PC.doshow
let showraw = S.O.PC.showraw
let symetric = S.O.PC.symetric
let variant =
let variant =
if optacetrue then
Misc.(|||) (Variant.equal Variant.CosOpt) O.variant
else O.variant in
Misc.delay_parse variant (fun s ->
match Misc.lowercase s with
| "dic" -> Some Variant.DIC
| "idc" -> Some Variant.IDC
| _ -> Variant.parse s)
end
module U = MemUtils.Make(S)
module MU = ModelUtils.Make(O)(S)
module IUtils = struct
let partition_events = U.partition_events
let loc2events x es =
let open S in
let x = A.V.nameToV x in
E.EventSet.filter
(fun e -> match E.location_of e with
| Some (A.Location_global loc) -> A.V.compare loc x = 0
| None | Some _ -> false)
es
let check_through = MU.check_through
let pp_failure test conc msg vb_pp =
MU.pp_failure
test conc
(Printf.sprintf "%s: %s" test.Test_herd.name.Name.name msg)
vb_pp
let pp test conc msg vb_pp =
MU.pp
test conc
(Printf.sprintf "%s: %s" test.Test_herd.name.Name.name msg)
vb_pp
(* fromto evts fs wher evts are all events and fs are fences *)
let labels_of e = match e.S.E.iiid with
| S.E.IdInit|S.E.IdSpurious -> Label.Set.empty
| S.E.IdSome id -> id.S.A.labels
let fencerel pbef paft po f =
let open S in
let before = E.EventSet.filter pbef (E.EventRel.preds po f)
and after = E.EventSet.filter paft (E.EventRel.succs po f) in
E.EventRel.cartesian before after
let fromto po fs =
let open S in
let fs = E.EventSet.filter E.is_barrier fs in
if E.EventSet.is_empty fs then E.EventRel.empty
else
let r =
E.EventSet.fold
(fun f r -> match f.E.iiid with
| S.E.IdInit|S.E.IdSpurious ->
assert false (* All fence evts generated by some ins *)
| S.E.IdSome {A.inst=ins; _} ->
let fr = match A.I.fromto_of_instr ins with
| None ->
fencerel (fun _ -> true) (fun _ -> true) po f
| Some (l1,l2) ->
let keep lbls e =
not (Label.Set.disjoint lbls (labels_of e)) in
fencerel (keep l1) (keep l2) po f in
fr::r)
fs [] in
E.EventRel.unions r
let same_value e1 e2 = match S.E.value_of e1,S.E.value_of e2 with
| Some v1,Some v2 -> S.A.V.compare v1 v2 = 0
| _ -> false
let same_oa e1 e2 =
let open Constant in
match S.E.value_of e1,S.E.value_of e2 with
| Some (S.A.V.Val (PteVal p1)),
Some (S.A.V.Val (PteVal p2)) ->
S.A.V.Cst.PteVal.same_oa p1 p2
| _ -> false
let writable2 =
let writable ha hd e = match S.E.value_of e with
| Some (S.A.V.Val (Constant.PteVal p)) ->
S.A.V.Cst.PteVal.writable ha hd p
| _ -> false in
fun e1 e2 ->
let p = S.E.proc_of e1 in
match p with
| None ->
Warn.user_error
"Init or spurious write as first argument of writable2"
| Some p ->
let ha,hd =
let open DirtyBit in
match O.dirty with
| Some d -> d.ha p,d.hd p
| None -> false,false in
writable ha hd e1 || writable ha hd e2
end
module I = Interpreter.Make(IConfig)(S)(IUtils)
module Equiv = EquivSpec.Make(S)
module E = S.E
(* Fast "loc" relation computation *)
module NameEnv = StringMap
let loc_as_fault_base loc =
let (>>=) = Option.bind in
S.A.global loc >>= S.A.V.as_constant
>>= Constant.as_fault_base
let comp_loc evts =
let mlocs,mfaults =
E.EventSet.fold
(fun e (mlocs,mfaults as k) ->
match E.location_of e with
| None -> k
| Some loc ->
if E.is_fault e then
match loc_as_fault_base loc with
| None -> k
| Some name ->
mlocs,NameEnv.accumulate name e mfaults
else
U.LocEnv.accumulate loc e mlocs,mfaults)
evts (U.LocEnv.empty,NameEnv.empty) in
let rel_locs = (* Standard "loc" relation same address *)
U.LocEnv.fold
(fun _ es k ->
let es = E.EventSet.of_list es in
E.EventRel.cartesian es es::k)
mlocs [] |> E.EventRel.unions
and rel_faults = (* Add faults with same base address *)
if NameEnv.is_empty mfaults then E.EventRel.empty
else
let mnames =
U.LocEnv.fold
(fun loc es mnames ->
match loc_as_fault_base loc with
| None -> mnames
| Some name ->
begin
match
NameEnv.safe_find [] name mfaults with
| [] -> mnames
| _ ->
let old = NameEnv.safe_find [] name mnames in
NameEnv.add name (es@old) mnames
end)
mlocs NameEnv.empty in
NameEnv.fold
(fun name es k ->
let fs = E.EventSet.of_list es in
let es =
NameEnv.safe_find [] name mnames
|> E.EventSet.of_list in
E.EventRel.cartesian es fs::
E.EventRel.cartesian fs es::
E.EventRel.cartesian fs fs::k)
mfaults [] |> E.EventRel.unions in
E.EventRel.union rel_locs rel_faults
(* Efficient "same-low-order-bits" *)
let comp_same_low_order_bits evts =
let m =
E.EventSet.fold
(fun e m ->
match E.global_index_of e with
| None -> m
| Some idx -> IntMap.accumulate idx e m)
evts IntMap.empty in
IntMap.fold
(fun _ es k ->
let es = E.EventSet.of_list es in
E.EventRel.cartesian es es::k)
m [] |> E.EventRel.unions
(* Efficient "int" and "ext" relations *)
let comp_by_proc evts =
E.EventSet.fold
(fun e (i,m) ->
match E.proc_of e with
| None -> e::i,m
| Some p -> i,IntMap.accumulate p e m)
evts ([],IntMap.empty)
let comp_int m =
IntMap.fold
(fun _ es k ->
let es = E.EventSet.of_list es in
E.EventRel.cartesian es es::k)
m [] |> E.EventRel.unions
let comp_ext (i,m) =
let ess =
IntMap.fold
(fun _ es k -> E.EventSet.of_list es::k)
m [E.EventSet.of_list i] in
let t = Array.of_list ess in
let len = Array.length t in
let rec do_rec i j r =
if i >= len then r
else if j >= len then do_rec (i+1) (i+2) r
else
let es_i = t.(i) and es_j = t.(j) in
let r =
E.EventRel.cartesian es_i es_j::
E.EventRel.cartesian es_j es_i::r in
do_rec i (j+1) r in
do_rec 0 1 [] |> E.EventRel.unions
(* Local utility: bell event selection *)
let add_bell_events m pred evts annots =
I.add_sets m
(StringSet.fold
(fun annot k ->
let tag = BellName.tag2instrs_var annot in
let rel = lazy begin
E.EventSet.filter (pred annot) evts
end in
if O.debug then
Printf.eprintf "annotation %s recorded as set %s\n"
annot tag ;
let bd = tag,rel in
let k = bd::k in
k)
annots [])
(* Intepreter call *)
let (opts,_,prog) = O.m
let withco = opts.ModelOption.co
let catdep = opts.ModelOption.catdep
let run_interpret test kfail =
let run = I.interpret test kfail in
fun ks m vb_pp kont res ->
(*Printf.eprintf "vb_pp = {%s}\n%!" (String.concat "," (List.map fst (Lazy.force vb_pp)));*)
run ks m vb_pp
(fun st res ->
if
not O.strictskip || StringSet.equal st.I.out_skipped O.skipchecks
then
let conc = ks.I.conc in
kont conc conc.S.fs (st.I.out_sets,st.I.out_show) st.I.out_flags res
else res)
res
let choose_spec f1 f2 x = if do_deps then f1 x else f2 x
(* Enter here *)
let check_event_structure test conc kfail kont res =
let pr = lazy (MU.make_procrels E.is_isync conc) in
let vb_pp =
if O.showsome && O.verbose > 0 then
lazy (MU.pp_procrels None (Lazy.force pr))
else
lazy [] in
let relevant =
if do_deps || catdep || asl then fun _ -> true
else fun e -> not (E.is_reg_any e) in
let all_evts = conc.S.str.E.events in
let evts =
choose_spec Misc.identity (E.EventSet.filter relevant) all_evts in
let () =
if O.debug then
Printf.eprintf
"Cat run, fname=%s, nevts=%d\n%!"
O.fname (E.EventSet.cardinal evts) in
let by_proc = lazy (comp_by_proc evts) in
let mem_evts = lazy (E.EventSet.filter E.is_mem evts) in
let po =
choose_spec
Misc.identity
(E.EventRel.filter
(if O.wide_po then
(fun (e1,e2) -> relevant e1 && relevant e2)
else
(fun (e1,e2) ->
relevant e1 && relevant e2 &&
not (E.same_instance e1 e2))))
conc.S.po in
let partial_po =
lazy (
E.EventRel.filter_nodes relevant
conc.S.partial_po
)
in
let id =
lazy begin
E.EventRel.of_list
(List.rev_map
(fun e -> e,e)
(E.EventSet.elements evts))
end in
let unv = lazy begin
E.EventRel.cartesian evts evts
end in
let ks = { I.id; unv; evts; conc; po;} in
let calc_si sca =
let r =
E.EventRel.unions
(E.EventSetSet.map_list
(fun sm -> E.EventRel.cartesian sm sm)
sca) in
if mixed || morello then r
else
let si_evts = E.EventSet.filter (fun x -> E.is_mem x || E.is_fault x) evts in
E.EventRel.union r (E.EventRel.set_to_rln si_evts) in
let si = lazy begin calc_si conc.S.str.E.sca end
in
let aligned =
lazy begin
let rs =
List.map
(fun (mem,sca) ->
if U.is_aligned (S.type_env test) (S.size_env test) mem then
calc_si (E.EventSetSet.singleton sca)
else
E.EventRel.empty)
conc.S.str.E.aligned in
E.EventRel.unions rs
end in
let rf_reg = lazy (U.make_rf_regs conc) in
(* Initial env *)
let m =
I.add_rels
I.init_env_empty
((if O.variant Variant.Success || O.variant Variant.Instr then
fun k ->
("instr",lazy begin
E.EventRel.of_pred all_evts all_evts E.po_eq
end)::k
else Misc.identity)
(((if do_deps then Misc.identity
else fun k ->
("tst", lazy (Lazy.force pr).S.tst)::
("addr", lazy (Lazy.force pr).S.addr)::
("data", lazy (Lazy.force pr).S.data)::
("ctrl", lazy (Lazy.force pr).S.ctrl)::k)
["id",id;
"loc", lazy begin
comp_loc evts;
end;
"same-low-order-bits", lazy begin
comp_same_low_order_bits evts
end;
"int",lazy begin
let _,m = Lazy.force by_proc in comp_int m
end ;
"ext",lazy begin
comp_ext (Lazy.force by_proc)
end ;
"rmw",lazy conc.S.atomic_load_store;
"amo",
lazy begin
E.EventRel.filter
(fun (r,w) -> E.po_eq r w)
conc.S.atomic_load_store
end;
"po", lazy po;
"partial_po", partial_po;
"depend", lazy (Lazy.force pr).S.depend;
"success", lazy (Lazy.force pr).S.success;
"rf", lazy (Lazy.force pr).S.rf;
"control",lazy conc.S.str.E.control ;
"sm",si; "si",si;
"aligned",aligned;
"iico_data", lazy conc.S.str.E.intra_causality_data;
"iico_ctrl", lazy conc.S.str.E.intra_causality_control;
"iico_order", lazy conc.S.str.E.intra_causality_order;
"rf-reg", rf_reg ;
"same-instr", lazy begin E.EventRel.of_pred all_evts all_evts E.same_instruction end;
"same-static",
lazy begin
E.EventRel.of_pred all_evts all_evts E.same_static_event
end;
"same-instance", lazy begin E.EventRel.of_pred all_evts all_evts E.same_instance end;
"equiv-spec",
lazy begin Equiv.build (Lazy.force rf_reg) all_evts end;
"pco", lazy conc.S.pco;
]))) in
let m =
let spec = conc.S.str.E.speculated in
let is_spec = (fun e -> E.EventSet.mem e spec) in
let data_ports = conc.S.str.E.data_ports in
let is_data_port = (fun e -> E.EventSet.mem e data_ports) in
let are_memtypes =
let module MT = S.A.MemType in
let mts = MT.parse test.Test_herd.info in
MT.fold
(fun mt k ->
let tag = MT.pp mt
and p e = match S.E.virtual_loc_of e with
| Some s ->
let mtx =
try Misc.Simple.assoc s mts
with Not_found -> MT.default in
MT.equal mt mtx
| None -> false in
(tag,p)::k) in
I.add_sets m
(("M",mem_evts)::
List.fold_right
(fun (k,p) ps ->
(k,lazy (E.EventSet.filter p (Lazy.force mem_evts)))::ps)
(are_memtypes
["R", E.is_mem_load;
"W", E.is_mem_store;
"Exp", E.is_explicit;
"NExp", E.is_not_explicit;
"SPEC", is_spec;
"EXEC", (fun e -> not (is_spec e));
"AMO",E.is_amo;
"SPURIOUS", E.is_spurious;
"IW", E.is_mem_store_init;
"FW",
(let ws = lazy (U.make_write_mem_finals conc) in
fun e -> E.EventSet.mem e (Lazy.force ws)); ])
(List.map
(fun (k,p) -> k,lazy (E.EventSet.filter p evts))
["B", E.is_commit;
"BCC", E.is_bcc;
"PRED", E.is_pred;
"F", E.is_barrier;
"Rreg", E.is_reg_load_any;
"Wreg", E.is_reg_store_any;
"DATA", is_data_port;
"NDATA", (fun e -> not (is_data_port e));])) in
let m =
if kvm then begin
let attrs_of_evt e =
let pteval_v =
match E.read_of e with
| Some _ as v -> v
| _ -> E.written_of e in
let open Constant in
match pteval_v with
| Some (S.A.V.Val (PteVal v)) ->
S.A.V.Cst.PteVal.get_attrs v
| _ -> assert false in
let pte_accesses =
E.EventSet.filter
(fun e -> E.Act.is_pte_access e.E.action)
(Lazy.force mem_evts) in
let attr_evts =
E.EventSet.filter
(fun e -> (attrs_of_evt e) <> []) pte_accesses in
let evts_map =
E.EventSet.fold
(fun e evts_map ->
List.fold_right
(fun attr evts_map ->
let evts_w_attr =
StringMap.safe_find E.EventSet.empty attr evts_map in
let evts_w_attr = E.EventSet.add e evts_w_attr in
let evts_map = StringMap.add attr evts_w_attr evts_map in
evts_map) (attrs_of_evt e) evts_map)
pte_accesses StringMap.empty in
let s = [("PTEMemAttr", lazy attr_evts)] in
I.add_sets m
(StringMap.fold
(fun k v l -> ("PTE" ^ k, lazy v) :: l) evts_map s)
end else m in
let m =
I.add_sets m
(List.map
(fun (k,a) ->
k,lazy (E.EventSet.filter (fun e -> a e.E.action) evts))
E.Act.arch_sets) in
let m = (* To be deprecated *)
if kvm then
let mevt = match I.get_set m "PTEV" with
| Some mevt -> mevt
| None -> (* Must exists *) assert false in
I.add_sets m
(List.map
(fun (k,a) ->
k,lazy begin
let open DirtyBit in
E.EventSet.filter
(fun e ->
match E.proc_of e with
| Some proc -> a (tr_proc proc) e.E.action
(* For init consider all threads setting *)
| None ->
let d =
match O.dirty with
| None ->
let f () = false in
{ my_ha=f; my_hd=f; }
| Some dirty ->
let k b () = b in
{ my_ha=k dirty.all_ha;
my_hd=k dirty.all_hd; } in
a d e.E.action)
(Lazy.force mevt)
end)
E.Act.arch_dirty)
else m in
(* Override arch specific fences *)
let m =
I.add_rels m
(List.map
(fun (k,p) ->
let pred (e1,e2) = p e1.E.action e2.E.action in
k,lazy begin
E.EventRel.filter pred (Lazy.force unv)
end)
E.Act.arch_rels) in
(* Event sets from proc info *)
let m = match test.Test_herd.proc_info with
| [] -> m
| _::_ as i ->
let bds = U.lift_proc_info i evts in
I.add_sets m bds in
(* Event sets from bell_info *)
let m =
match bell_info with
| None -> m
| Some bi ->
let m =
add_bell_events m
(fun annot e -> E.Act.annot_in_list annot e.E.action)
evts
(BellModel.get_mem_annots bi) in
let open MiscParser in
let extra = test.Test_herd.extra_data in
begin
List.fold_right
(fun e m -> match e with
(* No region in test, empty regions *)
| BellExtra {BellInfo.regions=None;_} ->
I.add_sets m
(List.map
(fun r -> BellName.tag2instrs_var r,lazy E.EventSet.empty)
(StringSet.elements (BellModel.get_region_sets bi)))
| BellExtra {BellInfo.regions=Some regions;_} ->
let reg2loc =
List.fold_left
(fun m (x,rs) ->
List.fold_left
(fun m r ->
let old = StringMap.safe_find StringSet.empty r m in
StringMap.add r (StringSet.add x old) m)
m rs)
StringMap.empty regions in
let loc2evts = U.collect_mem conc.S.str in
let loc2evts = U.LocEnv.map E.EventSet.of_list loc2evts in
I.add_sets m
(StringSet.fold
(fun region k ->
let tag = BellName.tag2instrs_var region in
let set = lazy begin
let locs =
StringMap.safe_find StringSet.empty
region reg2loc in
let evts =
StringSet.fold
(fun loc k ->
let v = S.A.V.nameToV loc in
let x = S.A.Location_global v in
U.LocEnv.safe_find E.EventSet.empty
x loc2evts::k)
locs [] in
E.EventSet.unions evts
end in
(tag,set)::k)
(BellModel.get_region_sets bi) [])
| CExtra _ -> m (* Ignore CExtra ?? *))
extra
m
end in
(* Scope relations from bell info *)
let m =
match bell_info with
| None -> m
| Some _ ->
let open MiscParser in
let extract_tbi e =
let extra = test.Test_herd.extra_data in
let scope_opt =
List.filter_map
(function
| CExtra _ ->
None (* must be here as, O.bell_mode_info is *)
| BellExtra tbi -> e tbi)
extra in
List.nth_opt scope_opt 0 in
let scopes = extract_tbi (fun tbi -> tbi.BellInfo.scopes) in
let m = match scopes with
(* If no scope definition in test, do not build relations, will fail
later if the model attempts to use scope relations *)
| None -> m
(* Otherwise, build scope relations *)
| Some scopes ->
let rs = U.get_scope_rels evts scopes in
I.add_rels m
(List.map
(fun (scope,r) -> BellName.tag2rel_var scope,lazy r)
rs) in
let lvls = extract_tbi (fun tbi -> tbi.BellInfo.levels) in
let m = match lvls with
| None -> m
| Some lvls ->
let r,rs = U.get_level_rels evts lvls in
I.add_rels m
((BellName.nextlevel,lazy r)::
List.map
(fun (lvl,r) -> BellName.tag2rel_var lvl,lazy r)
rs) in
m in
(* Now call interpreter, with or without generated co *)
if withco then
let process_co co0 res =
let co = S.tr co0 in
let fr = U.make_fr conc co in
let vb_pp =
if O.showsome then
lazy (("fr",fr)::("co",co0)::Lazy.force vb_pp)
else
lazy [] in
let m =
I.add_rels m
[
"fr", lazy fr;
"fre", lazy (U.ext fr); "fri", lazy (U.internal fr);
"co", lazy co;
"coe", lazy (U.ext co); "coi", lazy (U.internal co);
] in
run_interpret test kfail ks m vb_pp kont res in
U.apply_process_co test conc process_co res
else
(* let m = I.add_rels m ["co0",lazy conc.S.pco] in *)
let kont x y z t u =
if O.debug then prerr_endline "Cat over" ;
kont x y z t u in
run_interpret test kfail ks m vb_pp kont res
end
|