no offset for bs backend

Author: bobzhang

asmcomp/cmmgen.ml

@@ -1447,7 +1447,7 @@ struct
   let make_isout h arg = Cop (Ccmpa Clt, [h ; arg], Debuginfo.none)
   let make_isin h arg = Cop (Ccmpa Cge, [h ; arg], Debuginfo.none)
   let make_if cond ifso ifnot = Cifthenelse (cond, ifso, ifnot)
-  let make_switch loc arg cases actions _names =
+  let make_switch loc arg cases actions ~offset:_ _names =
     make_switch arg cases actions (Debuginfo.from_location loc)
   let bind arg body = bind "switcher" arg body
 

bytecomp/matching.ml

@@ -1954,10 +1954,10 @@ module SArg = struct
   let make_isout h arg = Lprim (Pisout, [h ; arg],Location.none)
   let make_isin h arg = Lprim (Pnot,[make_isout h arg],Location.none)
   let make_if cond ifso ifnot = Lifthenelse (cond, ifso, ifnot)
-  let make_switch loc arg cases acts sw_names =
+  let make_switch loc arg cases acts ~offset sw_names =
     let l = ref [] in
     for i = Array.length cases-1 downto 0 do
-      l := (i,acts.(cases.(i))) ::  !l
+      l := (offset + i,acts.(cases.(i))) ::  !l
     done ;
     Lswitch(arg,
             {sw_numconsts = Array.length cases ; sw_consts = !l ;

bytecomp/switch.ml

@@ -106,7 +106,7 @@ module type S =
    val make_isout : act -> act -> act
    val make_isin : act -> act -> act
    val make_if : act -> act -> act -> act
-   val make_switch : Location.t -> act -> int array -> act array -> Lambda.switch_names option -> act
+   val make_switch : Location.t -> act -> int array -> act array -> offset:int -> Lambda.switch_names option -> act
    val make_catch : act -> int * (act -> act)
    val make_exit : int -> act
  end
@@ -560,6 +560,9 @@ and enum top cases =
         do_make_if_out
           (Arg.make_const d) ctx.arg (mk_ifso ctx) (mk_ifno ctx)
     | _ ->
+        if (*true || *)!Config.bs_only then 
+          do_make_if_out
+            (Arg.make_const d) (Arg.make_offset ctx.arg (-l)) (mk_ifso ctx) (mk_ifno ctx) else
         Arg.bind
           (Arg.make_offset ctx.arg (-l))
           (fun arg ->
@@ -575,6 +578,9 @@ and enum top cases =
         do_make_if_in
           (Arg.make_const d) ctx.arg (mk_ifso ctx) (mk_ifno ctx)
     | _ ->
+        if (*true || *) !Config.bs_only then
+          do_make_if_in
+            (Arg.make_const d) (Arg.make_offset ctx.arg (-l)) (mk_ifso ctx) (mk_ifno ctx) else
         Arg.bind
           (Arg.make_offset ctx.arg (-l))
           (fun arg ->
@@ -750,12 +756,15 @@ let make_switch loc {cases=cases ; actions=actions} i j sw_names =
     (fun act i -> acts.(i) <- actions.(act))
     t ;
   (fun ctx ->
+  if !Config.bs_only then
+  Arg.make_switch ~offset:(ll+ctx.off) loc ctx.arg tbl acts sw_names
+  else 
     match -ll-ctx.off with
-    | 0 -> Arg.make_switch loc ctx.arg tbl acts sw_names
+    | 0 -> Arg.make_switch loc ctx.arg tbl acts sw_names ~offset:0
     | _ ->
         Arg.bind
           (Arg.make_offset ctx.arg (-ll-ctx.off))
-          (fun arg -> Arg.make_switch loc arg tbl acts sw_names))
+          (fun arg -> Arg.make_switch loc arg tbl acts sw_names ~offset:0))
 
 
 let make_clusters loc ({cases=cases ; actions=actions} as s) n_clusters k sw_names =

bytecomp/switch.mli

@@ -79,7 +79,7 @@ module type S =
       make_switch arg cases acts
       NB:  cases is in the value form *)
     val make_switch :
-        Location.t -> act -> int array -> act array -> Lambda.switch_names option -> act
+        Location.t -> act -> int array -> act array -> offset:int -> Lambda.switch_names option -> act
    (* Build last minute sharing of action stuff *)
    val make_catch : act -> int * (act -> act)
    val make_exit : int -> act