aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2019-05-29 06:41:35 +0200
committerDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2019-05-29 06:41:35 +0200
commite18208359ee57a18a4722e714c5306c55446b7ce (patch)
treef8387e4fc5c2794afbc110f7bd25556a1549c7cc
parent83cc11add90eea576a798bacf821a70a28d4d9cc (diff)
parentb557706f77ca4cf0721dfb4d911207a2fae12411 (diff)
downloadcompcert-kvx-e18208359ee57a18a4722e714c5306c55446b7ce.tar.gz
compcert-kvx-e18208359ee57a18a4722e714c5306c55446b7ce.zip
Merge remote-tracking branch 'origin/mppa-work' into mppa-cos
-rw-r--r--mppa_k1c/PostpassSchedulingOracle.ml4
-rwxr-xr-xtest/monniaux/clean_benches.sh1
2 files changed, 3 insertions, 2 deletions
diff --git a/mppa_k1c/PostpassSchedulingOracle.ml b/mppa_k1c/PostpassSchedulingOracle.ml
index 9067f8e1..7015fd5f 100644
--- a/mppa_k1c/PostpassSchedulingOracle.ml
+++ b/mppa_k1c/PostpassSchedulingOracle.ml
@@ -603,9 +603,9 @@ let rec_to_usage r =
| Some U27L5 | Some U27L10 -> mau_x
| Some E27U27L10 -> mau_y)
| Nop -> alu_nop
- | Sraw | Srlw | Srsw | Sllw | Srad | Srld | Slld -> (match encoding with None | Some U6 -> alu_tiny | _ -> raise InvalidEncoding)
+ | Sraw | Srlw | Sllw | Srad | Srld | Slld -> (match encoding with None | Some U6 -> alu_tiny | _ -> raise InvalidEncoding)
(* TODO: check *)
- | Srsd | Rorw -> (match encoding with None | Some U6 -> alu_lite | _ -> raise InvalidEncoding)
+ | Srsw | Srsd | Rorw -> (match encoding with None | Some U6 -> alu_lite | _ -> raise InvalidEncoding)
| Extfz | Extfs | Insf -> (match encoding with None -> alu_lite | _ -> raise InvalidEncoding)
| Fixeduwz | Fixedwz | Floatwz | Floatuwz | Fixeddz | Fixedudz | Floatdz | Floatudz -> mau
| Lbs | Lbz | Lhs | Lhz | Lws | Ld | Lq | Lo ->
diff --git a/test/monniaux/clean_benches.sh b/test/monniaux/clean_benches.sh
index d246e110..c0a87ff9 100755
--- a/test/monniaux/clean_benches.sh
+++ b/test/monniaux/clean_benches.sh
@@ -5,3 +5,4 @@ rm -f commands.txt
for bench in $benches; do
(cd $bench && make clean)
done
+rm -f *.o